Enh/dx 3902 refactor endpoints integrations #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

harshithad0703 wants to merge 7 commits into development from enh/dx-3902-Refactor-Endpoints-Integrations

+73 −106

.talismanrc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,7 +2,7 @@ fileignoreconfig:
  
      - filename: packages/contentstack-export-to-csv/src/types/index.ts

        checksum: 28c19efb0c13969d40df964f86fa6de444316e320801f19dee7392df7a36851d

      - filename: package-lock.json

        checksum: 8622177c9f0bd80a3cedcb2e562ee0a9bb24436fea4c96724277b42d8c813496

      - filename: pnpm-lock.yaml

        checksum: ace2f01074f779a648ca15f76cde1b88489e2f7f741fb469772ad706209c0fe9

        checksum: 0982a352c260f7dd5bdde813104c2db8268abc489c791ec467b63eb8badb3cf1

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

        checksum: 7b36342fda136ce73bcbde45fba78a9fa8f58536abfd6bd48eff1e5d95d3be52

    version: '1.0'

package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

packages/contentstack-config/package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ @@
       "dependencies": {
         "@contentstack/cli-command": "~1.7.2",
         "@contentstack/cli-utilities": "~1.17.0",
+        "@contentstack/utils":"~1.6.3",
         "@oclif/core": "^4.3.0",
         "@oclif/plugin-help": "^6.2.28",
         "lodash": "^4.17.21"
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ -1,4 +1,9 @@
     import { configHandler } from '@contentstack/cli-utilities';
+    import { getContentstackEndpoint } from '@contentstack/utils';
+    import { Region } from '../interfaces';
+    interface RegionsMap {
+      [key: string]: Region;
+    }
     function validURL(str) {
       const pattern = new RegExp(
@@ Expand All / @@ -15,109 +20,67 @@ function validURL(str) { @@
       return pattern.test(str);
     }
-    // Available region list
-    const regions = {
-      NA: {
-        name: 'NA',
-        cma: 'https://api.contentstack.io',
-        cda: 'https://cdn.contentstack.io',
-        uiHost: 'https://app.contentstack.com',
-        developerHubUrl: 'https://developerhub-api.contentstack.com',
-        launchHubUrl: 'https://launch-api.contentstack.com',
-        personalizeUrl: 'https://personalize-api.contentstack.com',
-        composableStudioUrl: 'https://composable-studio-api.contentstack.com',
-      },
-      'AWS-NA': {
-        name: 'AWS-NA',
-        cma: 'https://api.contentstack.io',
-        cda: 'https://cdn.contentstack.io',
-        uiHost: 'https://app.contentstack.com',
-        developerHubUrl: 'https://developerhub-api.contentstack.com',
-        launchHubUrl: 'https://launch-api.contentstack.com',
-        personalizeUrl: 'https://personalize-api.contentstack.com',
-        composableStudioUrl: 'https://composable-studio-api.contentstack.com',
-      },
-      EU: {
-        name: 'EU',
-        cma: 'https://eu-api.contentstack.com',
-        cda: 'https://eu-cdn.contentstack.com',
-        uiHost: 'https://eu-app.contentstack.com',
-        developerHubUrl: 'https://eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://eu-composable-studio-api.contentstack.com',
-      },
-      'AWS-EU': {
-        name: 'AWS-EU',
-        cma: 'https://eu-api.contentstack.com',
-        cda: 'https://eu-cdn.contentstack.com',
-        uiHost: 'https://eu-app.contentstack.com',
-        developerHubUrl: 'https://eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://eu-composable-studio-api.contentstack.com',
-      },
-      AU: {
-        name: 'AU',
-        cma: 'https://au-api.contentstack.com',
-        cda: 'https://au-cdn.contentstack.com',
-        uiHost: 'https://au-app.contentstack.com',
-        developerHubUrl: 'https://au-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://au-launch-api.contentstack.com',
-        personalizeUrl: 'https://au-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://au-composable-studio-api.contentstack.com',
-      },
-      'AWS-AU': {
-        name: 'AWS-AU',
-        cma: 'https://au-api.contentstack.com',
-        cda: 'https://au-cdn.contentstack.com',
-        uiHost: 'https://au-app.contentstack.com',
-        developerHubUrl: 'https://au-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://au-launch-api.contentstack.com',
-        personalizeUrl: 'https://au-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://au-composable-studio-api.contentstack.com',
-      },
-      'AZURE-NA': {
-        name: 'AZURE-NA',
-        cma: 'https://azure-na-api.contentstack.com',
-        cda: 'https://azure-na-cdn.contentstack.com',
-        uiHost: 'https://azure-na-app.contentstack.com',
-        developerHubUrl: 'https://azure-na-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://azure-na-launch-api.contentstack.com',
-        personalizeUrl: 'https://azure-na-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://azure-na-composable-studio-api.contentstack.com',
-      },
-      'AZURE-EU': {
-        name: 'AZURE-EU',
-        cma: 'https://azure-eu-api.contentstack.com',
-        cda: 'https://azure-eu-cdn.contentstack.com',
-        uiHost: 'https://azure-eu-app.contentstack.com',
-        developerHubUrl: 'https://azure-eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://azure-eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://azure-eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://azure-eu-composable-studio-api.contentstack.com',
-      },
-      'GCP-NA': {
-        name: 'GCP-NA',
-        cma: 'https://gcp-na-api.contentstack.com',
-        cda: 'https://gcp-na-cdn.contentstack.com',
-        uiHost: 'https://gcp-na-app.contentstack.com',
-        developerHubUrl: 'https://gcp-na-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://gcp-na-launch-api.contentstack.com',
-        personalizeUrl: 'https://gcp-na-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://gcp-na-composable-studio-api.contentstack.com',
-      },
-      'GCP-EU': {
-        name: 'GCP-EU',
-        cma: 'https://gcp-eu-api.contentstack.com',
-        cda: 'https://gcp-eu-cdn.contentstack.com',
-        uiHost: 'https://gcp-eu-app.contentstack.com',
-        developerHubUrl: 'https://gcp-eu-developerhub-api.contentstack.com',
-        launchHubUrl: 'https://gcp-eu-launch-api.contentstack.com',
-        personalizeUrl: 'https://gcp-eu-personalize-api.contentstack.com',
-        composableStudioUrl: 'https://gcp-eu-composable-studio-api.contentstack.com',
-      },
-    };
+    /**
+     * Helper function to build region object from @contentstack/utils
+     * @param {string} regionKey - Region identifier
+     * @returns {object} Region object with all necessary URLs
+     */
+    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');
+        }
+        return {
+          name: regionKey,
+          cma: endpoints.contentManagement,
+          cda: endpoints.contentDelivery,
+          uiHost: endpoints.application,
+          developerHubUrl: endpoints.developerHub,
+          launchHubUrl: endpoints.launch,
+          personalizeUrl: endpoints.personalizeManagement,
+          composableStudioUrl: endpoints.composableStudio,
+        };
+      } catch (error) {
+        return null;
+      }
+    }
+    /**
+     * Get all available regions dynamically
+     * 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 regions: RegionsMap = {};
+      for (const key of regionKeys) {
+        const regionObj = getRegionObject(key);
+        if (regionObj) {
+          regions[key] = regionObj;
+        }
+      }
+      return regions;
+    }
+    // Available region list - now dynamically generated
+    const regions = getAvailableRegions();
     class UserConfig {
       /**
@@ Expand Down @@

pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enh/dx 3902 refactor endpoints integrations #2357

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Enh/dx 3902 refactor endpoints integrations #2357

Are you sure you want to change the base?

Enh/dx 3902 refactor endpoints integrations #2357

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!