@contrail/cli 3.5.3-alpha.0dcc977 → 3.5.3-alpha.297ad36

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.3-alpha.0dcc977 linux-x64 node-v24.19.0
+@contrail/cli/3.5.3-alpha.297ad36 linux-x64 node-v24.20.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -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/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)(this.flags.outDir, this.flags.overwrite);
     }
 }
 exports.default = ExportInstance;

package/dist/commands/instance/import.d.ts

@@ -9,3 +9,17 @@ export default class ImportInstance extends BaseCommand {
     };
     run(): Promise<void>;
 }
+/**
+ * Imports an instance export in dependency order:
+ *   1. option sets, types, option set hierarchies, rule sets
+ *   2. users and groups (policy principals)
+ *   3. type property policies and type policies
+ *   4. type overrides — after policies, because they reference policies, rule sets and option
+ *      set hierarchies by slug and the API rejects the whole upload if any of them is missing
+ *   5. org config
+ *
+ * Fails (rejects) if the type overrides could not be applied, so the import does not
+ * report success while the org is missing customizations carried by overrides
+ * (labels/formulas/editability of core properties, subtype-level property changes).
+ */
+export declare function importInstance(dir: string): Promise<void>;

package/dist/commands/instance/import.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.importInstance = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const core_1 = require("@oclif/core");
@@ -8,6 +9,7 @@ const import_1 = require("../users/import");
 const import_2 = require("../groups/import");
 const uploadTypePropertyPolicies_1 = require("../types/uploadTypePropertyPolicies");
 const uploadTypePolicies_1 = require("../types/uploadTypePolicies");
+const uploadTypeOverrides_1 = require("../types/uploadTypeOverrides");
 const import_3 = require("../org-config/import");
 const basecommand_1 = require("../../basecommand");
 class ImportInstance extends basecommand_1.BaseCommand {
@@ -26,12 +28,30 @@ class ImportInstance extends basecommand_1.BaseCommand {
         }),
     };
     async run() {
-        await (0, loadAll_1.loadAll)(this.flags.dir, true);
-        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)(this.flags.dir);
+        await importInstance(this.flags.dir);
     }
 }
 exports.default = ImportInstance;
+/**
+ * Imports an instance export in dependency order:
+ *   1. option sets, types, option set hierarchies, rule sets
+ *   2. users and groups (policy principals)
+ *   3. type property policies and type policies
+ *   4. type overrides — after policies, because they reference policies, rule sets and option
+ *      set hierarchies by slug and the API rejects the whole upload if any of them is missing
+ *   5. org config
+ *
+ * Fails (rejects) if the type overrides could not be applied, so the import does not
+ * report success while the org is missing customizations carried by overrides
+ * (labels/formulas/editability of core properties, subtype-level property changes).
+ */
+async function importInstance(dir) {
+    await (0, loadAll_1.loadAll)(dir, true, false);
+    await (0, import_1.uploadUsers)(path.join(dir, 'users.yml'));
+    await (0, import_2.uploadGroups)(path.join(dir, 'groups.yml'));
+    await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(dir);
+    await (0, uploadTypePolicies_1.uploadTypePolicies)(dir);
+    await (0, uploadTypeOverrides_1.uploadTypeOverrides)(dir);
+    await (0, import_3.uploadOrgConfig)(dir);
+}
+exports.importInstance = importInstance;

