@ibm-cloud/cd-tools 1.15.1 → 1.15.3

package/cmd/utils/import-terraform.js

@@ -15,7 +15,7 @@ import { jsonToTf } from 'json-to-tf';
 import { getPipelineData, getToolchainTools } from './requests.js';
 import { runTerraformPlanGenerate, setTerraformEnv } from './terraform.js';
 import { getRandChars, isSecretReference, normalizeName } from './utils.js';
-import { logger } from './logger.js';
+import { LOG_STAGES, logger } from './logger.js';
 
 import { SECRET_KEYS_MAP, SUPPORTED_TOOLS_MAP } from '../../config.js';
 
@@ -236,6 +236,10 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
                 const propValue = newTfFileObj['resource'][key][k]['value'];
                 if (newTfFileObj['resource'][key][k]['type'] === 'integration' && propValue in toolIdMap) {
                     newTfFileObj['resource'][key][k]['value'] = `\${${toolIdMap[propValue].type}.${toolIdMap[propValue].name}.tool_id}`;
+                } else if (propValue) {
+                    // escape newlines, double quotes and backslashes
+                    if (propValue.includes('\n')) logger.warn(`Warning! Multi-line values for pipeline and trigger properties are not yet supported in the provider, newlines will be replaced with '\\\\n': "${k}"`, LOG_STAGES.import, true);
+                    newTfFileObj['resource'][key][k]['value'] = propValue.replace(/\\/g, '\\\\').replace(/\n/g, '\\n').replace(/\r/g, '\\r').replace(/"/g, '\\"');
                 }
             }
 

package/cmd/utils/terraform.js

@@ -334,13 +334,15 @@ async function setupTerraformFiles(config) {
         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}`;
-                        }
+                    const thisValue = v['value'];
+
+                    if (v['type'] === 'integration' && thisValue in toolIdToTfName) {
+                        const thisTfName = toolIdToTfName[thisValue];
+                        newTfFileObj['resource']['ibm_cd_tekton_pipeline_property'][k]['value'] = `\${ibm_cd_toolchain_tool_githubconsolidated.${thisTfName}.tool_id}`;
+                    } else if (thisValue) {
+                        // escape newlines, double quotes and backslashes
+                        // TODO: remove extra backslash in newline replacement once provider is updated
+                        newTfFileObj['resource']['ibm_cd_tekton_pipeline_property'][k]['value'] = thisValue.replace(/\\/g, '\\\\').replace(/\n/g, '\\\\n').replace(/\r/g, '\\\\r').replace(/"/g, '\\"');
                     }
                 }
                 catch {
@@ -354,13 +356,15 @@ async function setupTerraformFiles(config) {
         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}`;
-                        }
+                    const thisValue = v['value'];
+
+                    if (v['type'] === 'integration' && 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}`;
+                    } else if (thisValue) {
+                        // escape newlines, double quotes and backslashes
+                        // TODO: remove extra backslash in newline replacement once provider is updated
+                        newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger_property'][k]['value'] = thisValue.replace(/\\/g, '\\\\').replace(/\n/g, '\\\\n').replace(/\r/g, '\\\\r').replace(/"/g, '\\"');
                     }
                 }
                 catch {

package/cmd/utils/utils.js

@@ -217,5 +217,10 @@ export function normalizeName(str) {
 
     newStr = newStr.replaceAll(whitelistRegex, '');
 
+    // terraform resource names must start with a letter
+    if (!newStr.slice(0,1).match(/[A-Za-z]/)) {
+        newStr = `x_${newStr}`;
+    }
+
     return newStr.toLowerCase();
 };

package/package.json

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