@contentstack/cli-cm-import 1.12.1 → 1.13.0

package/lib/utils/index.d.ts

@@ -5,7 +5,7 @@ export { fsUtil } from './file-helper';
 export { default as backupHandler } from './backup-handler';
 export { log, unlinkFileLogger } from './logger';
 export { uploadAssetHelper, lookupAssets } from './asset-helper';
-export { getDeveloperHubUrl, getOrgUid, getConfirmationToCreateApps, createPrivateApp, handleNameConflict, installApp, makeRedirectUrlCall, confirmToCloseProcess, getAllStackSpecificApps, ifAppAlreadyExist, updateAppConfig, } from './marketplace-app-helper';
+export { getDeveloperHubUrl, getOrgUid, getConfirmationToCreateApps, handleNameConflict, makeRedirectUrlCall, confirmToCloseProcess, getAllStackSpecificApps, ifAppAlreadyExist, } from './marketplace-app-helper';
 export { schemaTemplate, suppressSchemaReference, removeReferenceFields } from './content-type-helper';
 export { lookupExtension } from './extension-helper';
 export { lookupEntries, removeUidsFromJsonRteFields, removeEntryRefsFromJSONRTE, restoreJsonRteEntryRefs, } from './entries-helper';

package/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookUpTerms = exports.lookUpTaxonomy = exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = exports.lookupExtension = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = exports.updateAppConfig = exports.ifAppAlreadyExist = exports.getAllStackSpecificApps = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.installApp = exports.handleNameConflict = exports.createPrivateApp = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.lookupAssets = exports.uploadAssetHelper = exports.unlinkFileLogger = exports.log = exports.backupHandler = exports.fsUtil = exports.fileHelper = exports.setupImportConfig = exports.interactive = void 0;
+exports.lookUpTerms = exports.lookUpTaxonomy = exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = exports.lookupExtension = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = exports.ifAppAlreadyExist = exports.getAllStackSpecificApps = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.lookupAssets = exports.uploadAssetHelper = exports.unlinkFileLogger = exports.log = exports.backupHandler = exports.fsUtil = exports.fileHelper = exports.setupImportConfig = exports.interactive = void 0;
 const tslib_1 = require("tslib");
 exports.interactive = tslib_1.__importStar(require("./interactive"));
 var import_config_handler_1 = require("./import-config-handler");
@@ -20,14 +20,11 @@ var marketplace_app_helper_1 = require("./marketplace-app-helper");
 Object.defineProperty(exports, "getDeveloperHubUrl", { enumerable: true, get: function () { return marketplace_app_helper_1.getDeveloperHubUrl; } });
 Object.defineProperty(exports, "getOrgUid", { enumerable: true, get: function () { return marketplace_app_helper_1.getOrgUid; } });
 Object.defineProperty(exports, "getConfirmationToCreateApps", { enumerable: true, get: function () { return marketplace_app_helper_1.getConfirmationToCreateApps; } });
-Object.defineProperty(exports, "createPrivateApp", { enumerable: true, get: function () { return marketplace_app_helper_1.createPrivateApp; } });
 Object.defineProperty(exports, "handleNameConflict", { enumerable: true, get: function () { return marketplace_app_helper_1.handleNameConflict; } });
-Object.defineProperty(exports, "installApp", { enumerable: true, get: function () { return marketplace_app_helper_1.installApp; } });
 Object.defineProperty(exports, "makeRedirectUrlCall", { enumerable: true, get: function () { return marketplace_app_helper_1.makeRedirectUrlCall; } });
 Object.defineProperty(exports, "confirmToCloseProcess", { enumerable: true, get: function () { return marketplace_app_helper_1.confirmToCloseProcess; } });
 Object.defineProperty(exports, "getAllStackSpecificApps", { enumerable: true, get: function () { return marketplace_app_helper_1.getAllStackSpecificApps; } });
 Object.defineProperty(exports, "ifAppAlreadyExist", { enumerable: true, get: function () { return marketplace_app_helper_1.ifAppAlreadyExist; } });
-Object.defineProperty(exports, "updateAppConfig", { enumerable: true, get: function () { return marketplace_app_helper_1.updateAppConfig; } });
 var content_type_helper_1 = require("./content-type-helper");
 Object.defineProperty(exports, "schemaTemplate", { enumerable: true, get: function () { return content_type_helper_1.schemaTemplate; } });
 Object.defineProperty(exports, "suppressSchemaReference", { enumerable: true, get: function () { return content_type_helper_1.suppressSchemaReference; } });

package/lib/utils/log.d.ts

@@ -2,9 +2,11 @@ import { LogEntry } from 'winston/index';
 import { Logger } from '@contentstack/cli-utilities';
 import { LogsType, MessageType } from '@contentstack/cli-utilities/lib/logger';
 import { ImportConfig } from '../types';
