@ibm-cloud/cd-tools 1.3.3 → 1.3.4

package/cmd/utils/import-terraform.js

@@ -63,19 +63,17 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
             // check and add secret refs
             if (tool.tool_type_id in SECRET_KEYS_MAP) {
                 SECRET_KEYS_MAP[tool.tool_type_id].forEach(({ key, tfKey, prereq, required }) => {
-                    if (prereq) {
-                        if (!prereq.values.includes(tool[prereq.key])) return;
-                    }
+                    if (prereq && !prereq.values.includes(tool.parameters[prereq.key])) return; // missing prereq
 
                     if (isSecretReference(tool.parameters[key])) {
                         additionalProps[block.name].push({ param: tfKey, value: tool.parameters[key] });
                     } else {
                         const newFileName = SUPPORTED_TOOLS_MAP[tool.tool_type_id].split('ibm_')[1];
-                        if (required) {
+                        if (required || prereq) {
                             nonSecretRefs.push({
-                            resource_name: block.name, 
-                            property_name: tfKey,
-                            file_name: isCompact ? 'resources.tf' : `${newFileName}.tf`
+                                resource_name: block.name,
+                                property_name: tfKey,
+                                file_name: isCompact ? 'resources.tf' : `${newFileName}.tf`
                             });
                             additionalProps[block.name].push({ param: tfKey, value: `<${tfKey}>` });
                         }
@@ -180,6 +178,15 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
                 // do nothing
             }
 
+            // handle missing worker, which breaks terraform
+            try {
+                if (newTfFileObj['resource'][key][k]['worker'][0]['id'] === null) {
+                    delete newTfFileObj['resource'][key][k]['worker'];
+                }
+            } catch {
+                // do nothing
+            }
+
             // ignore null values
             for (const [k2, v2] of Object.entries(v[0])) {
                 if (v2 === null) delete newTfFileObj['resource'][key][k][k2];
@@ -218,7 +225,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
             }
 
             // add relevent references and depends_on
-            if (key === 'ibm_cd_tekton_pipeline') {
+            if (key === 'ibm_cd_tekton_pipeline' && newTfFileObj['resource'][key][k]['worker']) {
                 const workerId = newTfFileObj['resource'][key][k]['worker'][0]['id'];
                 if (workerId != null && workerId != 'public' && workerId in toolIdMap) {
                     newTfFileObj['resource'][key][k]['worker'][0]['id'] = `\${${toolIdMap[workerId].type}.${toolIdMap[workerId].name}.tool_id}`;
@@ -226,7 +233,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
             } else if (key === 'ibm_cd_tekton_pipeline_property' || key === 'ibm_cd_tekton_pipeline_trigger_property') {
                 const propValue = newTfFileObj['resource'][key][k]['value'];
                 if (newTfFileObj['resource'][key][k]['type'] === 'integration' && propValue in toolIdMap) {
-                    newTfFileObj['resource'][key][k]['depends_on'] = [`\${${toolIdMap[propValue].type}.${toolIdMap[propValue].name}}`];
+                    newTfFileObj['resource'][key][k]['value'] = `\${${toolIdMap[propValue].type}.${toolIdMap[propValue].name}.tool_id}`;
                 }
             }
 

package/cmd/utils/terraform.js

@@ -92,6 +92,7 @@ async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag,
     // for converting legacy GHE tool integrations
     const hasGHE = moreTfResources['github_integrated'].length > 0;
     const repoToTfName = {};
+    const toolIdToTfName = {};
     const newConvertedTf = {};
 
     if (hasGHE) {
@@ -100,8 +101,10 @@ async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag,
             const tfName = `converted--githubconsolidated_${getRandChars(4)}`;
 
             repoToTfName[gitUrl] = tfName;
+            toolIdToTfName[t['id']] = tfName;
             newConvertedTf[tfName] = {
                 toolchain_id: `\${ibm_cd_toolchain.${newTcId}.id}`,
+                name: t['name'],
                 initialization: [{
                     auto_init: 'false',
                     blind_connection: 'false',
@@ -286,6 +289,46 @@ async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag,
             }
         }
 
+        // add references to converted GHE integrations
+        if (isCompact || resourceName === 'ibm_cd_tekton_pipeline_property') {
+            for (const [k, v] of Object.entries(newTfFileObj['resource']['ibm_cd_tekton_pipeline_property'])) {
+                try {
+                    if (v['type'] === 'integration') {
+                        const thisValue = v['value'];
+
+                        if (thisValue in toolIdToTfName) {
+                            const thisTfName = toolIdToTfName[thisValue];
+                            newTfFileObj['resource']['ibm_cd_tekton_pipeline_property'][k]['value'] = `\${ibm_cd_toolchain_tool_githubconsolidated.${thisTfName}.tool_id}`;
+                        }
+                    }
+                }
+                catch {
+                    // do nothing
+                }
+
+            }
+        }
+
+        // add references to converted GHE integrations
+        if (isCompact || resourceName === 'ibm_cd_tekton_pipeline_trigger_property') {
+            for (const [k, v] of Object.entries(newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger_property'])) {
+                try {
+                    if (v['type'] === 'integration') {
+                        const thisValue = v['value'];
+
+                        if (thisValue in toolIdToTfName) {
+                            const thisTfName = toolIdToTfName[thisValue];
+                            newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger_property'][k]['value'] = `\${ibm_cd_toolchain_tool_githubconsolidated.${thisTfName}.tool_id}`;
+                        }
+                    }
+                }
+                catch {
+                    // do nothing
+                }
+
+            }
+        }
+
         if (isCompact || resourceName === 'ibm_cd_toolchain_tool_githubconsolidated') {
             if (hasGHE) {
                 newTfFileObj['resource']['ibm_cd_toolchain_tool_githubconsolidated'] = {

package/package.json

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