瀏覽代碼

Update package lock (#3172)

Stefan McShane 2 年之前
父節點
當前提交
d04a762cd2
共有 2 個文件被更改,包括 22 次插入14 次删除
  1. 2 2
      api/server/shared/config/loader/loader.go
  2. 20 12
      dashboard/package-lock.json

+ 2 - 2
api/server/shared/config/loader/loader.go

@@ -75,8 +75,8 @@ func (e *EnvConfigLoader) LoadConfig() (res *config.Config, err error) {
 
 	var instanceCredentialBackend credentials.CredentialStorage
 	if envConf.DBConf.VaultEnabled {
-		if envConf.DBConf.VaultAPIKey == "" || envConf.DBConf.VaultServerURL != "" || envConf.DBConf.VaultPrefix != "" {
-			return nil, errors.New("Vault is enabled but missing required environment variables [VAULT_API_KEY,VAULT_SERVER_URL,VAULT_PREFIX]")
+		if envConf.DBConf.VaultAPIKey == "" || envConf.DBConf.VaultServerURL == "" || envConf.DBConf.VaultPrefix == "" {
+			return nil, errors.New("vault is enabled but missing required environment variables [VAULT_API_KEY,VAULT_SERVER_URL,VAULT_PREFIX]")
 		}
 
 		instanceCredentialBackend = vault.NewClient(

+ 20 - 12
dashboard/package-lock.json

@@ -131,14 +131,6 @@
         "webpack-dev-server": "^3.11.0"
       }
     },
-    "../../api-contracts/generated/js": {
-      "name": "@porter-dev/api-contracts",
-      "version": "0.0.66",
-      "license": "MIT",
-      "dependencies": {
-        "@bufbuild/protobuf": "^1.1.0"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
@@ -1943,6 +1935,11 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bufbuild/protobuf": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.2.1.tgz",
+      "integrity": "sha512-cwwGvLGqvoaOZmoP5+i4v/rbW+rHkguvTehuZyM2p/xpmaNSdT2h3B7kHw33aiffv35t1XrYHIkdJSEkSEMJuA=="
+    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
@@ -2433,8 +2430,12 @@
       }
     },
     "node_modules/@porter-dev/api-contracts": {
-      "resolved": "../../api-contracts/generated/js",
-      "link": true
+      "version": "0.0.66",
+      "resolved": "https://registry.npmjs.org/@porter-dev/api-contracts/-/api-contracts-0.0.66.tgz",
+      "integrity": "sha512-RkmHrTWt1Ta3BDpI6Ne6HSlxa8FLBayLwxm2vCfJZrYI2v0BvGoSy6kf7SCBVhMx+GbluWTlMgdAaQ6ymYo34w==",
+      "dependencies": {
+        "@bufbuild/protobuf": "^1.1.0"
+      }
     },
     "node_modules/@sentry/browser": {
       "version": "6.19.7",
@@ -16219,6 +16220,11 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@bufbuild/protobuf": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.2.1.tgz",
+      "integrity": "sha512-cwwGvLGqvoaOZmoP5+i4v/rbW+rHkguvTehuZyM2p/xpmaNSdT2h3B7kHw33aiffv35t1XrYHIkdJSEkSEMJuA=="
+    },
     "@discoveryjs/json-ext": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
@@ -16558,7 +16564,9 @@
       "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
     },
     "@porter-dev/api-contracts": {
-      "version": "file:../../api-contracts/generated/js",
+      "version": "0.0.66",
+      "resolved": "https://registry.npmjs.org/@porter-dev/api-contracts/-/api-contracts-0.0.66.tgz",
+      "integrity": "sha512-RkmHrTWt1Ta3BDpI6Ne6HSlxa8FLBayLwxm2vCfJZrYI2v0BvGoSy6kf7SCBVhMx+GbluWTlMgdAaQ6ymYo34w==",
       "requires": {
         "@bufbuild/protobuf": "^1.1.0"
       }
@@ -26729,4 +26737,4 @@
       "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
     }
   }
-}
+}