package/dist/commands/instance/import.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/instance/import.spec.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const import_1 = require("./import");
+const loadAll_1 = require("../types/loadAll");
+const import_2 = require("../users/import");
+const import_3 = require("../groups/import");
+const uploadTypePropertyPolicies_1 = require("../types/uploadTypePropertyPolicies");
+const uploadTypePolicies_1 = require("../types/uploadTypePolicies");
+const uploadTypeOverrides_1 = require("../types/uploadTypeOverrides");
+const import_4 = require("../org-config/import");
+jest.mock('../types/loadAll');
+jest.mock('../users/import');
+jest.mock('../groups/import');
+jest.mock('../types/uploadTypePropertyPolicies');
+jest.mock('../types/uploadTypePolicies');
+jest.mock('../types/uploadTypeOverrides');
+jest.mock('../org-config/import');
+const mocked = (fn) => fn;
+const STEPS = [
+    loadAll_1.loadAll,
+    import_2.uploadUsers,
+    import_3.uploadGroups,
+    uploadTypePropertyPolicies_1.uploadTypePropertyPolicies,
+    uploadTypePolicies_1.uploadTypePolicies,
+    uploadTypeOverrides_1.uploadTypeOverrides,
+    import_4.uploadOrgConfig,
+];
+describe('importInstance', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        for (const fn of STEPS) {
+            mocked(fn).mockResolvedValue(undefined);
+        }
+    });
+    it('skips policies/overrides/org-config in loadAll and uploads them after users and groups', async () => {
+        await (0, import_1.importInstance)('export-dir');
+        expect(mocked(loadAll_1.loadAll)).toHaveBeenCalledWith('export-dir', true, false);
+        expect(mocked(uploadTypeOverrides_1.uploadTypeOverrides)).toHaveBeenCalledWith('export-dir');
+        expect(mocked(import_4.uploadOrgConfig)).toHaveBeenCalledWith('export-dir');
+        const order = STEPS.map((fn) => mocked(fn).mock.invocationCallOrder[0]);
+        // strictly increasing => called in exactly this order
+        for (let i = 1; i < order.length; i++) {
+            expect(order[i]).toBeGreaterThan(order[i - 1]);
+        }
+    });
+    it('uploads type overrides after type policies (CR-2095)', async () => {
+        await (0, import_1.importInstance)('export-dir');
+        const policiesOrder = mocked(uploadTypePolicies_1.uploadTypePolicies).mock.invocationCallOrder[0];
+        const overridesOrder = mocked(uploadTypeOverrides_1.uploadTypeOverrides).mock.invocationCallOrder[0];
+        expect(overridesOrder).toBeGreaterThan(policiesOrder);
+    });
+    it('rejects when the type override upload fails instead of reporting success', async () => {
+        mocked(uploadTypeOverrides_1.uploadTypeOverrides).mockRejectedValue(new Error('policy with identifier X not found'));
+        await expect((0, import_1.importInstance)('export-dir')).rejects.toThrow('policy with identifier X not found');
+        expect(mocked(import_4.uploadOrgConfig)).not.toHaveBeenCalled();
+    });
+});

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

@@ -4,6 +4,7 @@ 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 core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
@@ -42,30 +43,32 @@ class ExportOrgConfig extends basecommand_1.BaseCommand {
         }),
     };
     async run() {
-        await exportOrgConfig(this.flags.outDir, this.flags.overwrite);
+        try {
+            await (0, login_1.authUser)();
+            this.log(`${chalk_1.default.blue.bold('START')} Getting Org Config.`);
+            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 Export Failed. ${e}`);
+            return;
+        }
+        this.log(`${chalk_1.default.green.bold('COMPLETE')} Org Config Export Complete.`);
     }
 }
 exports.default = ExportOrgConfig;
 async function exportOrgConfig(outDir, overwrite) {
-    try {
-        await (0, login_1.authUser)();
-        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Exporting`);
-        const orgConfigs = await (0, org_config_1.getOrgConfigs)();
-        if (!Array.isArray(orgConfigs) || orgConfigs.length === 0) {
-            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 (0, file_helpers_1.saveData)(orgConfig, path.join(outDir, 'org-config.yml'), overwrite);
-        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Exported`);
-    }
-    catch (e) {
-        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Org Config Export Failed. ${e}`);
+    const orgConfigs = await (0, org_config_1.getOrgConfigs)();
+    if (!orgConfigs?.length) {
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} No org config found. Skipping.`);
         return;
     }
-    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Org Config Export Complete.`);
+    const orgConfig = { ...orgConfigs[0] };
+    for (const field of ORG_SPECIFIC_FIELDS) {
+        delete orgConfig[field];
+    }
+    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;

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

