@ibm-cloud/cd-tools 1.2.0 → 1.2.2

package/cmd/copy-toolchain.js

@@ -16,7 +16,7 @@ import { Command, Option } from 'commander';
 import { parseEnvVar } from './utils/utils.js';
 import { logger, LOG_STAGES } from './utils/logger.js';
 import { setTerraformEnv, initProviderFile, setupTerraformFiles, runTerraformInit, getNumResourcesPlanned, runTerraformApply, getNumResourcesCreated, getNewToolchainId } from './utils/terraform.js';
-import { getAccountId, getBearerToken, getIamAuthPolicies, getResourceGroupIdAndName, getToolchain } from './utils/requests.js';
+import { getAccountId, getBearerToken, getCdInstanceByRegion, getIamAuthPolicies, getResourceGroupIdAndName, getToolchain } from './utils/requests.js';
 import { validatePrereqsVersions, validateTag, validateToolchainId, validateToolchainName, validateTools, validateOAuth, warnDuplicateName, validateGritUrl } from './utils/validate.js';
 import { importTerraform } from './utils/import-terraform.js';
 
@@ -26,11 +26,12 @@ process.on('exit', (code) => {
 	if (code !== 0) logger.print(`Need help? Visit ${MIGRATION_DOC_URL} for more troubleshooting information.`);
 });
 
+const TIME_SUFFIX = new Date().getTime();
 const LOGS_DIR = '.logs';
-const TEMP_DIR = '.migration-temp'
+const TEMP_DIR = '.migration-temp-' + TIME_SUFFIX;
 const LOG_DUMP = process.env['LOG_DUMP'] === 'false' ? false : true;	// when true or not specified, logs are also written to a log file in LOGS_DIR
 const DEBUG_MODE = process.env['DEBUG_MODE'] === 'true' ? true : false; // when true, temp folder is preserved
-const OUTPUT_DIR = 'output-' + new Date().getTime();
+const OUTPUT_DIR = 'output-' + TIME_SUFFIX;
 const DRY_RUN = false; // when true, terraform apply does not run
 
 
@@ -100,6 +101,16 @@ 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)) throw Error(`Could not find a Continuous Delivery instance in the target region '${targetRegion}', please create one before proceeding.`);
+
+		// check for existing .tf files in output directory
+		if (fs.existsSync(outputDir)) {
+			let files = readdirSync(outputDir, { recursive: true });
+			files = files.filter((f) => f.endsWith('.tf'));
+			if (files.length > 0) throw Error(`Output directory already has ${files.length} '.tf' files, please specify a different output directory`);
+		}
+
 		if (options.gritMappingFile) {
 			gritMapping = JSON.parse(fs.readFileSync(resolve(options.gritMappingFile)));
 			const gritPromises = [];

package/cmd/utils/import-terraform.js

@@ -8,7 +8,6 @@
  */
 
 import fs from 'node:fs';
-import { promisify } from 'node:util';
 
 import { parse as tfToJson } from '@cdktf/hcl2json'
 import { jsonToTf } from 'json-to-tf';
@@ -19,8 +18,6 @@ import { getRandChars, isSecretReference, normalizeName } from './utils.js';
 
 import { SECRET_KEYS_MAP, SUPPORTED_TOOLS_MAP } from '../../config.js';
 
-const writeFilePromise = promisify(fs.writeFile);
-
 export async function importTerraform(token, apiKey, region, toolchainId, toolchainName, policyIds, dir, isCompact, verbosity) {
     // STEP 1/2: set up terraform file with import blocks
     const importBlocks = []; // an array of objects representing import blocks, used in importBlocksToTf
@@ -150,7 +147,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
         }
     }
 
-    await importBlocksToTf(importBlocks, dir);
+    importBlocksToTf(importBlocks, dir);
 
     if (!fs.existsSync(`${dir}/generated`)) fs.mkdirSync(`${dir}/generated`);
 
@@ -296,7 +293,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
         }
     } else {
         const generatedFileNew = jsonToTf(JSON.stringify(newTfFileObj));
-        fs.writeFileSync(`${dir}/generated/generated.tf`, generatedFileNew);
+        fs.writeFileSync(`${dir}/generated/resources.tf`, generatedFileNew);
     }
 
     // remove draft
@@ -318,7 +315,7 @@ function importBlock(id, name, resourceType) {
 }
 
 // importBlocks array to tf file
-async function importBlocksToTf(blocks, dir) {
+function importBlocksToTf(blocks, dir) {
     let fileContent = '';
 
     blocks.forEach((block) => {
@@ -329,5 +326,5 @@ async function importBlocksToTf(blocks, dir) {
         fileContent += template;
     });
 
-    return await writeFilePromise(`${dir}/import.tf`, fileContent);
+    return fs.writeFileSync(`${dir}/import.tf`, fileContent);
 }

package/cmd/utils/requests.js

@@ -141,6 +141,31 @@ async function getToolchainsByName(bearer, accountId, toolchainName) {
     }
 }
 
+async function getCdInstanceByRegion(bearer, accountId, region) {
+    const apiBaseUrl = 'https://api.global-search-tagging.cloud.ibm.com/v3';
+    const options = {
+        url: apiBaseUrl + '/resources/search',
+        method: 'POST',
+        headers: {
+            'Authorization': `Bearer ${bearer}`,
+            'Content-Type': 'application/json',
+        },
+        data: {
+            'query': `service_name:continuous-delivery AND region:"${region}" AND doc.state:ACTIVE`,
+            'fields': ['doc.resource_group_id', 'doc.region_id']
+        },
+        params: { account_id: accountId },
+        validateStatus: () => true
+    };
+    const response = await axios(options);
+    switch (response.status) {
+        case 200:
+            return response.data.items.length > 0;
+        default:
+            throw Error('Get CD instance failed');
+    }
+}
+
 async function getToolchainTools(bearer, toolchainId, region) {
     const apiBaseUrl = `https://api.${region}.devops.cloud.ibm.com/toolchain/v2`;
     const options = {
@@ -388,6 +413,7 @@ async function deleteToolchain(bearer, toolchainId, region) {
 export {
     getBearerToken,
     getAccountId,
+    getCdInstanceByRegion,
     getToolchain,
     getToolchainsByName,
     getToolchainTools,

package/cmd/utils/terraform.js

@@ -9,7 +9,6 @@
 
 import child_process from 'node:child_process';
 import fs from 'node:fs';
-import { randomInt } from 'node:crypto';
 import { promisify } from 'node:util';
 
 import { parse as tfToJson } from '@cdktf/hcl2json'
@@ -302,7 +301,7 @@ async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag,
 }
 
 async function runTerraformPlanGenerate(dir, fileName) {
-    return await execPromise(`terraform plan -generate-config-out=${fileName}`, { cwd: dir });
+    return await execPromise(`terraform plan -generate-config-out="${fileName}"`, { cwd: dir });
 }
 
 async function runTerraformInit(dir) {

package/cmd/utils/validate.js

@@ -372,7 +372,7 @@ async function validateOAuth(token, tools, targetRegion, skipPrompt) {
 
         let hasFailedLink = false;
 
-        logger.print('Authorize using the following links: \n');
+        if (oauthLinks.length > 0) logger.print('Authorize using the following links:\n');
         oauthLinks.forEach((o) => {
             if (o.link === 'Could not get OAuth link') hasFailedLink = true;
             logger.print(`${o.type}: \x1b[36m${o.link}\x1b[0m\n`);

package/package.json

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