From ade5acd541771bd380ce1403a7e282f2e6d2f673 Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Fri, 7 Jun 2024 14:35:47 +0530 Subject: [PATCH 1/2] feat: get and update command api calls --- src/commands/app/get.ts | 4 ++-- src/commands/app/update.ts | 4 ++-- src/util/common-utils.ts | 30 ++++++++++++++--------------- src/util/inquirer.ts | 5 +++-- test/unit/util/common-utils.test.ts | 10 ++++++---- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/commands/app/get.ts b/src/commands/app/get.ts index f33a2c7..bed5647 100644 --- a/src/commands/app/get.ts +++ b/src/commands/app/get.ts @@ -41,12 +41,12 @@ export default class Get extends AppCLIBaseCommand { if (!this.flags["app-uid"]) { appData = await getApp(this.flags, this.sharedConfig.org, { - managementSdk: this.managementAppSdk, + marketplaceSdk: this.marketplaceAppSdk, log: this.log, }); } else { appData = await fetchApp(this.flags, this.sharedConfig.org, { - managementSdk: this.managementAppSdk, + marketplaceSdk: this.marketplaceAppSdk, log: this.log, }); } diff --git a/src/commands/app/update.ts b/src/commands/app/update.ts index c4a8ef2..11f6ac5 100644 --- a/src/commands/app/update.ts +++ b/src/commands/app/update.ts @@ -121,7 +121,7 @@ export default class Update extends AppCLIBaseCommand { if (!this.manifestData.uid) { appData = (await getApp(this.flags, this.orgUid, { - managementSdk: this.managementAppSdk, + marketplaceSdk: this.marketplaceAppSdk, log: this.log, })) as App; this.manifestData.uid = appData.uid; @@ -130,7 +130,7 @@ export default class Update extends AppCLIBaseCommand { { "app-uid": this.manifestData.uid as any }, this.orgUid, { - managementSdk: this.managementAppSdk, + marketplaceSdk: this.marketplaceAppSdk, log: this.log, } ); diff --git a/src/util/common-utils.ts b/src/util/common-utils.ts index b0f570b..13eff03 100644 --- a/src/util/common-utils.ts +++ b/src/util/common-utils.ts @@ -54,15 +54,14 @@ function getOrgAppUiLocation(): Extension[] { async function fetchApps( flags: FlagInput, orgUid: string, - options: CommonOptions, + options: MarketPlaceOptions, skip = 0, apps: Record[] = [] ): Promise[]> { - const { log, managementSdk } = options; - const response = await managementSdk - .organization(orgUid) - .app() - .findAll({ + const { log, marketplaceSdk } = options; + const response = await marketplaceSdk + .marketplace(orgUid) + .findAllApps({ limit: 50, asc: "name", include_count: true, @@ -85,11 +84,11 @@ async function fetchApps( return apps; } -function fetchApp(flags: FlagInput, orgUid: string, options: CommonOptions) { - const { managementSdk } = options; +function fetchApp(flags: FlagInput, orgUid: string, options: MarketPlaceOptions) { + const { marketplaceSdk } = options; const app: any = flags["app-uid"]; - return managementSdk - .organization(orgUid) + return marketplaceSdk + .marketplace(orgUid) .app(app as string) .fetch(); } @@ -218,9 +217,9 @@ function uninstallApp( async function fetchInstalledApps( flags: FlagInput, orgUid: string, - options: CommonOptions + options: MarketPlaceOptions ) { - const { managementSdk, log } = options; + const { marketplaceSdk, log } = options; const apps = (await fetchApps(flags, orgUid, options)) || []; let batchRequests = []; // Make calls in batch. 10 requests per batch allowed. @@ -231,11 +230,10 @@ async function fetchInstalledApps( for (const batch of batchRequests) { const promises = batch.map(async (app) => { try { - const installations = await managementSdk - .organization(orgUid) + const installations = await marketplaceSdk + .marketplace(orgUid) .app(app.uid) - .installation() - .findAll(); + .listInstallations(); return installations.items.length ? installations.items : null; } catch (error) { log("Unable to fetch installations.", "warn"); diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts index 51f44e2..78e23e6 100644 --- a/src/util/inquirer.ts +++ b/src/util/inquirer.ts @@ -21,6 +21,7 @@ import { fetchInstalledApps, fetchApps, sanitizePath, + MarketPlaceOptions, } from "./common-utils"; /** @@ -106,7 +107,7 @@ async function getOrg(flags: FlagInput, options: CommonOptions) { async function getApp( flags: FlagInput, orgUid: string, - options: CommonOptions + options: MarketPlaceOptions ): Promise | undefined> { cliux.loader("Loading Apps"); const apps = await fetchApps(flags, orgUid, options); @@ -131,7 +132,7 @@ async function getApp( async function getInstalledApps( flags: FlagInput, orgUid: string, - options: CommonOptions + options: MarketPlaceOptions ): Promise | undefined> { cliux.loader("Loading Apps"); const apps = await fetchInstalledApps(flags, orgUid, options); diff --git a/test/unit/util/common-utils.test.ts b/test/unit/util/common-utils.test.ts index 8c288df..eb29aa3 100644 --- a/test/unit/util/common-utils.test.ts +++ b/test/unit/util/common-utils.test.ts @@ -4,7 +4,9 @@ import { cliux, configHandler, ContentstackClient, + ContentstackMarketplaceClient, managementSDKClient, + marketplaceSDKClient, } from "@contentstack/cli-utilities"; import { LogFn } from "../../../src/types"; @@ -20,13 +22,13 @@ const developerHubBaseUrl = getDeveloperHubUrl(); describe("common utils", () => { const log: LogFn = () => {}; let managementSdk: ContentstackClient; - let managementAppSdk: ContentstackClient; + let marketplaceAppSdk: ContentstackMarketplaceClient; before(async () => { managementSdk = await managementSDKClient({ host: region.cma.replace("https://", ""), }); - managementAppSdk = await managementSDKClient({ + marketplaceAppSdk = await marketplaceSDKClient({ host: developerHubBaseUrl, }); }); @@ -109,7 +111,7 @@ describe("common utils", () => { "test-uid-1", { log, - managementSdk: managementAppSdk, + marketplaceSdk: marketplaceAppSdk, } ); expect(app.uid).to.equal(mock.apps[0].uid); @@ -130,7 +132,7 @@ describe("common utils", () => { async () => await fetchApps({ "app-type": "stack" as any }, "test-uid-1", { log, - managementSdk: managementAppSdk, + marketplaceSdk: marketplaceAppSdk, }) ) .catch(({ message }) => expect(message).to.contains('"status":400')) From 012f0c5db65bbf82cdc4cc6f66376b6b343c32df Mon Sep 17 00:00:00 2001 From: harshithad0703 Date: Fri, 7 Jun 2024 15:51:25 +0530 Subject: [PATCH 2/2] chore: updated patch version instead of minor version bump --- README.md | 18 +++++++++--------- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 89ecc67..b21e5da 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ $ npm install -g @contentstack/apps-cli $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/apps-cli/1.2.0 darwin-arm64 node-v18.16.0 +@contentstack/apps-cli/1.1.1 darwin-arm64 node-v18.16.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND @@ -66,7 +66,7 @@ EXAMPLES $ csdx app:reinstall ``` -_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/index.ts)_ +_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/index.ts)_ ## `csdx app:create` @@ -97,7 +97,7 @@ EXAMPLES $ csdx app:create --name App-3 --app-type organization --org -d ./boilerplate -c ./external-config.json ``` -_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/create.ts)_ +_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/create.ts)_ ## `csdx app:delete` @@ -122,7 +122,7 @@ EXAMPLES $ csdx app:delete --app-uid --org -d ./boilerplate ``` -_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/delete.ts)_ +_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/delete.ts)_ ## `csdx app:get` @@ -152,7 +152,7 @@ EXAMPLES $ csdx app:get --org --app-uid --app-type organization ``` -_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/get.ts)_ +_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/get.ts)_ ## `csdx app:install` @@ -178,7 +178,7 @@ EXAMPLES $ csdx app:install --org --app-uid --stack-api-key ``` -_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/install.ts)_ +_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/install.ts)_ ## `csdx app:reinstall` @@ -204,7 +204,7 @@ EXAMPLES $ csdx app:reinstall --org --app-uid --stack-api-key ``` -_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/reinstall.ts)_ +_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/reinstall.ts)_ ## `csdx app:uninstall` @@ -231,7 +231,7 @@ EXAMPLES $ csdx app:uninstall --org --app-uid --installation-uid ``` -_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/uninstall.ts)_ +_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/uninstall.ts)_ ## `csdx app:update` @@ -254,5 +254,5 @@ EXAMPLES $ csdx app:update --app-manifest ./boilerplate/manifest.json ``` -_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.2.0/src/commands/app/update.ts)_ +_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.1.1/src/commands/app/update.ts)_ diff --git a/package-lock.json b/package-lock.json index c73acf1..6700f82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@contentstack/apps-cli", - "version": "1.2.0", + "version": "1.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@contentstack/apps-cli", - "version": "1.2.0", + "version": "1.1.1", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.17", diff --git a/package.json b/package.json index a8a9890..49395f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/apps-cli", - "version": "1.2.0", + "version": "1.1.1", "description": "App ClI", "author": "Contentstack CLI", "homepage": "https://github.com/contentstack/contentstack-apps-cli",