@@ -6,8 +6,8 @@ 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"));
@@ -27,44 +27,37 @@ class ImportOrgConfig extends basecommand_1.BaseCommand {
         }),
     };
     async run() {
-        await uploadOrgConfig(this.flags.dir);
-    }
-}
-exports.default = ImportOrgConfig;
-async function uploadOrgConfig(dir) {
-    try {
-        await (0, login_1.authUser)();
-        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Uploading`);
-        const orgConfig = loadOrgConfig(dir);
-        if (!orgConfig || typeof orgConfig !== 'object') {
-            logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} No org config found in ${dir}. Skipping.`);
-            return;
-        }
-        const existingOrgConfigs = await (0, org_config_1.getOrgConfigs)();
-        if (Array.isArray(existingOrgConfigs) && existingOrgConfigs.length > 0) {
-            await (0, org_config_1.updateOrgConfig)(existingOrgConfigs[0].id, orgConfig);
+        try {
+            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.flags.dir);
+            this.log(`${chalk_1.default.yellow.bold('ORG CONFIG')} Uploaded`);
         }
-        else {
-            await (0, org_config_1.createOrgConfig)(orgConfig);
+        catch (e) {
+            this.log(`${chalk_1.default.red.bold('FAIL')} Org Config Upload Failed. ${e}`);
+            return;
         }
-        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Uploaded`);
+        this.log(`${chalk_1.default.green.bold('COMPLETE')} Org Config Upload Complete.`);
     }
-    catch (e) {
-        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Org Config Upload Failed. ${e}`);
-        return;
-    }
-    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Org Config Upload Complete.`);
 }
-exports.uploadOrgConfig = uploadOrgConfig;
-function loadOrgConfig(fromDir) {
-    const filePath = path.join(fromDir, 'org-config.yml');
+exports.default = ImportOrgConfig;
+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;
     }
-    try {
-        return js_yaml_1.default.load(fs_1.default.readFileSync(filePath, 'utf8'));
+    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 (existingOrgConfigs?.length) {
+        await (0, org_config_1.updateOrgConfig)(existingOrgConfigs[0].id, orgConfig);
     }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
+    else {
+        await (0, org_config_1.createOrgConfig)(orgConfig);
     }
 }
+exports.uploadOrgConfig = uploadOrgConfig;

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,21 @@ 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>;
+/**
+ * Loads everything exported by `types getAll`.
+ *
+ * @param dir directory containing the export
+ * @param skipPolicies when true, type property policies, type policies AND type overrides are
+ *   not uploaded. Policies need users/groups to exist first, and type overrides can reference
+ *   policies (as well as rule sets and option set hierarchies), so the API rejects the whole
+ *   override upload if a referenced policy is missing. Callers that pass `true` (e.g.
+ *   `instance import`) must upload policies and then overrides themselves, in that order.
+ * @param loadOrgConfig whether to also load org-config.yml; prompts when undefined
+ */
+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,8 +13,10 @@ 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"));
+const error_helpers_1 = require("../../helpers/error-helpers");
 class LoadAllTypes extends basecommand_1.BaseCommand {
     static description = 'loads all the type data that has been exported by getAll';
     static examples = [
@@ -28,13 +31,30 @@ 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) {
+/**
+ * Loads everything exported by `types getAll`.
+ *
+ * @param dir directory containing the export
+ * @param skipPolicies when true, type property policies, type policies AND type overrides are
+ *   not uploaded. Policies need users/groups to exist first, and type overrides can reference
+ *   policies (as well as rule sets and option set hierarchies), so the API rejects the whole
+ *   override upload if a referenced policy is missing. Callers that pass `true` (e.g.
+ *   `instance import`) must upload policies and then overrides themselves, in that order.
+ * @param loadOrgConfig whether to also load org-config.yml; prompts when undefined
+ */
+async function loadAll(dir, skipPolicies = false, loadOrgConfig) {
     try {
         await (0, login_1.authUser)();
         await (0, uploadOptionSets_1.uploadOptionSets)(dir);
@@ -44,11 +64,28 @@ async function loadAll(dir, skipPolicies = false) {
         if (!skipPolicies) {
             await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(dir);
             await (0, uploadTypePolicies_1.uploadTypePolicies)(dir);
+            // must run after policies, rule sets and option set hierarchies: overrides reference them by slug
+            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);
         }
-        await (0, uploadTypeOverrides_1.uploadTypeOverrides)(dir);
     }
     catch (e) {
-        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Types Upload Failed. ${e}`);
+        logger_1.default.error(`${chalk_1.default.red.bold('FAIL')} Types Upload Failed. ${(0, error_helpers_1.describeError)(e)}`);
+        process.exitCode = 1;
         return;
     }
     logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Types Upload Complete.`);

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

@@ -0,0 +1 @@
+export {};

package/dist/commands/types/loadAll.spec.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const loadAll_1 = require("./loadAll");
+const login_1 = require("../../auth/login");
+const uploadOptionSets_1 = require("./uploadOptionSets");
+const uploadOptionSetHierarchies_1 = require("./uploadOptionSetHierarchies");
+const uploadRuleSets_1 = require("./uploadRuleSets");
+const uploadTypePropertyPolicies_1 = require("./uploadTypePropertyPolicies");
+const uploadTypePolicies_1 = require("./uploadTypePolicies");
+const uploadTypeOverrides_1 = require("./uploadTypeOverrides");
+const type_uploader_1 = require("../../helpers/types/type-uploader");
+const import_1 = require("../org-config/import");
+jest.mock('../../auth/login');
+jest.mock('./uploadOptionSets');
+jest.mock('./uploadOptionSetHierarchies');
+jest.mock('./uploadRuleSets');
+jest.mock('./uploadTypePropertyPolicies');
+jest.mock('./uploadTypePolicies');
+jest.mock('./uploadTypeOverrides');
+jest.mock('../../helpers/types/type-uploader');
+jest.mock('../org-config/import');
+const mocked = (fn) => fn;
+describe('loadAll', () => {
+    const originalExitCode = process.exitCode;
+    beforeEach(() => {
+        jest.clearAllMocks();
+        process.exitCode = originalExitCode;
+        mocked(login_1.authUser).mockResolvedValue({ orgSlug: 'test-org' });
+        for (const fn of [
+            uploadOptionSets_1.uploadOptionSets,
+            type_uploader_1.uploadTypes,
+            uploadOptionSetHierarchies_1.uploadOptionSetHierarchies,
+            uploadRuleSets_1.uploadRuleSets,
+            uploadTypePropertyPolicies_1.uploadTypePropertyPolicies,
+            uploadTypePolicies_1.uploadTypePolicies,
+            uploadTypeOverrides_1.uploadTypeOverrides,
+            import_1.uploadOrgConfig,
+        ]) {
+            mocked(fn).mockResolvedValue(undefined);
+        }
+    });
+    afterAll(() => {
+        process.exitCode = originalExitCode;
+    });
+    it('uploads type overrides after policies, rule sets and option set hierarchies', async () => {
+        await (0, loadAll_1.loadAll)('dir', false, false);
+        expect(mocked(uploadTypeOverrides_1.uploadTypeOverrides)).toHaveBeenCalledWith('dir');
+        expect(mocked(import_1.uploadOrgConfig)).not.toHaveBeenCalled();
+        const overridesOrder = mocked(uploadTypeOverrides_1.uploadTypeOverrides).mock.invocationCallOrder[0];
+        for (const fn of [
+            uploadOptionSetHierarchies_1.uploadOptionSetHierarchies,
+            uploadRuleSets_1.uploadRuleSets,
+            uploadTypePropertyPolicies_1.uploadTypePropertyPolicies,
+            uploadTypePolicies_1.uploadTypePolicies,
+        ]) {
+            expect(overridesOrder).toBeGreaterThan(mocked(fn).mock.invocationCallOrder[0]);
+        }
+    });
+    it('skips policies and type overrides when skipPolicies is set', async () => {
+        await (0, loadAll_1.loadAll)('dir', true, false);
+        expect(mocked(type_uploader_1.uploadTypes)).toHaveBeenCalledWith('dir');
+        expect(mocked(uploadRuleSets_1.uploadRuleSets)).toHaveBeenCalledWith('dir');
+        expect(mocked(uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)).not.toHaveBeenCalled();
+        expect(mocked(uploadTypePolicies_1.uploadTypePolicies)).not.toHaveBeenCalled();
+        expect(mocked(uploadTypeOverrides_1.uploadTypeOverrides)).not.toHaveBeenCalled();
+    });
+    it('sets a non-zero exit code when a step fails', async () => {
+        mocked(uploadTypeOverrides_1.uploadTypeOverrides).mockRejectedValue(new Error('boom'));
+        await (0, loadAll_1.loadAll)('dir', false, false);
+        expect(process.exitCode).toBe(1);
+    });
+    it('loads org config when requested, after everything else', async () => {
+        await (0, loadAll_1.loadAll)('dir', false, true);
+        expect(mocked(import_1.uploadOrgConfig)).toHaveBeenCalledWith('dir');
+        expect(mocked(import_1.uploadOrgConfig).mock.invocationCallOrder[0]).toBeGreaterThan(mocked(uploadTypeOverrides_1.uploadTypeOverrides).mock.invocationCallOrder[0]);
+    });
+});

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/types/uploadTypeOverrides.d.ts

@@ -9,4 +9,14 @@ export default class UploadTypeOverrides extends BaseCommand {
     };
     run(): Promise<void>;
 }
+/**
+ * Uploads $dir/type-overrides.yml to the org.
+ *
+ * Type overrides can reference type policies, rule sets and option set hierarchies by
+ * slug, and the API rejects the whole upload (nothing is applied) if any referenced
+ * entity does not exist yet. Callers must therefore upload those entities first.
+ *
+ * Throws on failure so that callers such as `instance import` do not report success
+ * when the overrides were not applied.
+ */
 export declare function uploadTypeOverrides(dir: string): Promise<void>;

package/dist/commands/types/uploadTypeOverrides.js

@@ -11,6 +11,7 @@ const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const types_1 = require("../../api/types");
+const error_helpers_1 = require("../../helpers/error-helpers");
 class UploadTypeOverrides extends basecommand_1.BaseCommand {
     static description = 'Upload type overrides';
     static examples = [
@@ -31,21 +32,31 @@ class UploadTypeOverrides extends basecommand_1.BaseCommand {
     }
 }
 exports.default = UploadTypeOverrides;
+/**
+ * Uploads $dir/type-overrides.yml to the org.
+ *
+ * Type overrides can reference type policies, rule sets and option set hierarchies by
+ * slug, and the API rejects the whole upload (nothing is applied) if any referenced
+ * entity does not exist yet. Callers must therefore upload those entities first.
+ *
+ * Throws on failure so that callers such as `instance import` do not report success
+ * when the overrides were not applied.
+ */
 async function uploadTypeOverrides(dir) {
+    await (0, login_1.authUser)();
+    const reducedOverrides = readTypeOverridesFromFile(dir);
+    if (!reducedOverrides || reducedOverrides.length === 0) {
+        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} No overrides found in type-overrides.yml — skipping upload to avoid wiping org overrides`);
+        return;
+    }
     try {
-        await (0, login_1.authUser)();
-        const reducedOverrides = readTypeOverridesFromFile(dir);
-        if (!reducedOverrides || reducedOverrides.length === 0) {
-            logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} No overrides found in type-overrides.yml — skipping upload to avoid wiping org overrides`);
-            return;
-        }
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} Uploading`);
         await (0, types_1.uploadTypeOverrideObjects)(reducedOverrides);
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Type Override Upload Failed . ${e}`);
-        return;
+        logger_1.default.error(`${chalk_1.default.red.bold('FAIL')} Type Override Upload Failed. None of the ${reducedOverrides.length} overrides were applied: ${(0, error_helpers_1.describeError)(e)}`);
+        throw e;
     }
     logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Type Override Upload Complete.`);
 }

