@ibm-cloud/cd-tools 1.12.0 → 1.13.0

package/cmd/copy-toolchain.js

@@ -283,7 +283,8 @@ async function main(options) {
 			moreTfResources: moreTfResources,
 			gritMapping: gritMapping,
 			skipUserConfirmation: skipUserConfirmation,
-			includeS2S: includeS2S
+			includeS2S: includeS2S,
+			timeSuffix: TIME_SUFFIX
 		});
 	} catch (err) {
 		if (err.message && err.stack) {
@@ -332,8 +333,11 @@ async function main(options) {
 			// create toolchain, which invokes script to create s2s if applicable
 			await runTerraformApply(true, outputDir, verbosity, `ibm_cd_toolchain.${toolchainTfName}`);
 
-			const hasS2SFailures = fs.existsSync(resolve(`${outputDir}/.s2s-script-failures`));
-			if (hasS2SFailures) logger.warn('\nWarning! One or more service-to-service auth policies could not be created!\n', LOG_STAGES.setup, true);
+			const hasS2SFailures = fs.existsSync(resolve(`${outputDir}/.s2s-script-failures-${TIME_SUFFIX}`));
+			if (hasS2SFailures) {
+				logger.print(''); // newline for spacing
+				logger.warn(`Warning! One or more service-to-service auth policies could not be created! See ${outputDir}/.s2s-script-failures-${TIME_SUFFIX} for more details.\n`, LOG_STAGES.setup, true);
+			}
 
 			// create the rest
 			await runTerraformApply(skipUserConfirmation, outputDir, verbosity).catch((err) => {
@@ -346,7 +350,7 @@ async function main(options) {
 
 			if (verbosity >= 1) logger.print(''); // newline for spacing
 			logger.info(`Toolchain "${sourceToolchainData['name']}" from ${sourceRegion} was cloned to "${targetToolchainName ?? sourceToolchainData['name']}" in ${targetRegion} ${applyErrors ? 'with some errors' : 'successfully'}, with ${numResourcesCreated} / ${numResourcesPlanned} resources created!`, LOG_STAGES.info, true);
-			if (hasS2SFailures) logger.warn('One or more service-to-service auth policies could not be created, see .s2s-script-failures for more details.');
+			if (hasS2SFailures) logger.warn(`One or more service-to-service auth policies could not be created, see ${outputDir}/.s2s-script-failures-${TIME_SUFFIX} for more details.`, '', true);
 			if (newTcId) logger.info(`Cloned toolchain: https://${CLOUD_PLATFORM}/devops/toolchains/${newTcId}?env_id=ibm:yp:${targetRegion}`, LOG_STAGES.info, true);
 		} else {
 			logger.info(`DRY_RUN: ${dryRun}, skipping terraform apply...`, LOG_STAGES.tf);

package/cmd/export-secrets.js

@@ -280,7 +280,7 @@ async function main(options) {
                     const commonProps = {
                         toolchain_id: toolchainId,
                         destination: {
-                            is_private: false, // TODO: set this back to 'true' once 'otc-api' has the 'export_secret' endpoint, should always use SM private endpoint
+                            is_private: true,
                             is_production: CLOUD_PLATFORM === 'cloud.ibm.com',
                             secrets_manager_crn: smInstance.crn,
                             secret_name: smSecretName,

package/cmd/utils/terraform.js

@@ -68,7 +68,7 @@ async function initProviderFile(targetRegion, dir) {
     return writeFilePromise(`${dir}/provider.tf`, jsonToTf(newProviderTfStr));
 }
 
-async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag, targetToolchainName, targetRgId, disableTriggers, isCompact, outputDir, tempDir, moreTfResources, gritMapping, skipUserConfirmation, includeS2S }) {
+async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag, targetToolchainName, targetRgId, disableTriggers, isCompact, outputDir, tempDir, moreTfResources, gritMapping, skipUserConfirmation, includeS2S, timeSuffix }) {
     const promises = [];
 
     const writeProviderPromise = await initProviderFile(targetRegion, outputDir);
@@ -359,7 +359,9 @@ async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag,
 
         const newTfFileObjStr = JSON.stringify(newTfFileObj);
         let newTfFile = replaceDependsOn(jsonToTf(newTfFileObjStr));
-        if (includeS2S && (isCompact || resourceName === 'ibm_cd_toolchain')) newTfFile = addS2sScriptToToolchainTf(newTfFile);
+        if (includeS2S && (isCompact || resourceName === 'ibm_cd_toolchain')) {
+            newTfFile = addS2sScriptToToolchainTf(newTfFile, timeSuffix);
+        }
         const copyResourcesPromise = writeFilePromise(`${outputDir}/${fileName}`, newTfFile);
         promises.push(copyResourcesPromise);
     }
@@ -487,7 +489,7 @@ function replaceDependsOn(str) {
     }
 }
 
-function addS2sScriptToToolchainTf(str) {
+function addS2sScriptToToolchainTf(str, timeSuffix) {
     const provisionerStr = (tfName) => `\n\n  provisioner "local-exec" {
     command = "node create-s2s-script.cjs"
     on_failure = continue
@@ -496,6 +498,7 @@ function addS2sScriptToToolchainTf(str) {
       TARGET_TOOLCHAIN_ID = ibm_cd_toolchain.${tfName}.id
       IBMCLOUD_PLATFORM = "${CLOUD_PLATFORM}"
       IAM_BASE_URL = "${IAM_BASE_URL}"
+      GENERATED_TIME = "${timeSuffix}" # corresponds with error log
     }\n  }`
     try {
         if (typeof str === 'string') {

package/create-s2s-script.js

@@ -23,8 +23,11 @@ if (!CLOUD_PLATFORM) throw Error(`Missing 'IBMCLOUD_PLATFORM'`);
 const IAM_BASE_URL = process.env['IAM_BASE_URL'] || 'https://iam.cloud.ibm.com';
 if (!IAM_BASE_URL) throw Error(`Missing 'IAM_BASE_URL'`);
 
+const GENERATED_TIME = process.env['GENERATED_TIME'];
+if (!GENERATED_TIME) throw Error(`Missing 'GENERATED_TIME'`);
+
 const INPUT_PATH = resolve('create-s2s.json');
-const ERROR_PATH = resolve('.s2s-script-failures');
+const ERROR_PATH = resolve(`.s2s-script-failures-${GENERATED_TIME}`);
 
 async function getBearer() {
     const url = `${IAM_BASE_URL}/identity/token`;
@@ -125,12 +128,23 @@ getBearer().then(async (bearer) => {
         promises.push(createS2sAuthPolicy(bearer, item));
     });
 
-    try {
-        await Promise.all(promises);
-    } catch (e) {
-        console.error(e);
-        // create temp file on error
-        fs.writeFileSync(ERROR_PATH, e);
-        exit(1);
-    }
+    await Promise.allSettled(promises).then((res) => {
+        const rejectReasons = res.filter(r => r.status === 'rejected').map(r => r.reason);
+
+        if (rejectReasons.length > 0) {
+            let errFileContents = '';
+            rejectReasons.forEach((reason) => {
+                console.error(reason);
+                // create temp file on error
+                errFileContents += reason;
+                errFileContents += '\n';
+            });
+            fs.writeFileSync(ERROR_PATH, errFileContents);
+            exit(1);
+        }
+    });
+}).catch((reason) => {
+    console.error(reason);
+    // create temp file on error
+    fs.writeFileSync(ERROR_PATH, reason + '\n');
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibm-cloud/cd-tools",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "Tools and utilities for the IBM Cloud Continuous Delivery service and resources",
   "repository": {
     "type": "git",