From 40e37d7b356ba5c374f8beb7049a48cb7b72d4ab Mon Sep 17 00:00:00 2001 From: raj pandey Date: Mon, 5 Feb 2024 16:04:51 +0530 Subject: [PATCH 1/8] added developerhub url from cma, and version bump --- package-lock.json | 4 ++-- package.json | 2 +- src/util/inquirer.ts | 19 +++---------------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea9ed0c..c08f62b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@contentstack/apps-cli", - "version": "1.0.6", + "version": "1.0.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@contentstack/apps-cli", - "version": "1.0.6", + "version": "1.0.7", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.17", diff --git a/package.json b/package.json index 76360c0..f3a48e2 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts index a00d1df..c58a4a5 100644 --- a/src/util/inquirer.ts +++ b/src/util/inquirer.ts @@ -160,23 +160,10 @@ async function getInstalledApps( */ async function getDeveloperHubUrl(): Promise { const { cma, name } = configHandler.get("region") || {}; - let developerHubBaseUrl = (config.developerHubUrls as Record)[ - 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 }), - }); - } + let developerHubBaseUrl = cma.replace('api','developerhub-api') + developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl; + if (developerHubBaseUrl.startsWith("http")) { developerHubBaseUrl = developerHubBaseUrl.split("//")[1]; } From 5a9b0f3c0886eeecf26069b129bf7f5fe3299828 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Thu, 8 Feb 2024 11:40:30 +0530 Subject: [PATCH 2/8] replaced dev9 with dev11 --- src/util/inquirer.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts index c58a4a5..22e64d5 100644 --- a/src/util/inquirer.ts +++ b/src/util/inquirer.ts @@ -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, @@ -159,15 +158,15 @@ async function getInstalledApps( * @return {*} {Promise} */ async function getDeveloperHubUrl(): Promise { - const { cma, name } = configHandler.get("region") || {}; + const { cma } = configHandler.get("region") || {}; let developerHubBaseUrl = cma.replace('api','developerhub-api') - - developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl; if (developerHubBaseUrl.startsWith("http")) { developerHubBaseUrl = developerHubBaseUrl.split("//")[1]; } + developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11')?developerHubBaseUrl.replace('dev11','dev'):developerHubBaseUrl; + console.log(developerHubBaseUrl) return developerHubBaseUrl; } From 61732f14b5267f41807c261869ec9d8f747908d3 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Thu, 8 Feb 2024 11:46:52 +0530 Subject: [PATCH 3/8] Removed console.log --- src/util/inquirer.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts index 22e64d5..7babcd4 100644 --- a/src/util/inquirer.ts +++ b/src/util/inquirer.ts @@ -166,7 +166,6 @@ async function getDeveloperHubUrl(): Promise { } developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11')?developerHubBaseUrl.replace('dev11','dev'):developerHubBaseUrl; - console.log(developerHubBaseUrl) return developerHubBaseUrl; } From e30dd86420d264e53cb6aac5e5368e4f3181cb90 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Thu, 8 Feb 2024 11:49:21 +0530 Subject: [PATCH 4/8] formatted the code --- src/util/inquirer.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts index 7babcd4..9f6feac 100644 --- a/src/util/inquirer.ts +++ b/src/util/inquirer.ts @@ -159,13 +159,15 @@ async function getInstalledApps( */ async function getDeveloperHubUrl(): Promise { const { cma } = configHandler.get("region") || {}; - let developerHubBaseUrl = cma.replace('api','developerhub-api') - + 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.startsWith("dev11") + ? developerHubBaseUrl.replace("dev11", "dev") + : developerHubBaseUrl; return developerHubBaseUrl; } From cd6dab00cba1b906a70a9876e83ec33f7c04dc47 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Fri, 9 Feb 2024 13:34:24 +0530 Subject: [PATCH 5/8] fixed the developerhub url for NA region --- src/util/inquirer.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts index 9f6feac..c55142e 100644 --- a/src/util/inquirer.ts +++ b/src/util/inquirer.ts @@ -168,6 +168,10 @@ async function getDeveloperHubUrl(): Promise { developerHubBaseUrl = developerHubBaseUrl.startsWith("dev11") ? developerHubBaseUrl.replace("dev11", "dev") : developerHubBaseUrl; + developerHubBaseUrl = developerHubBaseUrl.endsWith("io") + ? developerHubBaseUrl.replace("io", "com") + : developerHubBaseUrl; + return developerHubBaseUrl; } From 9ce4a7f114ecf9802cd3d733170bb8dda3f2faf9 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Fri, 1 Mar 2024 20:37:50 +0530 Subject: [PATCH 6/8] fix: remove stag url --- src/config/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/config/index.ts b/src/config/index.ts index a92f78f..a0f84d4 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -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: From ec6ac00340e61549b92542a0b92b59e854581cd6 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Fri, 1 Mar 2024 20:42:23 +0530 Subject: [PATCH 7/8] tmp version updated --- package-lock.json | 127 +++++++++++++++++++++++++++++++++++++--------- package.json | 2 +- 2 files changed, 104 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index c08f62b..0a489d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,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" }, "bin": { @@ -846,7 +846,6 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -863,7 +862,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, "engines": { "node": ">=12" }, @@ -875,7 +873,6 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, "engines": { "node": ">=12" }, @@ -886,14 +883,12 @@ "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -910,7 +905,6 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -925,7 +919,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -1601,7 +1594,6 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, "optional": true, "engines": { "node": ">=14" @@ -4062,8 +4054,7 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/ejs": { "version": "3.1.9", @@ -7122,7 +7113,6 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -9146,7 +9136,6 @@ "version": "1.10.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", - "dev": true, "dependencies": { "lru-cache": "^9.1.1 || ^10.0.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -9162,7 +9151,6 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", - "dev": true, "engines": { "node": "14 || >=16.14" } @@ -9171,7 +9159,6 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", - "dev": true, "engines": { "node": ">=16 || 14 >=14.17" } @@ -10118,6 +10105,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -10997,7 +10985,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -11023,7 +11010,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -11251,14 +11237,108 @@ } }, "node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.2.tgz", + "integrity": "sha512-ETcvHhaIc9J2MDEAH6N67j9bvBvu/3Gb764qaGhwtFvjtvhegqoqSpofgeyq1Sc24mW5pdyUDs9HP5j3ehkxRw==", + "dependencies": { + "rimraf": "^5.0.5" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/tmp/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/tmp/node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tmp/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tmp/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dependencies": { - "rimraf": "^3.0.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=8.17.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tmp/node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tmp/node_modules/rimraf": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/tmp/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/to-fast-properties": { @@ -12166,7 +12246,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", diff --git a/package.json b/package.json index f3a48e2..95ab791 100644 --- a/package.json +++ b/package.json @@ -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": { From 740a9ecfa92011f2e39810d5e84ef8d8bf725715 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Fri, 1 Mar 2024 20:58:01 +0530 Subject: [PATCH 8/8] audit fix --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a489d9..a9484a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6627,9 +6627,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "node_modules/is-arguments": {