package/dist/commands/types/uploadTypeOverrides.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/types/uploadTypeOverrides.spec.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const uploadTypeOverrides_1 = require("./uploadTypeOverrides");
+const login_1 = require("../../auth/login");
+const types_1 = require("../../api/types");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+jest.mock('../../auth/login');
+jest.mock('../../api/types');
+const OVERRIDES_YML = `
+- typePath: item
+  attribute:
+    type: policy
+    overrideType: add
+    referenceSlug: Limit-Create
+`;
+describe('uploadTypeOverrides', () => {
+    let errorSpy;
+    beforeEach(() => {
+        jest.clearAllMocks();
+        login_1.authUser.mockResolvedValue({
+            orgSlug: 'test-org',
+        });
+        jest.spyOn(fs_1.default, 'existsSync').mockReturnValue(true);
+        jest.spyOn(fs_1.default, 'readFileSync').mockReturnValue(OVERRIDES_YML);
+        errorSpy = jest.spyOn(logger_1.default, 'error').mockImplementation(() => logger_1.default);
+        jest.spyOn(logger_1.default, 'info').mockImplementation(() => logger_1.default);
+    });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    it('uploads the overrides from type-overrides.yml', async () => {
+        types_1.uploadTypeOverrideObjects.mockResolvedValue(undefined);
+        await (0, uploadTypeOverrides_1.uploadTypeOverrides)('dir');
+        expect(types_1.uploadTypeOverrideObjects).toHaveBeenCalledWith([
+            {
+                typePath: 'item',
+                attribute: { type: 'policy', overrideType: 'add', referenceSlug: 'Limit-Create' },
+            },
+        ]);
+    });
+    it('skips the upload when the file has no overrides', async () => {
+        jest.spyOn(fs_1.default, 'readFileSync').mockReturnValue('[]');
+        await (0, uploadTypeOverrides_1.uploadTypeOverrides)('dir');
+        expect(types_1.uploadTypeOverrideObjects).not.toHaveBeenCalled();
+    });
+    it('rethrows API failures and logs the API message', async () => {
+        // shape of the SDK ApiError: undefined message, raw response body in `details`
+        const apiError = new Error();
+        apiError.details = JSON.stringify({
+            message: 'policy with identifier Limit-Create not found',
+            error: 'Bad Request',
+            statusCode: 400,
+        });
+        types_1.uploadTypeOverrideObjects.mockRejectedValue(apiError);
+        await expect((0, uploadTypeOverrides_1.uploadTypeOverrides)('dir')).rejects.toBe(apiError);
+        expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('policy with identifier Limit-Create not found'));
+    });
+});

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/error-helpers.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Returns a human readable message for an error thrown by the SDK or by the CLI.
+ *
+ * The SDK's ApiError is constructed with an undefined message and keeps the raw
+ * response body in `details` (usually a JSON string such as
+ * `{"message":"policy with identifier X not found","statusCode":400}`), so
+ * `${error}` only prints "Error". This digs the API message out of `details`.
+ */
+export declare function describeError(error: any): string;