+declare let logger: Logger;
 export declare function isImportConfig(config: ImportConfig | MessageType): config is ImportConfig;
 export declare function log(entry: LogEntry): void;
 export declare function log(error: MessageType, logType: LogsType): void;
 export declare function log(error: MessageType, logType: 'error', hidden: boolean): void;
 export declare function initLogger(config?: ImportConfig | undefined): Logger;
+export { logger };
 export declare const trace: typeof log;

package/lib/utils/log.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trace = exports.initLogger = exports.log = exports.isImportConfig = void 0;
+exports.trace = exports.logger = exports.initLogger = exports.log = exports.isImportConfig = void 0;
 const path_1 = require("path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 let logger;
+exports.logger = logger;
 function isImportConfig(config) {
     return config.data !== undefined && (config === null || config === void 0 ? void 0 : config.contentVersion) !== undefined;
 }
 exports.isImportConfig = isImportConfig;
 function log(entryOrMessage, logType, hidden) {
-    logger = initLogger();
+    exports.logger = logger = initLogger();
     if (logType === 'error') {
         logger.log(entryOrMessage, logType, hidden);
     }
@@ -22,7 +23,7 @@ function initLogger(config) {
     var _a;
     if (!logger) {
         const basePath = (0, path_1.join)((_a = config === null || config === void 0 ? void 0 : config.data) !== null && _a !== void 0 ? _a : process.cwd(), 'logs', 'import');
-        logger = new cli_utilities_1.Logger(Object.assign(config !== null && config !== void 0 ? config : {}, { basePath }));
+        exports.logger = logger = new cli_utilities_1.Logger(Object.assign(config !== null && config !== void 0 ? config : {}, { basePath }));
     }
     return logger;
 }

package/lib/utils/marketplace-app-helper.d.ts

@@ -1,16 +1,9 @@
-import { HttpClient, ContentstackClient } from '@contentstack/cli-utilities';
-import { ImportConfig } from '../types';
-export declare const getAllStackSpecificApps: (developerHubBaseUrl: string, httpClient: HttpClient, config: ImportConfig) => Promise<any>;
+import { ImportConfig, Installation } from '../types';
+export declare const getAllStackSpecificApps: (config: ImportConfig, skip?: number, listOfApps?: Installation[]) => Promise<Installation[]>;
 export declare const getDeveloperHubUrl: (config: ImportConfig) => Promise<string>;
 export declare const getOrgUid: (config: ImportConfig) => Promise<string>;
 export declare const getConfirmationToCreateApps: (privateApps: any, config: ImportConfig) => Promise<boolean>;
-export declare const createPrivateApp: (client: ContentstackClient, config: ImportConfig, app: any) => Promise<any>;
-export declare const installApp: (client: ContentstackClient, config: ImportConfig, appManifestUid?: string, mappedUid?: string) => Promise<any>;
 export declare const handleNameConflict: (app: any, appSuffix: number, config: ImportConfig) => Promise<any>;
 export declare const makeRedirectUrlCall: (response: any, appName: string, config: ImportConfig) => Promise<void>;
 export declare const confirmToCloseProcess: (installation: any, config: ImportConfig) => Promise<void>;
 export declare const ifAppAlreadyExist: (app: any, currentStackApp: any, config: ImportConfig) => Promise<{}>;
-export declare const updateAppConfig: (client: ContentstackClient, config: ImportConfig, app: any, payload: {
-    configuration: Record<string, unknown>;
-    server_configuration: Record<string, unknown>;
-}) => Promise<any>;

package/lib/utils/marketplace-app-helper.js

@@ -1,33 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAppConfig = exports.ifAppAlreadyExist = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = exports.installApp = exports.createPrivateApp = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.getAllStackSpecificApps = void 0;
+exports.ifAppAlreadyExist = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.getAllStackSpecificApps = void 0;
 const tslib_1 = require("tslib");
-const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const map_1 = tslib_1.__importDefault(require("lodash/map"));
-const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
+const omitBy_1 = tslib_1.__importDefault(require("lodash/omitBy"));
+const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const includes_1 = tslib_1.__importDefault(require("lodash/includes"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const logger_1 = require("./logger");
 const log_1 = require("../utils/log");
 const utils_1 = require("../utils");
 const interactive_1 = require("./interactive");
 const interactive_2 = require("../utils/interactive");
-const getAllStackSpecificApps = async (developerHubBaseUrl, httpClient, config) => {
-    const appSdkAxiosInstance = await (0, cli_utilities_1.managementSDKClient)({
-        host: developerHubBaseUrl.split('://').pop(),
+const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
+    const appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({
+        host: config.developerHubBaseUrl.split('://').pop(),
     });
-    return await appSdkAxiosInstance.axiosInstance
-        .get(`${developerHubBaseUrl}/installations?target_uids=${config.target_stack}`, {
-        headers: {
-            organization_uid: config.org_uid,
-        },
-    })
-        .then(({ data }) => data.data)
+    const collection = await appSdk
+        .marketplace(config.org_uid)
+        .installation()
+        .fetchAll({ target_uids: config.target_stack, skip })
         .catch((error) => {
         (0, log_1.trace)(error, 'error', true);
         (0, logger_1.log)(config, `Failed to export marketplace-apps ${(0, utils_1.formatError)(error)}`, 'error');
     });
+    if (collection) {
+        const { items: apps, count } = collection;
+        // NOTE Remove all the chain functions
+        const installation = (0, map_1.default)(apps, (app) => (0, omitBy_1.default)(app, (val, _key) => {
+            if (val instanceof Function)
+                return true;
+            return false;
+        }));
+        listOfApps = listOfApps.concat(installation);
+        if (count - (skip + 50) > 0) {
+            return await (0, exports.getAllStackSpecificApps)(config, skip + 50, listOfApps);
+        }
+    }
+    return listOfApps;
 };
 exports.getAllStackSpecificApps = getAllStackSpecificApps;
 const getDeveloperHubUrl = async (config) => {
@@ -64,24 +75,6 @@ const getConfirmationToCreateApps = async (privateApps, config) => {
     }
 };
 exports.getConfirmationToCreateApps = getConfirmationToCreateApps;
-const createPrivateApp = async (client, config, app) => {
-    const privateApp = (0, omit_1.default)(app, ['uid']);
-    return await client
-        .organization(config.org_uid)
-        .app()
-        .create(privateApp)
-        .catch((error) => error);
-};
-exports.createPrivateApp = createPrivateApp;
-const installApp = async (client, config, appManifestUid, mappedUid) => {
-    const appUid = mappedUid || appManifestUid;
-    return await client
-        .organization(config.org_uid)
-        .app(appUid)
-        .install({ targetUid: config.target_stack, targetType: 'stack' })
-        .catch((error) => error);
-};
-exports.installApp = installApp;
 const handleNameConflict = async (app, appSuffix, config) => {
     const appName = config.forceStopMarketplaceAppsPrompt
         ? (0, interactive_2.getAppName)(app.name, appSuffix)
@@ -142,19 +135,3 @@ const ifAppAlreadyExist = async (app, currentStackApp, config) => {
     return updateParam;
 };
 exports.ifAppAlreadyExist = ifAppAlreadyExist;
-const updateAppConfig = async (client, config, app, payload) => {
-    var _a;
-    let installation = client.organization(config.org_uid).app((_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.uid).installation(app === null || app === void 0 ? void 0 : app.uid);
-    installation = Object.assign(installation, payload);
-    return await installation
-        .update()
-        .then((data) => {
-        var _a;
-        (0, logger_1.log)(config, `${(_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.name} app config updated successfully.!`, 'success');
-    })
-        .catch((error) => {
-        (0, log_1.trace)(error, 'error', true);
-        (0, logger_1.log)(config, `Failed to update app config.${(0, utils_1.formatError)(error)}`, 'error');
-    });
-};
-exports.updateAppConfig = updateAppConfig;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.12.1",
+  "version": "1.13.0",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",
@@ -20,7 +20,7 @@
         "csdx cm:stacks:import --alias <management_token_alias>",
         "csdx cm:stacks:import --alias <management_token_alias> --data-dir <path/of/export/destination/dir>",
         "csdx cm:stacks:import --alias <management_token_alias> --config <path/of/config/file>",
-        "csdx cm:stacks:import --branch <branch name>  --yes"
+        "csdx cm:stacks:import --branch <branch name>  --yes --skip-audit"
       ],
       "flags": {
         "config": {
@@ -123,6 +123,12 @@
           "required": false,
           "allowNo": false
         },
+        "skip-app-recreation": {
+          "name": "skip-app-recreation",
+          "type": "boolean",
+          "description": "[optional] Skip private apps recreation if already exist",
+          "allowNo": false
+        },
         "replace-existing": {
           "name": "replace-existing",
           "type": "boolean",
@@ -136,6 +142,12 @@
           "description": "Skips the module exists warning messages.",
           "required": false,
           "allowNo": false
+        },
+        "skip-audit": {
+          "name": "skip-audit",
+          "type": "boolean",
+          "description": "Skips the audit fix.",
+          "allowNo": false
         }
       },
       "args": {}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
+    "@contentstack/cli-audit": "^1.3.2",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.8",
-    "@contentstack/management": "~1.12.0",
+    "@contentstack/cli-utilities": "~1.5.10",
+    "@contentstack/management": "~1.13.0",
     "@oclif/core": "^2.9.3",
-    "axios": "^1.6.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
@@ -99,4 +99,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}