Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 108 additions & 29 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentstack/apps-cli",
"version": "1.0.6",
"version": "1.0.7",
"description": "App ClI",
"author": "Contentstack CLI",
"homepage": "https://github.com/contentstack/contentstack-apps-cli",
Expand All @@ -27,7 +27,7 @@
"lodash": "^4.17.21",
"open": "^9.1.0",
"shelljs": "^0.8.5",
"tmp": "^0.2.1",
"tmp": "^0.2.2",
"winston": "^3.11.0"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const config = {
"azure-na-developerhub-api.contentstack.com",
"https://azure-eu-api.contentstack.com":
"azure-eu-developerhub-api.contentstack.com",
"https://stag-api.csnonprod.com": "stag-developerhub-api.csnonprod.com",
"https://gcp-na-api.contentstack.com": "gcp-na-developerhub-api.contentstack.com",
},
appBoilerplateGithubUrl:
Expand Down
29 changes: 10 additions & 19 deletions src/util/inquirer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import {
import { Installation } from "@contentstack/management/types/app/installation";
import { AppTarget } from "@contentstack/management/types/app/index";

import config from "../config";
import messages, { $t, commonMsg, errors, uninstallAppMsg } from "../messages";
import messages, { $t, errors, uninstallAppMsg } from "../messages";
import {
CommonOptions,
getOrganizations,
Expand Down Expand Up @@ -159,28 +158,20 @@ async function getInstalledApps(
* @return {*} {Promise<string>}
*/
async function getDeveloperHubUrl(): Promise<string> {
const { cma, name } = configHandler.get("region") || {};
let developerHubBaseUrl = (config.developerHubUrls as Record<string, string>)[
cma
];

if (!developerHubBaseUrl) {
developerHubBaseUrl = await cliux.inquire({
type: "input",
name: "name",
validate: (url) => {
if (!url) return errors.BASE_URL_EMPTY;

return true;
},
message: $t(commonMsg.DEVELOPER_HUB_URL_PROMPT, { name }),
});
}
const { cma } = configHandler.get("region") || {};
let developerHubBaseUrl = cma.replace("api", "developerhub-api");

if (developerHubBaseUrl.startsWith("http")) {
developerHubBaseUrl = developerHubBaseUrl.split("//")[1];
}

developerHubBaseUrl = developerHubBaseUrl.startsWith("dev11")
? developerHubBaseUrl.replace("dev11", "dev")
: developerHubBaseUrl;
developerHubBaseUrl = developerHubBaseUrl.endsWith("io")
? developerHubBaseUrl.replace("io", "com")
: developerHubBaseUrl;

return developerHubBaseUrl;
}

Expand Down