@contrail/cli 3.5.3-alpha.0e9434c → 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.0e9434c linux-x64 node-v24.16.0
+@contrail/cli/3.5.3-alpha.297ad36 linux-x64 node-v24.20.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -61,6 +61,8 @@ To get instructions on how to set up autocomplete for your shell, run `contrail
 * [`contrail load custom-entity DATAFILE CONFIGFILE`](#contrail-load-custom-entity-datafile-configfile)
 * [`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`](#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)
@@ -777,6 +779,53 @@ EXAMPLES
   $ contrail load-processor upload-and-load  <File Path> <Config Path>
 ```
 
+## `contrail org-config export`
+
+Export the org config for your Org
+
+```
+USAGE
+  $ 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, --overwrite                  Replaces any existing export files in outDir
+  -l, --logLevel=<option>          The Log Level
+                                   <options: error|warn|info|debug>
+
+DESCRIPTION
+  Export the org config for your Org
+
+EXAMPLES
+  $ contrail org-config export
+```
+
+## `contrail org-config import`
+
+Upload an extracted org config
+
+```
+USAGE
+  $ 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
+  Upload an extracted org config
+
+EXAMPLES
+  $ contrail org-config import
+```
+
 ## `contrail projects export PROJECTNAME`
 
 Export a project.
@@ -919,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
@@ -928,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
@@ -1611,31 +1662,25 @@ EXAMPLES
 
 ## `contrail workflow-templates export`
 
-Export all workflows in the org. By default exports one file per app to the current directory.
+Export all workflows in the org.
 
 ```
 USAGE
-  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [-d <value>]
-  [--overwrite]
+  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [--overwrite]
 
 FLAGS
-  -d, --dir=<value>                [default: .] Directory to write per-app workflow files
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>
-  -f, --outFile=<value>            Export all workflows to a single file at this path (overrides per-app export)
+  -f, --outFile=<value>            [default: workflows.yml] The location for the file to be saved
   -l, --logLevel=<option>          The Log Level
                                    <options: error|warn|info|debug>
   --overwrite                      Replaces existing files if they exist
 
 DESCRIPTION
-  Export all workflows in the org. By default exports one file per app to the current directory.
+  Export all workflows in the org.
 
 EXAMPLES
   $ contrail workflow-templates export
-
-  $ contrail workflow-templates export --dir ./workflows
-
-  $ contrail workflow-templates export --outFile workflows.yml
 ```
 
 ## `contrail workflow-templates list`

package/dist/api/org-config.d.ts

@@ -0,0 +1,3 @@
+export declare function getOrgConfigs(options?: any): Promise<any[]>;
+export declare function updateOrgConfig(id: string, changes: any): Promise<any>;
+export declare function createOrgConfig(orgConfig: any): Promise<any>;

package/dist/api/org-config.js

@@ -0,0 +1,28 @@
+"use strict";
+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',
+        ...options,
+    });
+}
+exports.getOrgConfigs = getOrgConfigs;
+async function updateOrgConfig(id, changes) {
+    return new sdk_1.Entities().update({
+        entityName: 'org-config',
+        id,
+        object: changes,
+    });
+}
+exports.updateOrgConfig = updateOrgConfig;
+async function createOrgConfig(orgConfig) {
+    return new sdk_1.Entities().create({
+        entityName: 'org-config',
+        object: orgConfig,
+    });
+}
+exports.createOrgConfig = createOrgConfig;

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/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,8 @@ 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 {
     static description = 'Import the data to an instance, including types and users';
@@ -25,11 +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 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.d.ts

@@ -0,0 +1,13 @@
+import { BaseCommand } from '../../basecommand';
+export default class ExportOrgConfig extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        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(outDir: string, overwrite: boolean): Promise<void>;

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

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+const org_config_1 = require("../../api/org-config");
+const basecommand_1 = require("../../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const ORG_SPECIFIC_FIELDS = [
+    'id',
+    'orgId',
+    'createdOn',
+    'updatedOn',
+    'createdById',
+    'updatedById',
+    'createdBy',
+    'updatedBy',
+];
+class ExportOrgConfig extends basecommand_1.BaseCommand {
+    static description = 'Export the org config for your Org';
+    static examples = [
+        `$ contrail org-config export
+`,
+    ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+        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: '.',
+        }),
+        overwrite: core_1.Flags.boolean({
+            char: 'f',
+            description: 'Replaces any existing export files in outDir',
+            required: false,
+            default: false,
+        }),
+    };
+    async run() {
+        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) {
+    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;
+    }
+    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.d.ts

@@ -0,0 +1,12 @@
+import { BaseCommand } from '../../basecommand';
+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>;
+    };
+    run(): Promise<void>;
+}
+export declare function uploadOrgConfig(dir: string): Promise<void>;

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadOrgConfig = 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");
+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 = 'Upload an extracted org config';
+    static examples = [
+        `$ contrail org-config import
+`,
+    ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+        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() {
+        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`);
+        }
+        catch (e) {
+            this.log(`${chalk_1.default.red.bold('FAIL')} Org Config Upload Failed. ${e}`);
+            return;
+        }
+        this.log(`${chalk_1.default.green.bold('COMPLETE')} Org Config Upload Complete.`);
+    }
+}
+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;
+    }
+    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);
+    }
+    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 {};