Merge pull request #2387 from contentstack/enhancement/DX-4443

feat: AM2.0 suppport in config module

Author: naman-contentstack

.talismanrc

@@ -1,19 +1,8 @@
-
 fileignoreconfig:
-- filename: packages/contentstack-import/src/import/modules/environments.ts
-  checksum: f61c635eaec8026e0cfa80a5ab8272f7946531f6d89505dc0d247b4c7ab0eab7
-- filename: pnpm-lock.yaml
-  checksum: 33b0a88264d099a2594bf8f18b8b025b0e15443dce340cd2ab5021ccc9aa84b0
-- filename: package-lock.json
-  checksum: 38142d4c1159342957985368de6d5caf77ab3198a926fe55cdfd95c7c7343100
-- filename: packages/contentstack-bootstrap/src/bootstrap/utils.ts
-  checksum: 5ab20e057fa9c4c300f7a882d30e1c68bbc91ed19de520488107e8c37239682a
-- filename: packages/contentstack-migration/README.md
-  checksum: 0deea9c8e43a89a4f20fb25ffe1a38cccd19020fe4fedae80f1ca24d34307f2b
-- filename: packages/contentstack-import/src/import/modules/taxonomies.ts
-  checksum: f4f44b6031d2936ec2da98b39bb5f5c1bd0f3be34dbe498c75e64a35b7d25a33
-- filename: packages/contentstack/README.md
-  checksum: 3a0fab964797476a71d2149ce261d265f410bd756eb9cde9400be9e5250fdc35
-- filename: packages/contentstack-audit/src/modules/entries.ts
-  checksum: 8ad10d72522433bc5ce66079248aa2dabae1758ee63335024efd8526d76dd885
+  - filename: pnpm-lock.yaml
+    checksum: 0d38bb12f29f0e69d78484a321bd17ca1ef0528f9e6294aac47fde45ab213a0b
+  - filename: package-lock.json
+    checksum: 3f5620c23bcc7df713fcf017382e8ccbf102d06387898ae1f328594f09924fbf
+  - filename: packages/contentstack-audit/src/modules/entries.ts
+    checksum: 8ad10d72522433bc5ce66079248aa2dabae1758ee63335024efd8526d76dd885
 version: '1.0'

package-lock.json

@@ -19,7 +19,7 @@
     "@contentstack/cli-cm-seed": "~2.0.0-beta.8",
     "@contentstack/cli-command": "~2.0.0-beta",
     "@contentstack/cli-utilities": "~2.0.0-beta",
-    "@contentstack/cli-config": "~2.0.0-beta.1",
+    "@contentstack/cli-config": "~2.0.0-beta.2",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.37",
     "inquirer": "8.2.7",

packages/contentstack-bootstrap/package.json

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-config/2.0.0-beta darwin-arm64 node-v24.12.0
+@contentstack/cli-config/2.0.0-beta.2 darwin-arm64 node-v24.12.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -457,23 +457,25 @@ Set region for CLI
 ```
 USAGE
   $ csdx config:set:region [REGION] [--cda <value> --cma <value> --ui-host <value> -n <value>] [--developer-hub
-    <value>] [--personalize <value>] [--launch <value>] [--studio <value>]
+    <value>] [--personalize <value>] [--launch <value>] [--studio <value>] [--asset-management <value>]
 
 ARGUMENTS
   [REGION]  Name for the region
 
 FLAGS
-  -n, --name=<value>           Name for the region, if this flag is added then cda, cma and ui-host flags are required
-      --cda=<value>            Custom host to set for content delivery API, if this flag is added then cma, ui-host and
-                               name flags are required
-      --cma=<value>            Custom host to set for content management API, , if this flag is added then cda, ui-host
-                               and name flags are required
-      --developer-hub=<value>  Custom host to set for Developer hub API
-      --launch=<value>         Custom host to set for Launch API
-      --personalize=<value>    Custom host to set for Personalize API
-      --studio=<value>         Custom host to set for Studio API
-      --ui-host=<value>        Custom UI host to set for CLI, if this flag is added then cda, cma and name flags are
-                               required
+  -n, --name=<value>              Name for the region, if this flag is added then cda, cma and ui-host flags are
+                                  required
+      --asset-management=<value>  Custom host to set for Asset Management API
+      --cda=<value>               Custom host to set for content delivery API, if this flag is added then cma, ui-host
+                                  and name flags are required
+      --cma=<value>               Custom host to set for content management API, , if this flag is added then cda,
+                                  ui-host and name flags are required
+      --developer-hub=<value>     Custom host to set for Developer hub API
+      --launch=<value>            Custom host to set for Launch API
+      --personalize=<value>       Custom host to set for Personalize API
+      --studio=<value>            Custom host to set for Studio API
+      --ui-host=<value>           Custom UI host to set for CLI, if this flag is added then cda, cma and name flags are
+                                  required
 
 DESCRIPTION
   Set region for CLI
@@ -505,6 +507,8 @@ EXAMPLES
 
   $ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --studio <custom_studio_url>
 
+  $ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --asset-management <asset_management_url>
+
   $ csdx config:set:region --cda <custom_cda_host_url> --cma <custom_cma_host_url> --ui-host <custom_ui_host_url> --name "India" --developer-hub <custom_developer_hub_url> --launch <custom_launch_url> --personalize <custom_personalize_url> --studio <custom_studio_url>
 ```
 

