@ibm-cloud/cd-tools 1.15.5 → 1.15.7

package/cmd/copy-toolchain.js

@@ -109,13 +109,6 @@ async function main(options) {
 		bearer = await getBearerToken(apiKey);
 		const accountId = await getAccountId(bearer, apiKey);
 
-		// check for continuous delivery instance in target region
-		if (!await getCdInstanceByRegion(bearer, accountId, targetRegion)) {
-			// give users the option to bypass
-			logger.warn(`Warning! Could not find a Continuous Delivery instance in the target region ${targetRegion} or you do not have permission to view, please create one before proceeding if one does not exist already.`, LOG_STAGES.setup);
-			await promptUserConfirmation(`Do you want to proceed anyway?`, 'yes', 'Toolchain migration cancelled.');
-		}
-
 		// check for existing .tf files in output directory
 		if (fs.existsSync(outputDir)) {
 			let files = fs.readdirSync(outputDir, { recursive: true });
@@ -164,8 +157,20 @@ async function main(options) {
 			exit(1);
 		}
 
+		// check for continuous delivery instance in target region and resource group
+		const cdInstances = await getCdInstanceByRegion(bearer, accountId, targetRegion);
+		const cdInstanceFound = cdInstances?.some((instance) => {
+			return instance.doc?.resource_group_id === sourceToolchainData['resource_group_id'];
+		});
+
+		if (!cdInstanceFound) {
+			// give users the option to bypass
+			logger.warn(`Warning! Could not find a Continuous Delivery instance in the target region ${targetRegion} and toolchain's resource group or you do not have permission to view, please create one before proceeding if one does not exist already.`, LOG_STAGES.setup);
+			await promptUserConfirmation(`Do you want to proceed anyway?`, 'yes', 'Toolchain migration cancelled.');
+		}
+
 		const resourceGroups = await getResourceGroups(bearer, accountId, [targetRg || sourceToolchainData['resource_group_id']]);
-		({ id: targetRgId, name: targetRgName } = resourceGroups[0])
+		({ id: targetRgId, name: targetRgName } = resourceGroups[0]);
 		// reuse name if not provided
 		if (!targetToolchainName) targetToolchainName = sourceToolchainData['name'];
 		[targetToolchainName, targetTag] = await warnDuplicateName(bearer, accountId, targetToolchainName, sourceRegion, targetRegion, targetRgId, targetRgName, targetTag, skipUserConfirmation);

package/cmd/utils/requests.js

@@ -180,7 +180,7 @@ async function getCdInstanceByRegion(bearer, accountId, region) {
     const response = await axios(options);
     switch (response.status) {
         case 200:
-            return response.data.items.length > 0;
+            return response.data.items.length > 0 ? response.data.items : null;
         default:
             throw Error('Get CD instance failed');
     }

package/cmd/utils/terraform.js

@@ -268,7 +268,7 @@ async function setupTerraformFiles(config) {
                 for (const [k, v] of Object.entries(newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'])) {
                     try {
                         const thisUrl = v['source'][0]['properties'][0]['url'];
-                        if (!v['depends_on'] && thisUrl) {
+                        if (!v['depends_on'] && thisUrl && repoToTfName[thisUrl]) {
                             newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][k]['depends_on'] = [`ibm_cd_toolchain_tool_githubconsolidated.${repoToTfName[thisUrl]}`]
                         }
                     }
@@ -302,7 +302,7 @@ async function setupTerraformFiles(config) {
                 for (const [k, v] of Object.entries(newTfFileObj['resource']['ibm_cd_tekton_pipeline_definition'])) {
                     try {
                         const thisUrl = v['source'][0]['properties'][0]['url'];
-                        if (!v['depends_on'] && thisUrl) {
+                        if (!v['depends_on'] && thisUrl && repoToTfName[thisUrl]) {
                             newTfFileObj['resource']['ibm_cd_tekton_pipeline_definition'][k]['depends_on'] = [`ibm_cd_toolchain_tool_githubconsolidated.${repoToTfName[thisUrl]}`]
                         }
                     }

package/package.json

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