@dotcom-tool-kit/serverless 2.2.10 → 2.2.11

package/lib/tasks/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/tasks/deploy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAI/E,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,OAAO,gBAAgB,CAAC;IACzE,MAAM,CAAC,WAAW,SAAmB;IAE/B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2C3B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/tasks/deploy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAK/E,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,OAAO,gBAAgB,CAAC;IACzE,MAAM,CAAC,WAAW,SAAmB;IAE/B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiD3B"}

package/lib/tasks/deploy.js

@@ -4,6 +4,7 @@ const error_1 = require("@dotcom-tool-kit/error");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const types_1 = require("@dotcom-tool-kit/types");
 const doppler_1 = require("@dotcom-tool-kit/doppler");
+const options_1 = require("@dotcom-tool-kit/options");
 const child_process_1 = require("child_process");
 class ServerlessDeploy extends types_1.Task {
     async run() {
@@ -13,7 +14,13 @@ class ServerlessDeploy extends types_1.Task {
             throw new error_1.ToolKitError(`the ${logger_1.styles.task('ServerlessDeploy')} task requires the ${logger_1.styles.code(`$${buildNumVariable}`)} environment variable to be defined`);
         }
         let vaultEnv = {};
-        if (useVault) {
+        // HACK:20231124:IM We need to call Vault to check whether a project has
+        // migrated to Doppler yet, and sync Vault secrets if it hasn't, but this
+        // logic should be removed entirely once we drop support for Vault. We can
+        // skip this call if we find the project has already added options for
+        // doppler in the Tool Kit configuration.
+        const migratedToolKitToDoppler = Boolean((0, options_1.getOptions)('@dotcom-tool-kit/doppler')?.project);
+        if (useVault && !migratedToolKitToDoppler) {
             const dopplerCi = new doppler_1.DopplerEnvVars(this.logger, 'ci');
             const vaultCi = await dopplerCi.fallbackToVault();
             // HACK:20231023:IM don't read secrets when the project has already

package/lib/tasks/provision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../src/tasks/provision.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAI/E,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,IAAI,CAAC,OAAO,gBAAgB,CAAC;IAC5E,MAAM,CAAC,WAAW,SAA4B;IAExC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiD3B"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../src/tasks/provision.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAK/E,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,IAAI,CAAC,OAAO,gBAAgB,CAAC;IAC5E,MAAM,CAAC,WAAW,SAA4B;IAExC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuD3B"}

package/lib/tasks/provision.js

@@ -5,6 +5,7 @@ const logger_1 = require("@dotcom-tool-kit/logger");
 const types_1 = require("@dotcom-tool-kit/types");
 const doppler_1 = require("@dotcom-tool-kit/doppler");
 const child_process_1 = require("child_process");
+const options_1 = require("@dotcom-tool-kit/options");
 class ServerlessProvision extends types_1.Task {
     async run() {
         const { useVault, configPath, buildNumVariable, systemCode, regions } = this.options;
@@ -13,7 +14,13 @@ class ServerlessProvision extends types_1.Task {
             throw new error_1.ToolKitError(`the ${logger_1.styles.task('ServerlessProvision')} task requires the ${logger_1.styles.code(`$${buildNumVariable}`)} environment variable to be defined`);
         }
         let vaultEnv = {};
-        if (useVault) {
+        // HACK:20231124:IM We need to call Vault to check whether a project has
+        // migrated to Doppler yet, and sync Vault secrets if it hasn't, but this
+        // logic should be removed entirely once we drop support for Vault. We can
+        // skip this call if we find the project has already added options for
+        // doppler in the Tool Kit configuration.
+        const migratedToolKitToDoppler = Boolean((0, options_1.getOptions)('@dotcom-tool-kit/doppler')?.project);
+        if (useVault && !migratedToolKitToDoppler) {
             const dopplerCi = new doppler_1.DopplerEnvVars(this.logger, 'ci');
             const vaultCi = await dopplerCi.fallbackToVault();
             // HACK:20231023:IM don't read secrets when the project has already

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/serverless",
-  "version": "2.2.10",
+  "version": "2.2.11",
   "description": "a plugin to manage and deploy apps using AWS Serverless",
   "main": "lib",
   "scripts": {
@@ -25,10 +25,11 @@
     "serverless-offline": "^12.0.4"
   },
   "dependencies": {
+    "@dotcom-tool-kit/doppler": "^1.0.7",
     "@dotcom-tool-kit/error": "^3.1.0",
+    "@dotcom-tool-kit/options": "^3.1.5",
     "@dotcom-tool-kit/state": "^3.1.1",
     "@dotcom-tool-kit/types": "^3.4.1",
-    "@dotcom-tool-kit/doppler": "^1.0.7",
     "get-port": "^5.1.1",
     "tslib": "^2.3.1",
     "wait-port": "^0.2.9"