@contrail/cli 3.5.3-alpha.818a5c0 → 3.5.3-alpha.82946f6

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.3-alpha.818a5c0 linux-x64 node-v24.19.0
+@contrail/cli/3.5.3-alpha.82946f6 linux-x64 node-v24.20.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -62,7 +62,7 @@ To get instructions on how to set up autocomplete for your shell, run `contrail
 * [`contrail load line-sheet DATAFILE CONFIGFILE`](#contrail-load-line-sheet-datafile-configfile)
 * [`contrail load upload-and-load INCOMINGFILE CONFIGFILENAME`](#contrail-load-upload-and-load-incomingfile-configfilename)
 * [`contrail org-config export`](#contrail-org-config-export)
-* [`contrail org-config import ORGCONFIGFILE`](#contrail-org-config-import-orgconfigfile)
+* [`contrail org-config import`](#contrail-org-config-import)
 * [`contrail projects export PROJECTNAME`](#contrail-projects-export-projectname)
 * [`contrail projects list`](#contrail-projects-list)
 * [`contrail projects load TEMPLATEFILELOCATION`](#contrail-projects-load-templatefilelocation)
@@ -781,49 +781,49 @@ EXAMPLES
 
 ## `contrail org-config export`
 
-Export the org config (branding, sorting, and other org-level settings).
+Export the org config for your Org
 
 ```
 USAGE
-  $ contrail org-config export [-l error|warn|info|debug] [-e true|false] [-f <value>] [--overwrite]
+  $ contrail org-config export [-l error|warn|info|debug] [-e true|false] [-d <value>] [-f]
 
 FLAGS
+  -d, --outDir=<value>             [default: .] The directory to which to export the org config data. Defaults to the
+                                   current directory
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>
-  -f, --outFile=<value>            [default: org-config.yml] The location for the file to be saved
+  -f, --overwrite                  Replaces any existing export files in outDir
   -l, --logLevel=<option>          The Log Level
                                    <options: error|warn|info|debug>
-  --overwrite                      Replaces existing files if they exist
 
 DESCRIPTION
-  Export the org config (branding, sorting, and other org-level settings).
+  Export the org config for your Org
 
 EXAMPLES
   $ contrail org-config export
 ```
 
-## `contrail org-config import ORGCONFIGFILE`
+## `contrail org-config import`
 
-Import the org config from an org-config.yml file
+Upload an extracted org config
 
 ```
 USAGE
-  $ contrail org-config import ORGCONFIGFILE [-l error|warn|info|debug] [-e true|false]
-
-ARGUMENTS
-  ORGCONFIGFILE  The .yml file containing the org config
+  $ contrail org-config import [-l error|warn|info|debug] [-e true|false] [-d <value>]
 
 FLAGS
+  -d, --dir=<value>                [default: .] The directory from which to import the org config data. Defaults to the
+                                   current directory. The org config data will be loaded from $dir/org-config.yml
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>
   -l, --logLevel=<option>          The Log Level
                                    <options: error|warn|info|debug>
 
 DESCRIPTION
-  Import the org config from an org-config.yml file
+  Upload an extracted org config
 
 EXAMPLES
-  $ contrail org-config import <ORG_CONFIG_FILE>
+  $ contrail org-config import
 ```
 
 ## `contrail projects export PROJECTNAME`
@@ -968,7 +968,7 @@ loads all the type data that has been exported by getAll
 
 ```
 USAGE
-  $ contrail types loadAll [-l error|warn|info|debug] [-e true|false] [-d <value>]
+  $ contrail types loadAll [-l error|warn|info|debug] [-e true|false] [-d <value>] [--orgConfig]
 
 FLAGS
   -d, --dir=<value>                [default: .] The directory from which to load the types data. Defaults to the current
@@ -977,6 +977,8 @@ FLAGS
                                    <options: true|false>
   -l, --logLevel=<option>          The Log Level
                                    <options: error|warn|info|debug>
+  --[no-]orgConfig                 Also load org config data from this directory. If not specified, you will be
+                                   prompted.
 
 DESCRIPTION
   loads all the type data that has been exported by getAll

package/dist/api/org-config.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrgConfig = exports.updateOrgConfig = exports.getOrgConfigs = void 0;
 const sdk_1 = require("@contrail/sdk");