package/dist/helpers/error-helpers.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describeError = void 0;
+/**
+ * Returns a human readable message for an error thrown by the SDK or by the CLI.
+ *
+ * The SDK's ApiError is constructed with an undefined message and keeps the raw
+ * response body in `details` (usually a JSON string such as
+ * `{"message":"policy with identifier X not found","statusCode":400}`), so
+ * `${error}` only prints "Error". This digs the API message out of `details`.
+ */
+function describeError(error) {
+    const details = error?.details;
+    if (typeof details === 'string' && details.length) {
+        try {
+            const parsed = JSON.parse(details);
+            const message = parsed?.message;
+            if (Array.isArray(message)) {
+                return message.join(', ');
+            }
+            if (message) {
+                return String(message);
+            }
+        }
+        catch {
+            // not JSON, fall through and use the raw body
+        }
+        return details;
+    }
+    if (details?.message) {
+        return String(details.message);
+    }
+    return error?.message || String(error);
+}
+exports.describeError = describeError;

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

@@ -1,3 +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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveData = 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"));
@@ -37,14 +37,24 @@ function parseCSVData(data) {
     });
 }
 exports.parseCSVData = parseCSVData;
-//saves data as yaml to fileLocation (relative to the current directory), prompting before overwriting unless overwrite is passed
+//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 CURRENT_DIR = process.cwd();
-    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
+    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.0dcc977",
+  "version": "3.5.3-alpha.297ad36",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -1703,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.0dcc977",
+  "version": "3.5.3-alpha.297ad36",
   "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"
       },