@ibm-cloud/cd-tools 1.14.1 → 1.15.0

package/cmd/copy-toolchain.js

@@ -270,21 +270,34 @@ async function main(options) {
 		}
 
 		await setupTerraformFiles({
-			token: bearer,
-			srcRegion: sourceRegion,
-			targetRegion: targetRegion,
-			targetTag: targetTag,
-			targetToolchainName: targetToolchainName,
-			targetRgId: targetRgId,
-			disableTriggers: disableTriggers,
-			isCompact: isCompact,
-			outputDir: outputDir,
-			tempDir: TEMP_DIR,
-			moreTfResources: moreTfResources,
-			gritMapping: gritMapping,
-			skipUserConfirmation: skipUserConfirmation,
-			includeS2S: includeS2S,
-			timeSuffix: TIME_SUFFIX
+			auth: {
+				token: bearer
+			},
+			source: {
+				srcRegion: sourceRegion,
+				srcToolchainId: sourceToolchainId
+			},
+			target: {
+				targetRegion: targetRegion,
+				targetRgId: targetRgId,
+				targetToolchainName: targetToolchainName,
+				targetTag: targetTag
+			},
+			options: {
+				disableTriggers: disableTriggers,
+				includeS2S: includeS2S,
+				isCompact: isCompact,
+				skipUserConfirmation: skipUserConfirmation
+			},
+			paths: {
+				tempDir: TEMP_DIR,
+				outputDir: outputDir
+			},
+			additional: {
+				gritMapping: gritMapping,
+				moreTfResources: moreTfResources,
+				timeSuffix: TIME_SUFFIX
+			}
 		});
 	} catch (err) {
 		if (err.message && err.stack) {

package/cmd/utils/requests.js

@@ -13,6 +13,8 @@ import axiosRetry from 'axios-retry';
 import mocks from '../../test/data/mocks.js'
 import { logger, LOG_STAGES } from './logger.js';
 
+import packageJson from '../../package.json' with { type: 'json' };
+
 const CLOUD_PLATFORM = process.env['IBMCLOUD_PLATFORM_DOMAIN'] || 'cloud.ibm.com';
 const DEV_MODE = CLOUD_PLATFORM !== 'cloud.ibm.com';
 const IAM_BASE_URL = DEV_MODE ? process.env['IBMCLOUD_IAM_API_ENDPOINT'] : 'https://iam.cloud.ibm.com';
@@ -117,6 +119,7 @@ async function getToolchain(bearer, toolchainId, region) {
             'Accept': 'application/json',
             'Authorization': `Bearer ${bearer}`,
             'Content-Type': 'application/json',
+            'User-Agent': `${packageJson.name}/${packageJson.version}`
         },
         validateStatus: () => true
     };

package/cmd/utils/terraform.js

@@ -68,7 +68,16 @@ async function initProviderFile(targetRegion, dir) {
     return writeFilePromise(`${dir}/provider.tf`, jsonToTf(newProviderTfStr));
 }
 
-async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag, targetToolchainName, targetRgId, disableTriggers, isCompact, outputDir, tempDir, moreTfResources, gritMapping, skipUserConfirmation, includeS2S, timeSuffix }) {
+async function setupTerraformFiles(config) {
+    const {
+        auth: { token },
+        source: { srcRegion, srcToolchainId },
+        target: { targetRegion, targetRgId, targetToolchainName, targetTag },
+        options: { disableTriggers, includeS2S, isCompact, skipUserConfirmation },
+        paths: { tempDir, outputDir },
+        additional: { gritMapping, moreTfResources, timeSuffix }
+    } = config;
+
     const promises = [];
 
     const writeProviderPromise = await initProviderFile(targetRegion, outputDir);
@@ -230,6 +239,19 @@ async function setupTerraformFiles({ token, srcRegion, targetRegion, targetTag,
             ];
             if (targetToolchainName) newTfFileObj['resource']['ibm_cd_toolchain'][newTcId]['name'] = targetToolchainName;
             if (targetRgId) newTfFileObj['resource']['ibm_cd_toolchain'][newTcId]['resource_group_id'] = targetRgId;
+
+            // set new description
+            const oldDesc = newTfFileObj['resource']['ibm_cd_toolchain'][newTcId]['description'];
+            let newDesc = `Copied from https://cloud.ibm.com/devops/toolchains/${srcToolchainId}?env_id=ibm:yp:${srcRegion}` +
+                (oldDesc && oldDesc != newTfFileObj['resource']['ibm_cd_toolchain'][newTcId]['name'] ?
+                    `; Original description: ${oldDesc}`
+                    : '')
+            // if greater than 500 chars, truncate to fit within 500 chars and add a marker`
+            if (newDesc.length > 500) {
+                const marker = ' (truncated)';
+                newDesc = newDesc.substring(0, 500 - marker.length) + marker;
+            }
+            newTfFileObj['resource']['ibm_cd_toolchain'][newTcId]['description'] = newDesc;
         }
 
         if (isCompact || resourceName === 'ibm_cd_tekton_pipeline_trigger') {

package/package.json

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