+// every org has exactly one org-config record (created at provisioning),
+// so callers can safely use the first element of the returned list
 async function getOrgConfigs(options) {
     return new sdk_1.Entities().get({
         entityName: 'org-config',

package/dist/commands/groups/export.js

@@ -2,11 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportGroups = exports.DEFAULT_FILE_LOCATION = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const users_1 = require("../../api/users");
@@ -61,18 +58,9 @@ async function exportGroups(fileLocation, overwrite) {
         });
     }
     groups = groups.sort((one, two) => (one.name < two.name ? -1 : 1));
-    await saveData(groups, fileLocation, overwrite);
+    await (0, file_helpers_1.saveData)(groups, fileLocation, overwrite);
 }
 exports.exportGroups = exportGroups;
-async function saveData(data, fileLocation, overwrite) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    const pathToWrite = path.join(CURRENT_DIR, fileLocation);
-    if (fs_1.default.existsSync(pathToWrite)) {
-        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
-    }
-    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
-}
 function getGroupPrincipals(group, allGroups, orgUsers) {
     if (!group?.groupPrincipals) {
         return [];

package/dist/commands/groups/import.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadGroups = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
 const sdk_1 = require("@contrail/sdk");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
+const file_helpers_1 = require("../../helpers/file-helpers");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class ImportGroups extends basecommand_1.BaseCommand {
@@ -39,23 +37,12 @@ class ImportGroups extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ImportGroups;
-function getGroupsFile(fileLocation) {
-    const CURRENT_DIR = process.cwd();
-    try {
-        const fullPath = path.join(CURRENT_DIR, fileLocation);
-        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
-        return doc;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
 async function uploadGroups(fileLocation) {
     const existingGroups = await new sdk_1.Entities().get({
         entityName: 'group',
         relations: ['groupPrincipals'],
     });
-    const groupsToImport = getGroupsFile(fileLocation);
+    const groupsToImport = (0, file_helpers_1.loadData)(fileLocation);
     const orgUsers = await new sdk_1.Entities().get({
         entityName: 'user-org',
     });

package/dist/commands/instance/export.js

@@ -6,7 +6,6 @@ const core_1 = require("@oclif/core");
 const getAll_1 = require("../types/getAll");
 const export_1 = require("../users/export");
 const export_2 = require("../groups/export");
-const export_3 = require("../org-config/export");
 const basecommand_1 = require("../../basecommand");
 class ExportInstance extends basecommand_1.BaseCommand {
     static description = 'Exports an data of an instance including types and users';
@@ -33,7 +32,6 @@ class ExportInstance extends basecommand_1.BaseCommand {
         await (0, getAll_1.getAll)(this.flags.outDir, this.flags.overwrite);
         await (0, export_1.exportUsers)(path.join(this.flags.outDir, 'users.yml'), this.flags.overwrite);
         await (0, export_2.exportGroups)(path.join(this.flags.outDir, 'groups.yml'), this.flags.overwrite);
-        await (0, export_3.exportOrgConfig)(path.join(this.flags.outDir, 'org-config.yml'), this.flags.overwrite);
     }
 }
 exports.default = ExportInstance;

package/dist/commands/instance/import.js

@@ -26,12 +26,12 @@ class ImportInstance extends basecommand_1.BaseCommand {
         }),
     };
     async run() {
-        await (0, loadAll_1.loadAll)(this.flags.dir, true);
+        await (0, loadAll_1.loadAll)(this.flags.dir, true, false);
         await (0, import_1.uploadUsers)(path.join(this.flags.dir, 'users.yml'));
         await (0, import_2.uploadGroups)(path.join(this.flags.dir, 'groups.yml'));
         await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(this.flags.dir);
         await (0, uploadTypePolicies_1.uploadTypePolicies)(this.flags.dir);
-        await (0, import_3.uploadOrgConfig)(path.join(this.flags.dir, 'org-config.yml'));
+        await (0, import_3.uploadOrgConfig)(this.flags.dir);
     }
 }
 exports.default = ImportInstance;

package/dist/commands/org-config/export.d.ts

@@ -1,14 +1,13 @@
 import { BaseCommand } from '../../basecommand';
-export declare const DEFAULT_FILE_LOCATION = "org-config.yml";
 export default class ExportOrgConfig extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        outFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        outDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }
-export declare function exportOrgConfig(fileLocation: string, overwrite: boolean): Promise<void>;
+export declare function exportOrgConfig(outDir: string, overwrite: boolean): Promise<void>;

package/dist/commands/org-config/export.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportOrgConfig = exports.DEFAULT_FILE_LOCATION = void 0;
+exports.exportOrgConfig = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const org_config_1 = require("../../api/org-config");
 const basecommand_1 = require("../../basecommand");
-exports.DEFAULT_FILE_LOCATION = 'org-config.yml';
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const ORG_SPECIFIC_FIELDS = [
     'id',
     'orgId',
@@ -23,21 +22,22 @@ const ORG_SPECIFIC_FIELDS = [
     'updatedBy',
 ];
 class ExportOrgConfig extends basecommand_1.BaseCommand {
-    static description = 'Export the org config (branding, sorting, and other org-level settings).';
+    static description = 'Export the org config for your Org';
     static examples = [
         `$ contrail org-config export
 `,
     ];
     static flags = {
         ...basecommand_1.BaseCommand.baseFlags,
-        outFile: core_1.Flags.string({
-            char: 'f',
-            description: 'The location for the file to be saved',
+        outDir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory to which to export the org config data. Defaults to the current directory',
             required: false,
-            default: exports.DEFAULT_FILE_LOCATION,
+            default: '.',
         }),
         overwrite: core_1.Flags.boolean({
-            description: 'Replaces existing files if they exist',
+            char: 'f',
+            description: 'Replaces any existing export files in outDir',
             required: false,
             default: false,
         }),
@@ -46,35 +46,29 @@ class ExportOrgConfig extends basecommand_1.BaseCommand {
         try {
             await (0, login_1.authUser)();
             this.log(`${chalk_1.default.blue.bold('START')} Getting Org Config.`);
-            await exportOrgConfig(this.flags.outFile ?? exports.DEFAULT_FILE_LOCATION, this.flags.overwrite);
-            this.log(`${chalk_1.default.yellow.bold('ORG CONFIG')} Done`);
+            this.log(`${chalk_1.default.yellow.bold('ORG CONFIG')} Exporting`);
+            await exportOrgConfig(this.flags.outDir, this.flags.overwrite);
+            this.log(`${chalk_1.default.yellow.bold('ORG CONFIG')} Exported`);
         }
         catch (e) {
-            this.log(`${chalk_1.default.red.bold('FAIL')} Org Config download Failed. ${e}`);
+            this.log(`${chalk_1.default.red.bold('FAIL')} Org Config Export Failed. ${e}`);
             return;
         }
-        this.log(`${chalk_1.default.green.bold('COMPLETE')} Org Config download Complete.`);
+        this.log(`${chalk_1.default.green.bold('COMPLETE')} Org Config Export Complete.`);
     }
 }
 exports.default = ExportOrgConfig;
-async function exportOrgConfig(fileLocation, overwrite) {
+async function exportOrgConfig(outDir, overwrite) {
     const orgConfigs = await (0, org_config_1.getOrgConfigs)();
-    if (!Array.isArray(orgConfigs) || orgConfigs.length === 0) {
+    if (!orgConfigs?.length) {
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} No org config found. Skipping.`);
         return;
     }
     const orgConfig = { ...orgConfigs[0] };
     for (const field of ORG_SPECIFIC_FIELDS) {
         delete orgConfig[field];
     }
-    await saveData(orgConfig, fileLocation, overwrite);
+    fs_1.default.mkdirSync(path.resolve(outDir), { recursive: true });
+    await (0, file_helpers_1.saveData)(orgConfig, path.join(outDir, 'org-config.yml'), overwrite);
 }
 exports.exportOrgConfig = exportOrgConfig;
-async function saveData(data, fileLocation, overwrite) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
-    if (fs_1.default.existsSync(pathToWrite)) {
-        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
-    }
-    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
-}

package/dist/commands/org-config/import.d.ts

@@ -3,12 +3,10 @@ export default class ImportOrgConfig extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
-    static args: {
-        orgConfigFile: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
-    };
     run(): Promise<void>;
 }
-export declare function uploadOrgConfig(fileLocation: string): Promise<void>;
+export declare function uploadOrgConfig(dir: string): Promise<void>;

package/dist/commands/org-config/import.js

@@ -6,23 +6,24 @@ const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
+const file_helpers_1 = require("../../helpers/file-helpers");
 const org_config_1 = require("../../api/org-config");
 const basecommand_1 = require("../../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class ImportOrgConfig extends basecommand_1.BaseCommand {
-    static description = 'Import the org config from an org-config.yml file';
+    static description = 'Upload an extracted org config';
     static examples = [
-        `$ contrail org-config import <ORG_CONFIG_FILE>
+        `$ contrail org-config import
 `,
     ];
     static flags = {
         ...basecommand_1.BaseCommand.baseFlags,
-    };
-    static args = {
-        orgConfigFile: core_1.Args.string({
-            description: 'The .yml file containing the org config',
-            required: true,
+        dir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory from which to import the org config data. Defaults to the current directory. The org config data will be loaded from $dir/org-config.yml',
+            required: false,
+            default: '.',
         }),
     };
     async run() {
@@ -30,7 +31,7 @@ class ImportOrgConfig extends basecommand_1.BaseCommand {
             await (0, login_1.authUser)();
             this.log(`${chalk_1.default.blue.bold('START')} Uploading Org Config.`);
             this.log(`${chalk_1.default.yellow.bold('ORG CONFIG')} Uploading`);
-            await uploadOrgConfig(this.args.orgConfigFile);
+            await uploadOrgConfig(this.flags.dir);
             this.log(`${chalk_1.default.yellow.bold('ORG CONFIG')} Uploaded`);
         }
         catch (e) {
@@ -41,29 +42,18 @@ class ImportOrgConfig extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ImportOrgConfig;
-function getOrgConfigFile(fileLocation) {
-    const CURRENT_DIR = process.cwd();
-    try {
-        const fullPath = path.join(CURRENT_DIR, fileLocation);
-        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
-        return doc;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function uploadOrgConfig(fileLocation) {
-    const CURRENT_DIR = process.cwd();
-    if (!fs_1.default.existsSync(path.join(CURRENT_DIR, fileLocation))) {
-        console.log(`No org config file found at ${fileLocation}. Skipping.`);
+async function uploadOrgConfig(dir) {
+    const filePath = path.join(dir, 'org-config.yml');
+    if (!fs_1.default.existsSync(filePath)) {
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} No org config found in ${dir}. Skipping.`);
         return;
     }
-    const orgConfig = getOrgConfigFile(fileLocation);
-    if (!orgConfig || typeof orgConfig !== 'object') {
-        return;
+    const orgConfig = (0, file_helpers_1.loadData)(filePath);
+    if (!orgConfig || typeof orgConfig !== 'object' || Array.isArray(orgConfig)) {
+        throw new Error(`${filePath} must contain a single YAML object`);
     }
     const existingOrgConfigs = await (0, org_config_1.getOrgConfigs)();
-    if (Array.isArray(existingOrgConfigs) && existingOrgConfigs.length > 0) {
+    if (existingOrgConfigs?.length) {
         await (0, org_config_1.updateOrgConfig)(existingOrgConfigs[0].id, orgConfig);
     }
     else {

package/dist/commands/types/getAll.js

@@ -11,6 +11,7 @@ const type_extractor_1 = require("../../helpers/types/type-extractor");
 const types_1 = require("../../api/types");
 const types_2 = require("@contrail/org-config-migration/lib/types");
 const file_helpers_1 = require("../../helpers/file-helpers");
+const export_1 = require("../org-config/export");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
@@ -64,6 +65,7 @@ async function getAll(outDir, overwrite) {
         };
         const reducedData = await (0, types_2.getAllReducedTypes)(data);
         await saveData(reducedData, outDir, overwrite);
+        await (0, export_1.exportOrgConfig)(outDir, overwrite);
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPES')} Retrieved`);
     }
     catch (e) {

package/dist/commands/types/loadAll.d.ts

@@ -4,9 +4,10 @@ export default class LoadAllTypes extends BaseCommand {
     static examples: string[];
     static flags: {
         dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        orgConfig: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }
-export declare function loadAll(dir: string, skipPolicies?: boolean): Promise<void>;
+export declare function loadAll(dir: string, skipPolicies?: boolean, loadOrgConfig?: boolean): Promise<void>;

package/dist/commands/types/loadAll.js

@@ -4,6 +4,7 @@ exports.loadAll = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const login_1 = require("../../auth/login");
 const uploadOptionSets_1 = require("./uploadOptionSets");
 const uploadOptionSetHierarchies_1 = require("./uploadOptionSetHierarchies");
@@ -12,6 +13,7 @@ const uploadTypePropertyPolicies_1 = require("./uploadTypePropertyPolicies");
 const type_uploader_1 = require("../../helpers/types/type-uploader");
 const uploadTypeOverrides_1 = require("./uploadTypeOverrides");
 const uploadTypePolicies_1 = require("./uploadTypePolicies");
+const import_1 = require("../org-config/import");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class LoadAllTypes extends basecommand_1.BaseCommand {
@@ -28,13 +30,19 @@ class LoadAllTypes extends basecommand_1.BaseCommand {
             required: false,
             default: '.',
         }),
+        orgConfig: core_1.Flags.boolean({
+            description: 'Also load org config data from this directory. If not specified, you will be prompted.',
+            required: false,
+            default: undefined,
+            allowNo: true,
+        }),
     };
     async run() {
-        await loadAll(this.flags.dir);
+        await loadAll(this.flags.dir, false, this.flags.orgConfig);
     }
 }
 exports.default = LoadAllTypes;
-async function loadAll(dir, skipPolicies = false) {
+async function loadAll(dir, skipPolicies = false, loadOrgConfig) {
     try {
         await (0, login_1.authUser)();
         await (0, uploadOptionSets_1.uploadOptionSets)(dir);
@@ -46,6 +54,21 @@ async function loadAll(dir, skipPolicies = false) {
             await (0, uploadTypePolicies_1.uploadTypePolicies)(dir);
         }
         await (0, uploadTypeOverrides_1.uploadTypeOverrides)(dir);
+        let shouldLoadOrgConfig = loadOrgConfig;
+        if (shouldLoadOrgConfig === undefined) {
+            const answers = await inquirer_1.default.prompt([
+                {
+                    type: 'confirm',
+                    name: 'loadOrgConfig',
+                    message: 'Also load org config details from this directory?',
+                    default: false,
+                },
+            ]);
+            shouldLoadOrgConfig = answers.loadOrgConfig;
+        }
+        if (shouldLoadOrgConfig) {
+            await (0, import_1.uploadOrgConfig)(dir);
+        }
     }
     catch (e) {
         logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Types Upload Failed. ${e}`);

package/dist/commands/types/mergeOptionSets.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
 const sdk_1 = require("@contrail/sdk");
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const option_set_helper_1 = require("../../helpers/types/option-set-helper");
+const file_helpers_1 = require("../../helpers/file-helpers");
 class MergeOptionSets extends basecommand_1.BaseCommand {
     static description = 'Merge the OptionSets from an existing org and the OptionSets passed in. OptionSets File must be .yml or a directory with yml files.  The files can contain a single option set or an array of option sets.';
     static examples = [
@@ -88,7 +86,7 @@ async function mergeOptionSets(fileLocation) {
             mergedOptionSets.push(currentOptionSet);
         }
     }
-    saveData(mergedOptionSets);
+    await (0, file_helpers_1.saveData)(mergedOptionSets, 'merged_optionSets.yml', true);
 }
 function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
     const merged = {
@@ -110,8 +108,3 @@ function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
     }
     return merged;
 }
-function saveData(data) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, 'merged_optionSets.yml')), yamlStr, 'utf8');
-}

package/dist/commands/types/mergeTypeProperties.js

@@ -11,6 +11,7 @@ const types_1 = require("@contrail/org-config-migration/lib/types");
 const types_2 = require("../../api/types");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const file_helpers_1 = require("../../helpers/file-helpers");
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 class MergeTypeProperties extends basecommand_1.BaseCommand {
     static description = 'Merge the TypeProperties from an existing org and the TypeProperties passed in. Add to Types via TypePath File must be .yml';
@@ -74,7 +75,7 @@ async function mergeTypeProperties(fileLocation, typePaths) {
         }
         mergeType(foundType, uploadedTypeProperties);
     }
-    saveData({ types: reducedData.reducedTypes });
+    await (0, file_helpers_1.saveData)({ types: reducedData.reducedTypes }, 'merged_types.yml', true);
 }
 function mergeType(reducedType, typePropertiesToAdd) {
     for (const typeProperty of typePropertiesToAdd) {
@@ -84,8 +85,3 @@ function mergeType(reducedType, typePropertiesToAdd) {
         }
     }
 }
-function saveData(data) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, 'merged_types.yml')), yamlStr, 'utf8');
-}

package/dist/commands/types/parseOptionSetsLocalFiles.js

@@ -12,6 +12,7 @@ const core_1 = require("@oclif/core");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const common_1 = require("../../common");
+const file_helpers_1 = require("../../helpers/file-helpers");
 class ParseOptionSetsLocalFiles extends basecommand_1.BaseCommand {
     static description = 'Parse CSV files into OptionSets. Style denotes the format the csv is in. If the csv file has a column for option set' +
         'name, option key, and option label, use "NameAndLabelAndKey". If the file has one column for each option set with ' +
@@ -109,22 +110,17 @@ async function parseOptionSetsLocalFiles(fileLocation, csvStyle) {
     const uploadedOptionData = await loadOptionSetCSV(fileLocation);
     if (csvStyle === 'NameAndLabelAndKey') {
         const parsedOptionSets = parseNameAndLabelAndKey(uploadedOptionData);
-        saveData(parsedOptionSets);
+        await (0, file_helpers_1.saveData)(parsedOptionSets, 'parsed_local_optionSets.yml', true);
     }
     if (csvStyle === 'LabelsInColumn') {
         const parsedOptionSets = parseLabelsInColumn(uploadedOptionData);
-        saveData(parsedOptionSets);
+        await (0, file_helpers_1.saveData)(parsedOptionSets, 'parsed_local_optionSets.yml', true);
     }
 }
 async function parseOptionSetsToFolderStructure(fileLocation) {
     const uploadedOptionData = await loadOptionSets(fileLocation);
     saveDataInFolders(uploadedOptionData);
 }
-function saveData(data) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, 'parsed_local_optionSets.yml')), yamlStr, 'utf8');
-}
 function saveDataInFolders(data) {
     const folder = { filename: 'option-sets', split: true, fileLabel: 'name' };
     const dir = 'merged_option_sets';

package/dist/commands/users/export.js

@@ -2,11 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportUsers = exports.DEFAULT_FILE_LOCATION = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const users_1 = require("../../api/users");
@@ -63,15 +60,6 @@ async function exportUsers(fileLocation, overwrite) {
         });
     }
     users = users.sort((one, two) => (one.email < two.email ? -1 : 1));
-    await saveData(users, fileLocation, overwrite);
+    await (0, file_helpers_1.saveData)(users, fileLocation, overwrite);
 }
 exports.exportUsers = exportUsers;
-async function saveData(data, fileLocation, overwrite) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
-    if (fs_1.default.existsSync(pathToWrite)) {
-        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
-    }
-    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
-}

package/dist/commands/users/import.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadUsers = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
 const sdk_1 = require("@contrail/sdk");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
+const file_helpers_1 = require("../../helpers/file-helpers");
 const basecommand_1 = require("../../basecommand");
 class ImportUsers extends basecommand_1.BaseCommand {
     static description = 'Import all users in the users.yml file';
@@ -38,19 +36,8 @@ class ImportUsers extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ImportUsers;
-function getUsersFile(fileLocation) {
-    const CURRENT_DIR = process.cwd();
-    try {
-        const fullPath = path.join(CURRENT_DIR, fileLocation);
-        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
-        return doc;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
 async function uploadUsers(fileLocation) {
-    const users = getUsersFile(fileLocation);
+    const users = (0, file_helpers_1.loadData)(fileLocation);
     for (const user of users) {
         const role = user.role;
         const email = user.email;

package/dist/commands/workflow-templates/export.js

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportWorkflows = exports.DEFAULT_FILE_LOCATION = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const login_1 = require("../../auth/login");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const event_workflow_templates_1 = require("../../api/event-workflow-templates");
@@ -65,15 +62,6 @@ async function exportWorkflows(fileLocation, overwrite) {
         await (0, helper_1.populateActionIdentifiers)(exportWorkflow);
         workflowsObj.workflows.push(exportWorkflow);
     }
-    await saveData(workflowsObj, fileLocation, overwrite);
+    await (0, file_helpers_1.saveData)(workflowsObj, fileLocation, overwrite);
 }
 exports.exportWorkflows = exportWorkflows;
-async function saveData(data, fileLocation, overwrite) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
-    if (fs_1.default.existsSync(pathToWrite)) {
-        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
-    }
-    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
-}

package/dist/helpers/file-helpers.d.ts

@@ -1,2 +1,4 @@
 export declare function safeFileOverwrite(fileLocation: string, overwrite: boolean): Promise<boolean>;
 export declare function parseCSVData(data: string): any;
+export declare function saveData(data: any, fileLocation: string, overwrite: boolean): Promise<void>;
+export declare function loadData(fileLocation: string): any;

package/dist/helpers/file-helpers.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCSVData = exports.safeFileOverwrite = void 0;
+exports.loadData = exports.saveData = exports.parseCSVData = exports.safeFileOverwrite = void 0;
 const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const logger_1 = tslib_1.__importDefault(require("../logger"));
 const sync_1 = require("csv-parse/sync");
 const PASS_FORCE_TO_OVERWRITE = 'Pass --overwrite to overwrite without prompting';
@@ -34,3 +37,24 @@ function parseCSVData(data) {
     });
 }
 exports.parseCSVData = parseCSVData;
+//saves data as yaml to fileLocation (resolved against the current directory), prompting before overwriting unless overwrite is passed
+async function saveData(data, fileLocation, overwrite) {
+    const yamlStr = js_yaml_1.default.dump(data);
+    const pathToWrite = path.resolve(fileLocation);
+    if (fs_1.default.existsSync(pathToWrite)) {
+        await safeFileOverwrite(pathToWrite, overwrite);
+    }
+    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
+}
+exports.saveData = saveData;
+//loads yaml data from fileLocation (resolved against the current directory)
+function loadData(fileLocation) {
+    const pathToRead = path.resolve(fileLocation);
+    try {
+        return js_yaml_1.default.load(fs_1.default.readFileSync(pathToRead, 'utf8'));
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+exports.loadData = loadData;

package/dist/helpers/projects/helpers.js

@@ -8,6 +8,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const sdk_1 = require("@contrail/sdk");
 const util_1 = require("@contrail/util");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const file_helpers_1 = require("../file-helpers");
 function getProjectFile(fileName) {
     const CURRENT_DIR = process.cwd();
     try {
@@ -42,7 +43,7 @@ async function exportProject(name) {
     const allAssortments = [];
     await getAssortmentsAndSubFolders(workspace.id, projectConfiguration.assortments, projectConfiguration.subFolders, allAssortments);
     await convertRelationshipsInFolders(projectConfiguration, allAssortments);
-    saveData({ projectConfiguration: projectConfiguration }, name);
+    await (0, file_helpers_1.saveData)({ projectConfiguration: projectConfiguration }, `${name}-export.yml`, true);
 }
 exports.exportProject = exportProject;
 async function getAssortmentsAndSubFolders(parentId, assortments, subFolders, allAssortments) {
@@ -160,8 +161,3 @@ function deleteNonUserKeys(assortment) {
     delete assortment.updatedOn;
     delete assortment.workspaceId;
 }
-function saveData(data, name) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.join(CURRENT_DIR, `${name}-export.yml`), yamlStr, 'utf8');
-}

package/dist/helpers/types/type-parser.js

@@ -4,12 +4,11 @@ exports.parseTypesFromFiles = exports.parseTypesFromTemplateAndDataFromLocalFile
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const types_1 = require("@contrail/types");
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const csvToJson = tslib_1.__importStar(require("csvtojson"));
 const login_1 = require("../../auth/login");
 const csv_parser_1 = require("../../helpers/types/csv-parser");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const file_helpers_1 = require("../file-helpers");
 async function loadDataFromLocalCSV(fileName) {
     const CURRENT_DIR = process.cwd();
     try {
@@ -37,8 +36,8 @@ async function parseTypesFromLocalFiles(fileLocations) {
     }
     logger_1.default.info(`CSV imports were successful. ${csvJSONData?.length} total rows found.`);
     const suggestions = (0, types_1.GetSuggestedTypes)(csvJSONData);
-    saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
-    saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
+    await (0, file_helpers_1.saveData)(suggestions.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml', true);
 }
 exports.parseTypesFromLocalFiles = parseTypesFromLocalFiles;
 async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFileLocation) {
@@ -57,8 +56,8 @@ async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFi
         throw e;
     }
     const types = (0, types_1.GetTypesFromTemplate)(templateCSVData, dataCSVData);
-    saveData(types.OptionSets, 'parsed_optionSets.yml');
-    saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
+    await (0, file_helpers_1.saveData)(types.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml', true);
 }
 exports.parseTypesFromTemplateFromLocalFiles = parseTypesFromTemplateFromLocalFiles;
 async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation, dataFileLocations) {
@@ -86,8 +85,8 @@ async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation,
         }
     }
     const types = (0, types_1.GetTypesFromTemplateWithOptionSetsFromData)(templateCSVData, dataCSVData);
-    saveData(types.OptionSets, 'parsed_optionSets.yml');
-    saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
+    await (0, file_helpers_1.saveData)(types.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml', true);
 }
 exports.parseTypesFromTemplateAndDataFromLocalFiles = parseTypesFromTemplateAndDataFromLocalFiles;
 async function parseTypesFromFiles(fileIds) {
@@ -108,12 +107,7 @@ async function parseTypesFromFiles(fileIds) {
     }
     logger_1.default.info(`CSV downloads were successful. ${csvJSONData?.length} total rows found.`);
     const suggestions = (0, types_1.GetSuggestedTypes)(csvJSONData);
-    saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
-    saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
+    await (0, file_helpers_1.saveData)(suggestions.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml', true);
 }
 exports.parseTypesFromFiles = parseTypesFromFiles;
-function saveData(data, name) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, name, yamlStr)), 'utf8');
-}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.3-alpha.818a5c0",
+  "version": "3.5.3-alpha.82946f6",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -1241,7 +1241,7 @@
     },
     "org-config:export": {
       "id": "org-config:export",
-      "description": "Export the org config (branding, sorting, and other org-level settings).",
+      "description": "Export the org config for your Org",
       "strict": true,
       "pluginName": "@contrail/cli",
       "pluginAlias": "@contrail/cli",
@@ -1278,19 +1278,20 @@
           ],
           "default": "true"
         },
-        "outFile": {
-          "name": "outFile",
+        "outDir": {
+          "name": "outDir",
           "type": "option",
-          "char": "f",
-          "description": "The location for the file to be saved",
+          "char": "d",
+          "description": "The directory to which to export the org config data. Defaults to the current directory",
           "required": false,
           "multiple": false,
-          "default": "org-config.yml"
+          "default": "."
         },
         "overwrite": {
           "name": "overwrite",
           "type": "boolean",
-          "description": "Replaces existing files if they exist",
+          "char": "f",
+          "description": "Replaces any existing export files in outDir",
           "required": false,
           "allowNo": false
         }
@@ -1299,14 +1300,14 @@
     },
     "org-config:import": {
       "id": "org-config:import",
-      "description": "Import the org config from an org-config.yml file",
+      "description": "Upload an extracted org config",
       "strict": true,
       "pluginName": "@contrail/cli",
       "pluginAlias": "@contrail/cli",
       "pluginType": "core",
       "aliases": [],
       "examples": [
-        "$ contrail org-config import <ORG_CONFIG_FILE>\n"
+        "$ contrail org-config import\n"
       ],
       "flags": {
         "logLevel": {
@@ -1335,15 +1336,18 @@
             "false"
           ],
           "default": "true"
+        },
+        "dir": {
+          "name": "dir",
+          "type": "option",
+          "char": "d",
+          "description": "The directory from which to import the org config data. Defaults to the current directory. The org config data will be loaded from $dir/org-config.yml",
+          "required": false,
+          "multiple": false,
+          "default": "."
         }
       },
-      "args": {
-        "orgConfigFile": {
-          "name": "orgConfigFile",
-          "description": "The .yml file containing the org config",
-          "required": true
-        }
-      }
+      "args": {}
     },
     "projects:export": {
       "id": "projects:export",
@@ -1699,6 +1703,13 @@
           "required": false,
           "multiple": false,
           "default": "."
+        },
+        "orgConfig": {
+          "name": "orgConfig",
+          "type": "boolean",
+          "description": "Also load org config data from this directory. If not specified, you will be prompted.",
+          "required": false,
+          "allowNo": true
         }
       },
       "args": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.3-alpha.818a5c0",
+  "version": "3.5.3-alpha.82946f6",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -113,6 +113,9 @@
       "groups": {
         "description": "Export and import user groups"
       },
+      "org-config": {
+        "description": "Export and import org-level configuration"
+      },
       "webhooks": {
         "description": "Manage VibeIQ webhooks"
       },