Merge pull request #234 from contentstack/fix/DX-345-remove-static-url

DX- 345 | removed static url

Author: harshithad0703

src/base-command.ts

@@ -70,9 +70,9 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
     this.registerConfig();
 
     this.developerHubBaseUrl =
-    this.sharedConfig.developerHubBaseUrl || (await getDeveloperHubUrl());
+      this.sharedConfig.developerHubBaseUrl || getDeveloperHubUrl();
     await this.initCmaSDK();
-    
+
     // Init logger
     const logger = new Logger(this.sharedConfig);
     this.log = logger.log.bind(logger);
@@ -164,9 +164,9 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   validateRegionAndAuth() {
     if (this.region) {
       if (!isAuthenticated()) {
-          this.log(this.messages.CLI_APP_CLI_LOGIN_FAILED, "error");
-          this.exit(1);
-        }
+        this.log(this.messages.CLI_APP_CLI_LOGIN_FAILED, "error");
+        this.exit(1);
+      }
     }
   }
 }

src/config/index.ts

@@ -5,16 +5,6 @@ const config = {
   manifestPath: resolve(__dirname, "manifest.json"),
   boilerplateName: "marketplace-app-boilerplate-main",
   developerHubBaseUrl: "",
-  developerHubUrls: {
-    // NOTE CDA url used as developer-hub url mapper to avoid conflict if user used any custom name
-    "https://api.contentstack.io": "developerhub-api.contentstack.com",
-    "https://eu-api.contentstack.com": "eu-developerhub-api.contentstack.com",
-    "https://azure-na-api.contentstack.com":
-      "azure-na-developerhub-api.contentstack.com",
-    "https://azure-eu-api.contentstack.com":
-      "azure-eu-developerhub-api.contentstack.com",
-    "https://gcp-na-api.contentstack.com": "gcp-na-developerhub-api.contentstack.com",
-  },
   appBoilerplateGithubUrl:
     "https://codeload.github.com/contentstack/marketplace-app-boilerplate/zip/refs/heads/main",
   defaultAppFileName: "manifest",

src/util/inquirer.ts

@@ -158,7 +158,7 @@ async function getInstalledApps(
  *
  * @return {*}  {Promise<string>}
  */
-async function getDeveloperHubUrl(): Promise<string> {
+function getDeveloperHubUrl(): string {
   const { cma } = configHandler.get("region") || {};
   let developerHubBaseUrl = cma.replace("api", "developerhub-api");
 

test/unit/commands/app/create.test.ts

@@ -12,14 +12,13 @@ import config from "../../../../src/config";
 import messages from "../../../../src/messages";
 import * as mock from "../../mock/common.mock.json";
 import manifestData from "../../../../src/config/manifest.json";
+import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const { origin, pathname } = new URL(config.appBoilerplateGithubUrl);
 const zipPath = join(process.cwd(), "test", "unit", "mock", "boilerplate.zip");
 const region: { cma: string; name: string; cda: string } =
   configHandler.get("region");
-const developerHubBaseUrl = (config.developerHubUrls as Record<string, any>)[
-  region.cma
-];
+const developerHubBaseUrl = getDeveloperHubUrl();
 
 describe("app:create", () => {
   beforeEach(() => {

test/unit/commands/app/delete.test.ts

@@ -2,14 +2,12 @@ import { test, expect } from "@oclif/test";
 import { cliux, configHandler, ux } from "@contentstack/cli-utilities";
 import * as mock from "../../mock/common.mock.json"
 
-import config from "../../../../src/config";
 import messages, {$t} from "../../../../src/messages";
+import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const region: { cma: string; name: string; cda: string } =
   configHandler.get("region");
-const developerHubBaseUrl = (config.developerHubUrls as Record<string, any>)[
-  region.cma
-];
+const developerHubBaseUrl = getDeveloperHubUrl();
 
 describe("app:delete", () => {
     describe("app:delete with --org and --app-uid flags", () => {

test/unit/commands/app/get.test.ts

@@ -9,12 +9,12 @@ import * as mock from "../../mock/common.mock.json";
 import manifestData from "../../config/manifest.json";
 import messages, { $t } from "../../../../src/messages";
 import * as commonUtils from "../../../../src/util/common-utils";
+import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const region: { cma: string; name: string; cda: string } =
   configHandler.get("region");
-const developerHubBaseUrl = (config.developerHubUrls as Record<string, any>)[
-  region.cma
-];
+const developerHubBaseUrl = getDeveloperHubUrl();
+
 
 describe("app:get", () => {
   describe("Get app manifest", () => {

test/unit/commands/app/install.test.ts

@@ -3,11 +3,11 @@ import {expect, test} from "@oclif/test";
 
 import * as mock from "../../mock/common.mock.json"
 
-import config from "../../../../src/config";
 import messages, { $t } from "../../../../src/messages";
+import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const region: { cma: string, cda: string, name: string } = configHandler.get("region");
-const developerHubBaseUrl = (config.developerHubUrls as Record<string, any>)[region.cma];
+const developerHubBaseUrl = getDeveloperHubUrl();
 
 describe("app:install", () => {
     describe("Install an app on organization", () => {

test/unit/commands/app/reinstall.test.ts

@@ -2,14 +2,16 @@ import { ux, cliux, configHandler } from "@contentstack/cli-utilities";
 import { expect, test } from "@oclif/test";
 import * as mock from "../../mock/common.mock.json";
 import messages, { $t } from "../../../../src/messages";
+import { getDeveloperHubUrl } from "../../../../lib/util/inquirer";
 
 const region: { cma: string; cda: string; name: string } =
   configHandler.get("region");
-const developerHubBaseUrl = configHandler.get("developerHubBaseUrl");
+const developerHubBaseUrl = getDeveloperHubUrl();
+
 describe("app:reinstall", () => {
   describe("Reinstall an app on a stack", () => {
     test
-      .stdout({ print: true })
+      .stdout({ print: process.env.PRINT === "true" || false })
       .stub(ux.action, "stop", () => {})
       .stub(ux.action, "start", () => {})
       .stub(cliux, "inquire", async (...args: any) => {

test/unit/commands/app/uninstall.test.ts

@@ -3,11 +3,11 @@ import { expect, test } from "@oclif/test";
 
 import * as mock from "../../mock/common.mock.json"
 
-import config from "../../../../src/config"
 import messages, {$t} from "../../../../src/messages";
+import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const region: { cma: string, cda: string, name: string } = configHandler.get("region");
-const developerHubBaseUrl = (config.developerHubUrls as Record<string, any>)[region.cma];
+const developerHubBaseUrl = getDeveloperHubUrl();
 
 describe("app:uninstall", () => {
     describe("Uninstall an app from organization", () => {

test/unit/commands/app/update.test.ts

@@ -4,16 +4,14 @@ import { PassThrough } from "stream";
 import { expect, test } from "@oclif/test";
 import { cliux, ux, configHandler } from "@contentstack/cli-utilities";
 
-import config from "../../../../src/config";
 import messages from "../../../../src/messages";
 import * as mock from "../../mock/common.mock.json";
 import manifestData from "../../config/manifest.json";
+import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const region: { cma: string; name: string; cda: string } =
   configHandler.get("region");
-const developerHubBaseUrl = (config.developerHubUrls as Record<string, any>)[
-  region.cma
-];
+const developerHubBaseUrl = getDeveloperHubUrl();
 
 describe("app:update", () => {
   describe("Update app with `--app-manifest` flag", () => {