@ibm-cloud/cd-tools 1.15.10 → 1.15.13

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';
 
@@ -331,13 +331,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.10",
+  "version": "1.15.13",
   "description": "Tools and utilities for the IBM Cloud Continuous Delivery service and resources",
   "repository": {
     "type": "git",
@@ -38,5 +38,8 @@
     "mocha": "^11.7.4",
     "nconf": "^0.13.0",
     "node-pty": "^1.0.0"
+  },
+  "overrides": {
+    "serialize-javascript": "^7.0.3"
   }
 }

package/renovate.json

@@ -2,5 +2,17 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended"
-  ]
+  ],
+  "packageRules": [
+    {
+      "enabled": false,
+      "matchPackageNames": [
+        "*"
+      ]
+    }
+  ],
+  "vulnerabilityAlerts": {
+    "enabled": true
+  },
+  "osvVulnerabilityAlerts": true
 }