packages/contentstack-config/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "author": "Contentstack",
   "scripts": {
     "build": "npm run clean && npm run compile",
@@ -24,7 +24,7 @@
     "@contentstack/cli-command": "~2.0.0-beta",
     "@contentstack/cli-utilities": "~2.0.0-beta",
     "@contentstack/utils": "~1.7.0",
-    "@oclif/core": "^4.3.0",
+    "@oclif/core": "^4.8.1",
     "@oclif/plugin-help": "^6.2.28",
     "lodash": "^4.17.23"
   },
@@ -81,4 +81,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}

packages/contentstack-config/package.json

@@ -46,6 +46,9 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
     studio: _flags.string({
       description: 'Custom host to set for Studio API',
     }),
+    'asset-management': _flags.string({
+      description: 'Custom host to set for Asset Management API',
+    }),
   };
   static examples = [
     '$ csdx config:set:region',
@@ -61,6 +64,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
     '$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --personalize <custom_personalize_url>',
     '$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --launch <custom_launch_url>',
     '$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --studio <custom_studio_url>',
+    '$ csdx config:set:region --cma <custom_cma_host_url> --cda <custom_cda_host_url> --ui-host <custom_ui_host_url> --name "India" --asset-management <asset_management_url>',
     '$ csdx config:set:region --cda <custom_cda_host_url> --cma <custom_cma_host_url> --ui-host <custom_ui_host_url> --name "India" --developer-hub <custom_developer_hub_url> --launch <custom_launch_url> --personalize <custom_personalize_url> --studio <custom_studio_url>',
   ];
 
@@ -78,6 +82,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
     let personalizeUrl = regionSetFlags['personalize'];
     let launchHubUrl = regionSetFlags['launch'];
     let composableStudioUrl = regionSetFlags['studio'];
+    let assetManagementUrl = regionSetFlags['asset-management'];
     let selectedRegion = args.region;
     if (!(cda && cma && uiHost && name) && !selectedRegion) {
       selectedRegion = await interactive.askRegions();
@@ -108,6 +113,9 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
         if (!composableStudioUrl) {
           composableStudioUrl = this.transformUrl(cma, 'composable-studio-api');
         }
+        if (!assetManagementUrl) {
+          assetManagementUrl = this.transformUrl(cma, 'am-api');
+        }
         let customRegion: Region = {
           cda,
           cma,
@@ -117,6 +125,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
           personalizeUrl,
           launchHubUrl,
           composableStudioUrl,
+          assetManagementUrl,
         };
         customRegion = regionHandler.setCustomRegion(customRegion);
         await authHandler.setConfigData('logout'); //Todo: Handle this logout flow well through logout command call
@@ -128,6 +137,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
         cliux.success(`Personalize URL: ${customRegion.personalizeUrl}`);
         cliux.success(`Launch URL: ${customRegion.launchHubUrl}`);
         cliux.success(`Studio URL: ${customRegion.composableStudioUrl}`);
+        cliux.success(`Asset Management URL: ${customRegion.assetManagementUrl}`);
       } catch (error) {
         handleAndLogError(error, { ...this.contextDetails, module: 'config-set-region' });
       }
@@ -146,6 +156,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
       cliux.success(`Personalize URL: ${regionDetails.personalizeUrl}`);
       cliux.success(`Launch URL: ${regionDetails.launchHubUrl}`);
       cliux.success(`Studio URL: ${regionDetails.composableStudioUrl}`);
+      cliux.success(`Asset Management URL: ${regionDetails.assetManagementUrl}`);
     } else {
       cliux.error(`Invalid region specified.`);
     }

packages/contentstack-config/src/commands/config/set/region.ts

