@dotcom-tool-kit/serverless 2.4.0 → 2.4.2

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

@@ -1 +1 @@
-{"version":3,"file":"teardown.d.ts","sourceRoot":"","sources":["../../src/tasks/teardown.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,kBAAmB,SAAQ,IAAI,CAAC,OAAO,gBAAgB,CAAC;IAC3E,MAAM,CAAC,WAAW,SAA2C;IAEvD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAwB3B"}
+{"version":3,"file":"teardown.d.ts","sourceRoot":"","sources":["../../src/tasks/teardown.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAM/E,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,IAAI,CAAC,OAAO,gBAAgB,CAAC;IAC3E,MAAM,CAAC,WAAW,SAA2C;IAEvD,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgD3B"}

package/lib/tasks/teardown.js

@@ -4,20 +4,45 @@ 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 state_1 = require("@dotcom-tool-kit/state");
+const doppler_1 = require("@dotcom-tool-kit/doppler");
 const child_process_1 = require("child_process");
+const options_1 = require("@dotcom-tool-kit/options");
 class ServerlessTeardown extends types_1.Task {
     async run() {
-        const { configPath, systemCode, regions } = this.options;
+        const { useVault, configPath, regions } = this.options;
         const reviewState = (0, state_1.readState)('review');
         if (!reviewState || !reviewState.stageName) {
             throw new error_1.ToolKitError(`Could not find state for review, check that ${logger_1.styles.hook('deploy:review')} ran successfully`);
         }
+        let vaultEnv = {};
+        // 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
+            // migrated from Vault to Doppler – Doppler will instead sync secrets to
+            // Parameter Store for the Serverless config to reference
+            if (!vaultCi.MIGRATED_TO_DOPPLER) {
+                const dopplerEnvVars = new doppler_1.DopplerEnvVars(this.logger, 'dev');
+                vaultEnv = await dopplerEnvVars.fallbackToVault();
+            }
+        }
         this.logger.verbose('starting the child serverless process...');
-        const args = ['remove', '--region', regions[0], '--stage', reviewState.stageName, '--aws-profile', `CircleCI-role-${systemCode}`];
+        const args = ['remove', '--region', regions[0], '--stage', reviewState.stageName];
         if (configPath) {
             args.push('--config', './serverless.yml');
         }
-        const child = (0, child_process_1.spawn)('serverless', args);
+        const child = (0, child_process_1.spawn)('serverless', args, {
+            env: {
+                ...process.env,
+                ...vaultEnv
+            }
+        });
         (0, logger_1.hookFork)(this.logger, 'serverless', child);
         await (0, logger_1.waitOnExit)('serverless', child);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/serverless",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "a plugin to manage and deploy apps using AWS Serverless",
   "main": "lib",
   "scripts": {