@ibm-cloud/cd-tools 1.6.0 → 1.6.1

package/cmd/copy-toolchain.js

@@ -322,10 +322,7 @@ async function main(options) {
 			}
 
 			// create toolchain, which invokes script to create s2s if applicable
-			await runTerraformApply(true, outputDir, verbosity, `ibm_cd_toolchain.${toolchainTfName}`).catch((err) => {
-				logger.error(err, LOG_STAGES.tf);
-				applyErrors = true;
-			});
+			await runTerraformApply(true, outputDir, verbosity, `ibm_cd_toolchain.${toolchainTfName}`);
 
 			// create the rest
 			await runTerraformApply(skipUserConfirmation, outputDir, verbosity).catch((err) => {

package/cmd/utils/terraform.js

@@ -192,7 +192,7 @@ async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag,
                             // prompt user
                             const validateGritUrlPrompt = async (str) => {
                                 if (!str) {
-                                    logger.print('Skipping... (URL will remain unchanged in the generatedTerraform configuration)');
+                                    logger.print('Skipping... (URL will remain unchanged in the generated Terraform configuration)');
                                     return '';
                                 }
                                 const newUrl = (GIT_BASE_URL || `https://${targetRegion}.git.cloud.ibm.com`) + `/${str}.git`;
@@ -492,6 +492,7 @@ function replaceDependsOn(str) {
 function addS2sScriptToToolchainTf(str) {
     const provisionerStr = (tfName) => `\n\n  provisioner "local-exec" {
     command = "node create-s2s-script.cjs"
+    on_failure = fail
     environment = {
       IBMCLOUD_API_KEY = var.ibmcloud_api_key
       TARGET_TOOLCHAIN_ID = ibm_cd_toolchain.${tfName}.id

package/create-s2s-script.js

@@ -9,6 +9,7 @@
 
 const fs = require('node:fs');
 const { resolve } = require('node:path');
+const { exit } = require('node:process');
 
 const API_KEY = process.env['IBMCLOUD_API_KEY'];
 if (!API_KEY) throw Error(`Missing 'IBMCLOUD_API_KEY'`);
@@ -103,21 +104,29 @@ async function createS2sAuthPolicy(bearer, item) {
         });
 
         if (!response.ok) {
-            throw new Error(`Response status: ${response.status}, ${response.statusText}`);
+            return Promise.reject(`Failed to create service-to-service authorization policy for ${item['serviceId']} '${item['parameters']['label'] ?? item['parameters']['name']}' with status: ${response.status} ${response.statusText}`);
         }
 
         console.log(`CREATING AUTH POLICY... ${response.status}, ${response.statusText}`);
     } catch (error) {
-        console.error(error.message);
+        return Promise.reject(error.message);
     }
 }
 
 // main
 
-getBearer().then((bearer) => {
+getBearer().then(async (bearer) => {
     const inputArr = JSON.parse(fs.readFileSync(resolve(INPUT_PATH)));
 
-    inputArr.forEach(async (item) => {
-        await createS2sAuthPolicy(bearer, item);
+    const promises = [];
+    inputArr.forEach((item) => {
+        promises.push(createS2sAuthPolicy(bearer, item));
     });
+
+    try {
+        await Promise.all(promises);
+    } catch (e) {
+        console.error(e)
+        exit(1);
+    }
 });

package/package.json

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

package/test/copy-toolchain/functionalities.test.js

@@ -37,10 +37,19 @@ describe('copy-toolchain: Test functionalities', function () {
     const testCases = [
         {
             name: 'Terraform Version Verification',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TARGET_REGIONS[0]],
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TEST_TOOLCHAINS['empty'].region],
             expected: /✔ Terraform Version:/,
             options: {
-                exitCondition: '(Recommended) Add a tag to the cloned toolchain (Ctrl-C to abort):',
+                exitCondition: `(Recommended) Edit the cloned toolchain's name [default: ${TEST_TOOLCHAINS['empty'].name}] (Ctrl-C to abort):`,
+                timeout: 10000
+            }
+        },
+        {
+            name: 'CLI Version Verification',
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TEST_TOOLCHAINS['empty'].region],
+            expected: /✔ cd-tools Version:/,
+            options: {
+                exitCondition: `(Recommended) Edit the cloned toolchain's name [default: ${TEST_TOOLCHAINS['empty'].name}] (Ctrl-C to abort):`,
                 timeout: 10000
             }
         },
@@ -56,10 +65,10 @@ describe('copy-toolchain: Test functionalities', function () {
         },
         {
             name: 'Log file is created successfully',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TARGET_REGIONS[0]],
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TEST_TOOLCHAINS['empty'].region],
             expected: null,
             options: {
-                exitCondition: '(Recommended) Add a tag to the cloned toolchain (Ctrl-C to abort):',
+                exitCondition: `(Recommended) Edit the cloned toolchain's name [default: ${TEST_TOOLCHAINS['empty'].name}] (Ctrl-C to abort):`,
                 timeout: 10000,
                 cwd: TEMP_DIR + '/' + 'log-file-is-created-successfully'
             },
@@ -81,15 +90,6 @@ describe('copy-toolchain: Test functionalities', function () {
                 assert.isTrue(toolchainData.id === toolchainId, 'Was toolchain created successfully without any confirmations?');
             }
         },
-        {
-            name: 'Prompt User when toolchain name already exists in resource group',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TARGET_REGIONS[0]],
-            expected: new RegExp(`Warning! A toolchain named \'${TEST_TOOLCHAINS['empty'].name}\' already exists in:[\\s\\S]*?Resource Group:[\\s\\S]*?${R2R_CLI_RG_ID}`),
-            options: {
-                exitCondition: '(Recommended) Add a tag to the cloned toolchain (Ctrl-C to abort):',
-                timeout: 10000
-            }
-        },
         {
             name: 'Prompt User when toolchain name already exists in region',
             cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TEST_TOOLCHAINS['empty'].region, '-g', DEFAULT_RG_ID],

package/test/copy-toolchain/input-validation.test.js

@@ -125,10 +125,13 @@ describe('copy-toolchain: Test user input handling', function () {
     const invalidUserInputCases = [
         {
             name: 'Invalid Toolchain tag is provided',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TARGET_REGIONS[0]],
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['empty'].crn, '-r', TEST_TOOLCHAINS['empty'].region],
             expected: /Provided tag is invalid/,
             options: {
-                questionAnswerMap: { '(Recommended) Add a tag to the cloned toolchain (Ctrl-C to abort):': mocks.invalidTag },
+                questionAnswerMap: { 
+                    [`(Recommended) Edit the cloned toolchain's name [default: ${TEST_TOOLCHAINS['empty'].name}] (Ctrl-C to abort):`]: '',
+                    '(Recommended) Add a tag to the cloned toolchain (Ctrl-C to abort):': mocks.invalidTag
+                },
                 exitCondition: 'Validation failed',
                 timeout: 10000
             }

package/test/copy-toolchain/tf-import.test.js

@@ -43,12 +43,12 @@ describe('copy-toolchain: Test import-terraform output', function () {
                     ibm_cd_tekton_pipeline_trigger: 1,
                     ibm_cd_tekton_pipeline_trigger_property: 1,
                     ibm_cd_toolchain: 1,
+                    ibm_cd_toolchain_tool_cos: 1,
                     ibm_cd_toolchain_tool_custom: 1,
                     ibm_cd_toolchain_tool_githubconsolidated: 1,
                     ibm_cd_toolchain_tool_pipeline: 1,
                     ibm_cd_toolchain_tool_secretsmanager: 1,
                     ibm_cd_toolchain_tool_slack: 1,
-                    ibm_iam_authorization_policy: 1
                 });
             }
         },
@@ -68,12 +68,12 @@ describe('copy-toolchain: Test import-terraform output', function () {
                     ibm_cd_tekton_pipeline_trigger: 1,
                     ibm_cd_tekton_pipeline_trigger_property: 1,
                     ibm_cd_toolchain: 1,
+                    ibm_cd_toolchain_tool_cos: 1,
                     ibm_cd_toolchain_tool_custom: 1,
                     ibm_cd_toolchain_tool_githubconsolidated: 1,
                     ibm_cd_toolchain_tool_pipeline: 1,
                     ibm_cd_toolchain_tool_secretsmanager: 1,
                     ibm_cd_toolchain_tool_slack: 1,
-                    ibm_iam_authorization_policy: 1
                 });
             }
         },
@@ -99,7 +99,6 @@ describe('copy-toolchain: Test import-terraform output', function () {
                     ibm_cd_toolchain_tool_pipeline: 1,
                     ibm_cd_toolchain_tool_secretsmanager: 1,
                     ibm_cd_toolchain_tool_slack: 1,
-                    ibm_iam_authorization_policy: 1
                 })
             }
         },

package/test/copy-toolchain/tool-validation.test.js

@@ -56,7 +56,6 @@ describe('copy-toolchain: Test tool validation', function () {
             },
             assertionFunc: (output) => {
                 expect(output).to.match(/Warning! The following tools contain secrets that cannot be migrated/);
-                expect(output).to.match(/cloudobjectstorage[\s\S]*?cos_api_key/);
                 expect(output).to.match(/slack[\s\S]*?api_token/);
                 expect(output).to.match(/pipeline[\s\S]*?properties.doi-ibmcloud-api-key/);
             }