@@ -19,6 +19,7 @@ export interface Region {
   personalizeUrl: string;
   launchHubUrl: string;
   composableStudioUrl: string;
+  assetManagementUrl?: string;
 }
 
 export interface Limit {

packages/contentstack-config/src/interfaces/index.ts

@@ -26,7 +26,7 @@ function getRegionObject(regionKey: string): Region {
   try {
     // getContentstackEndpoint handles all aliases defined in regions.json
     const endpoints = getContentstackEndpoint(regionKey) as any;
-    
+
     if (typeof endpoints === 'string') {
       throw new Error('Invalid endpoint response');
     }
@@ -40,6 +40,7 @@ function getRegionObject(regionKey: string): Region {
       launchHubUrl: endpoints.launch,
       personalizeUrl: endpoints.personalizeManagement,
       composableStudioUrl: endpoints.composableStudio,
+      assetManagementUrl: endpoints.assetManagement,
     };
   } catch (error) {
     return null;
@@ -51,21 +52,10 @@ function getRegionObject(regionKey: string): Region {
  * This creates a regions object similar to the old hardcoded one but using @contentstack/utils
  */
 function getAvailableRegions() {
-  const regionKeys = [
-    'NA',
-    'AWS-NA',
-    'EU',
-    'AWS-EU',
-    'AU',
-    'AWS-AU',
-    'AZURE-NA',
-    'AZURE-EU',
-    'GCP-NA',
-    'GCP-EU',
-  ];
+  const regionKeys = ['NA', 'AWS-NA', 'EU', 'AWS-EU', 'AU', 'AWS-AU', 'AZURE-NA', 'AZURE-EU', 'GCP-NA', 'GCP-EU'];
 
   const regions: RegionsMap = {};
-  
+
   for (const key of regionKeys) {
     const regionObj = getRegionObject(key);
     if (regionObj) {
@@ -166,6 +156,7 @@ class UserConfig {
       personalizeUrl: regionObject['personalizeUrl'],
       launchHubUrl: regionObject['launchHubUrl'],
       composableStudioUrl: regionObject['composableStudioUrl'],
+      assetManagementUrl: regionObject['assetManagementUrl'],
     };
 
     return sanitizedRegion;

packages/contentstack-config/src/utils/region-handler.ts

@@ -17,6 +17,7 @@ describe('Region command', function () {
     launchHubUrl: 'https://launch-api.contentstack.com',
     personalizeUrl: 'https://personalization-api.contentstack.com',
     composableStudioUrl: 'https://composable-studio-api.contentstack.com',
+    assetManagementUrl: 'https://am-api.contentstack.com',
   };
   let cliuxPrintStub: sinon.SinonStub;
   let configGetStub: sinon.SinonStub;
@@ -43,32 +44,32 @@ describe('Region command', function () {
   });
   it('should log an error and exit when the region is not set', async function () {
     const command = new GetRegionCommand([], {} as any);
-    
+
     // Stub the region property to return undefined
     sinon.stub(command, 'region').get(() => undefined);
-    
+
     // Stub the exit method to throw to stop execution
     const exitStub = sinon.stub(command, 'exit').throws(new Error('EXIT_CALLED'));
-    
+
     // Stub cliux.error to capture error calls
     const errorStub = sinon.stub(cliux, 'error');
-    
+
     // Reset cliuxPrintStub to capture new calls
     cliuxPrintStub.reset();
-    
+
     // Call the run method directly, expect it to throw
     try {
       await command.run();
     } catch (error) {
       // Expected to throw due to exit stub
     }
-    
+
     // Verify that cliux.error was called with the correct message
     expect(errorStub.calledWith('CLI_CONFIG_GET_REGION_NOT_FOUND')).to.be.true;
-    
+
     // Verify exit was called
     expect(exitStub.called).to.be.true;
-    
+
     errorStub.restore();
   });
 
@@ -309,6 +310,7 @@ describe('Region command', function () {
       personalizeUrl: 'https://custom-personalize.com',
       launchHubUrl: 'https://custom-launch.com',
       composableStudioUrl: 'https://custom-composable-studio.com',
+      assetManagementUrl: 'https://custom-asset-management.com',
     };
     const result = UserConfig.setCustomRegion(customRegion);
     expect(result).to.deep.equal(customRegion);

packages/contentstack-config/test/unit/commands/region.test.ts

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~2.0.0-beta.5",
-    "@contentstack/cli-config": "~2.0.0-beta.1",
+    "@contentstack/cli-config": "~2.0.0-beta.2",
     "@contentstack/cli-dev-dependencies": "~1.3.1",
     "@oclif/plugin-help": "^6.2.28",
     "@oclif/test": "^4.1.13",