@ibm-cloud/cd-tools 1.15.11 → 1.15.14

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 { LOG_STAGES, logger } from './logger.js';
+import { logger } from './logger.js';
 
 import { SECRET_KEYS_MAP, SUPPORTED_TOOLS_MAP } from '../../config.js';
 
@@ -220,6 +220,15 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
                 // do nothing
             }
 
+            // if parameters is now empty after removing null values, remove parameters entirely
+            try {
+                if (Object.keys(v[0]['parameters'][0]).length === 0) {
+                    delete newTfFileObj['resource'][key][k]['parameters'];
+                }
+            } catch {
+                // do nothing
+            }
+
             // ignore null values (if it exists) in source properties
             try {
                 if (Object.keys(v[0]['source'][0]['properties'][0]).length > 0) {
@@ -331,13 +340,20 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
 
     if (!isCompact) {
         for (const [key, value] of Object.entries(newTfFileObj['resource'])) {
-            if (!key.startsWith('ibm_')) continue;
-            const newFileName = key.split('ibm_')[1];
-
-            const newFileContents = { 'resource': { [key]: value } };
-            const newFileContentsJson = jsonToTf(JSON.stringify(newFileContents));
-
-            fs.writeFileSync(`${dir}/generated/${newFileName}.tf`, newFileContentsJson);
+            try {
+                if (!key.startsWith('ibm_')) continue;
+                const newFileName = key.split('ibm_')[1];
+
+                const newFileContentsJson = { 'resource': { [key]: value } };
+                const newFileContentsTf = jsonToTf(JSON.stringify(newFileContentsJson));
+
+                fs.writeFileSync(`${dir}/generated/${newFileName}.tf`, newFileContentsTf);
+            } catch (err) {
+                // some extra error logging
+                logger.dump(`\nCurrent resource: ${key}`);
+                logger.dump(`\n  Current resource value: ${JSON.stringify(value, null, 2)}`);
+                throw err;
+            }
         }
     } else {
         const generatedFileNew = jsonToTf(JSON.stringify(newTfFileObj));

package/package.json

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