@ibm-cloud/cd-tools 1.15.23 → 1.15.25

package/README.md

@@ -81,8 +81,8 @@ Examples:
       Copy all the Git Repos and Issue Tracking projects in the group "mygroup" from the Toronto region to the Dallas, with the same group name.
 
 Options:
-  -s, --source-region <region>  The source region from which to copy the project group (choices: "au-syd", "br-sao", "ca-mon", "ca-tor", "eu-de", "eu-es", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south")
-  -d, --dest-region <region>    The destination region to copy the projects to (choices: "au-syd", "br-sao", "ca-mon", "ca-tor", "eu-de", "eu-es", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south")
+  -s, --source-region <region>  The source region from which to copy the project group (choices: "au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-tok", "us-east", "us-south")
+  -d, --dest-region <region>    The destination region to copy the projects to (choices: "au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-tok", "us-east", "us-south")
   --st, --source-token <token>  A Git Repos and Issue Tracking personal access token from the source region. The api scope is required on the token.
   --dt, --dest-token <token>    A Git Repos and Issue Tracking personal access token from the target region. The api scope is required on the token.
   -g, --group-id <id>           The id of the group to copy from the source region (e.g. "1796019"), or the group name (e.g. "mygroup") for top-level groups. For sub-groups, a path
@@ -148,7 +148,7 @@ Environment Variables:
 
 Basic options:
   -c, --toolchain-crn <crn>              The CRN of the source toolchain to copy
-  -r, --region <region>                  The destination region of the copied toolchain (choices: "au-syd", "br-sao", "ca-mon", "ca-tor", "eu-de", "eu-es", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south")
+  -r, --region <region>                  The destination region of the copied toolchain (choices: "au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-tok", "us-east", "us-south")
   -a, --apikey <api_key>                 API key used to authenticate. Must be a user API key, with IAM permission to read and create toolchains and service-to-service authorizations in source and target region / resource group
   -n, --name <name>                      (Optional) The name of the copied toolchain (default: same name as original)
   -g, --resource-group <resource_group>  (Optional) The name or ID of destination resource group of the copied toolchain (default: same resource group as original)

package/cmd/direct-transfer.js

@@ -1,6 +1,6 @@
 /**
  * Licensed Materials - Property of IBM
- * (c) Copyright IBM Corporation 2025. All Rights Reserved.
+ * (c) Copyright IBM Corporation 2025, 2026. All Rights Reserved.
  *
  * Note to U.S. Government Users Restricted Rights:
  * Use, duplication or disclosure restricted by GSA ADP Schedule
@@ -925,8 +925,8 @@ async function directTransfer(options) {
 const command = new Command('copy-project-group')
   .summary('Copies all Git Repos and Issue Tracking projects in a group to another region.')
   .description(COPY_PROJECT_GROUP_DESC)
-  .requiredOption('-s, --source-region <region>', 'The source region from which to copy the project group (choices: "au-syd", "br-sao", "ca-mon", "ca-tor", "eu-de", "eu-es", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south")')
-  .requiredOption('-d, --dest-region <region>', 'The destination region to copy the projects to (choices: "au-syd", "br-sao", "ca-mon", "ca-tor", "eu-de", "eu-es", "eu-gb", "jp-osa", "jp-tok", "us-east", "us-south")')
+  .requiredOption('-s, --source-region <region>', 'The source region from which to copy the project group (choices: "au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-tok", "us-east", "us-south")')
+  .requiredOption('-d, --dest-region <region>', 'The destination region to copy the projects to (choices: "au-syd", "br-sao", "ca-tor", "eu-de", "eu-gb", "jp-tok", "us-east", "us-south")')
   .requiredOption('--st, --source-token <token>', 'A Git Repos and Issue Tracking personal access token from the source region. The api scope is required on the token.')
   .requiredOption('--dt, --dest-token <token>', 'A Git Repos and Issue Tracking personal access token from the target region. The api scope is required on the token.')
   .requiredOption('-g, --group-id <id>', 'The id of the group to copy from the source region (e.g. "1796019"), or the group name (e.g. "mygroup") for top-level groups. For sub-groups, a path is also allowed, e.g. "mygroup/subgroup"')

package/cmd/utils/import-terraform.js

@@ -1,6 +1,6 @@
 /**
  * Licensed Materials - Property of IBM
- * (c) Copyright IBM Corporation 2025. All Rights Reserved.
+ * (c) Copyright IBM Corporation 2025, 2026. All Rights Reserved.
  *
  * Note to U.S. Government Users Restricted Rights:
  * Use, duplication or disclosure restricted by GSA ADP Schedule
@@ -13,7 +13,7 @@ import { parse as tfToJson } from '@cdktf/hcl2json'
 import { jsonToTf } from 'json-to-tf';
 
 import { getPipelineData, getToolchainTools } from './requests.js';
-import { runTerraformPlanGenerate, setTerraformEnv } from './terraform.js';
+import { initProviderFile, runTerraformPlanGenerate, setTerraformEnv } from './terraform.js';
 import { escapeReservedChars, getRandChars, isSecretReference, normalizeName } from './utils.js';
 import { logger } from './logger.js';
 
@@ -157,6 +157,7 @@ export async function importTerraform(token, apiKey, region, toolchainId, toolch
     importBlocksToTf(importBlocks, dir);
 
     if (!fs.existsSync(`${dir}/generated`)) fs.mkdirSync(`${dir}/generated`);
+    await initProviderFile(region, `${dir}/generated`);
 
     // STEP 2/2: run terraform import and post-processing
     setTerraformEnv(apiKey, verbosity);
@@ -381,8 +382,9 @@ function importBlocksToTf(blocks, dir) {
 
     blocks.forEach((block) => {
         const template = `import {
-  id = "${block.id}"
-  to = ${block.to}
+  id       = "${block.id}"
+  to       = ${block.to}
+  provider = ibm
 }\n\n`;
         fileContent += template;
     });

package/cmd/utils/terraform.js

@@ -255,8 +255,7 @@ async function setupTerraformFiles(config) {
         }
 
         if (isCompact || resourceName === 'ibm_cd_tekton_pipeline_trigger') {
-            // by default, disable triggers
-            if (disableTriggers && newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger']) {
+            if (newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger']) {
                 for (const key of Object.keys(newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'])) {
                     // escape filter, which may contain reserved characters
                     const filterVal = newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['filter'];
@@ -265,7 +264,7 @@ async function setupTerraformFiles(config) {
                     }
 
                     // disable all triggers (timed, git, webhooks) except manual triggers
-                    if (newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['type'] != 'manual') {
+                    if (disableTriggers && newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['type'] != 'manual') {
                         newTfFileObj['resource']['ibm_cd_tekton_pipeline_trigger'][key]['enabled'] = false;
                     }
                 }

package/config.js

@@ -30,12 +30,9 @@ const DOCS_URL = 'https://github.com/IBM/continuous-delivery-tools';
 const SOURCE_REGIONS = [
 	'au-syd',
 	'br-sao',
-	'ca-mon',
 	'ca-tor',
 	'eu-de',
-	'eu-es',
 	'eu-gb',
-	'jp-osa',
 	'jp-tok',
 	'us-east',
 	'us-south'
@@ -44,12 +41,9 @@ const SOURCE_REGIONS = [
 const TARGET_REGIONS = [
 	'au-syd',
 	'br-sao',
-	'ca-mon',
 	'ca-tor',
 	'eu-de',
-	'eu-es',
 	'eu-gb',
-	'jp-osa',
 	'jp-tok',
 	'us-east',
 	'us-south'
@@ -58,12 +52,9 @@ const TARGET_REGIONS = [
 const BROKER_REGIONS = [
   	'au-syd',
 	'br-sao',
-	'ca-mon',
 	'ca-tor',
 	'eu-de',
-	'eu-es',
 	'eu-gb',
-	'jp-osa',
 	'jp-tok',
 	'us-east',
 	'us-south'

package/package.json

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

package/test/copy-toolchain/functionalities.test.js

@@ -29,11 +29,12 @@ const CLI_PATH = path.resolve('index.js');
 const COMMAND = 'copy-toolchain';
 
 const toolchainsToDelete = new Map();
-after(async () => await deleteCreatedToolchains(toolchainsToDelete));
 
 describe('copy-toolchain: Test functionalities', function () {
     this.timeout('300s');
     this.command = COMMAND;
+
+    after(async () => await deleteCreatedToolchains(toolchainsToDelete));
     const testCases = [
         {
             name: 'Terraform Version Verification',

package/test/copy-toolchain/tool-validation.test.js

@@ -1,6 +1,6 @@
 /**
  * Licensed Materials - Property of IBM
- * (c) Copyright IBM Corporation 2025. All Rights Reserved.
+ * (c) Copyright IBM Corporation 2025, 2026. All Rights Reserved.
  *
  * Note to U.S. Government Users Restricted Rights:
  * Use, duplication or disclosure restricted by GSA ADP Schedule
@@ -25,15 +25,16 @@ const CLI_PATH = path.resolve('index.js');
 const COMMAND = 'copy-toolchain';
 
 const toolchainsToDelete = new Map();
-after(async () => await deleteCreatedToolchains(toolchainsToDelete));
 
 describe('copy-toolchain: Test tool validation', function () {
     this.timeout('300s');
     this.command = COMMAND;
+
+    after(async () => await deleteCreatedToolchains(toolchainsToDelete));
     const testCases = [
         {
             name: 'Misconfigured tool identified',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['1pl-ghe-cd'].crn, '-r', TARGET_REGIONS[10]],
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['1pl-ghe-cd'].crn, '-r', TARGET_REGIONS[7]],
             expected: /slack[\s\S]*?misconfigured/,
             options: {
                 exitCondition: 'Caution: The above tool(s) will not be properly configured post migration. Do you want to proceed?',
@@ -45,7 +46,7 @@ describe('copy-toolchain: Test tool validation', function () {
         },
         {
             name: 'Tools with plain text secrets identified',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['1pl-ghe-cd'].crn, '-r', TARGET_REGIONS[10]],
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['1pl-ghe-cd'].crn, '-r', TARGET_REGIONS[7]],
             expected: null,
             options: {
                 exitCondition: 'Caution: The above tool(s) will not be properly configured post migration. Do you want to proceed?',
@@ -62,7 +63,7 @@ describe('copy-toolchain: Test tool validation', function () {
         },
         {
             name: 'Classic pipelines are identified',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['misconfigured'].crn, '-r', TARGET_REGIONS[10]],
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['misconfigured'].crn, '-r', TARGET_REGIONS[0]],
             expected: /Warning! Classic pipelines are currently not supported in migration/,
             options: {
                 exitCondition: 'Caution: The above tool(s) will not be properly configured post migration. Do you want to proceed?',
@@ -74,7 +75,7 @@ describe('copy-toolchain: Test tool validation', function () {
         },
         {
             name: 'Git tools using PAT are identified',
-            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['misconfigured'].crn, '-r', TARGET_REGIONS[10]],
+            cmd: [CLI_PATH, COMMAND, '-c', TEST_TOOLCHAINS['misconfigured'].crn, '-r', TARGET_REGIONS[0]],
             expected: null,
             options: {
                 exitCondition: 'Caution: The above tool(s) will not be properly configured post migration. Do you want to proceed?',