@contrail/cli 2.0.3 → 2.0.5

package/dist/api/apps.d.ts

@@ -10,4 +10,4 @@ export declare function upgradeAppVersion(appOrg: any, appVersionId: any): Promi
 export declare function deleteAppOrg(appOrgId: string): Promise<AppOrg>;
 export declare function getInstalledApps(): Promise<AppOrg[]>;
 export declare function installAppToOrg(app: any, configProperties: any): Promise<AppOrg>;
-export declare function getAvailableApps(): Promise<App[]>;
+export declare function getAvailableApps(options?: any): Promise<App[]>;

package/dist/api/apps.js

@@ -74,7 +74,7 @@ async function installAppToOrg(app, configProperties) {
     });
 }
 exports.installAppToOrg = installAppToOrg;
-async function getAvailableApps() {
+async function getAvailableApps(options) {
     const orgId = auth_1.Auth.config.orgId;
     const apps = [];
     apps.push(...await new sdk_1.Entities().get({
@@ -89,6 +89,7 @@ async function getAvailableApps() {
         criteria: {
             orgId,
             private: false,
+            ...options
         },
     }));
     return apps;

package/dist/commands/app/install.d.ts

@@ -6,6 +6,7 @@ export default class InstallApp extends Command {
     static flags: {
         appIdentifier: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         installWorkflowTemplates: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        showHidden: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/app/install.js

@@ -10,9 +10,9 @@ const apps_1 = require("../../api/apps");
 const workflow_template_definition_deployer_1 = require("../../helpers/workflow-template-definitions/workflow-template-definition-deployer");
 class InstallApp extends core_1.Command {
     async run() {
-        const { args, flags } = await this.parse(InstallApp);
+        const { flags } = await this.parse(InstallApp);
         await (0, login_1.authUser)();
-        const apps = await (0, apps_1.getAvailableApps)();
+        const apps = await (0, apps_1.getAvailableApps)({ hidden: flags.showHidden });
         if (!apps.length) {
             throw new Error('No apps are available to install...');
         }
@@ -94,6 +94,7 @@ InstallApp.strict = true;
 InstallApp.flags = {
     appIdentifier: core_1.Flags.string({ char: 'i', description: 'The identifier of the app to install', required: false }),
     installWorkflowTemplates: core_1.Flags.boolean({ char: 'w', description: 'Install the app\'s accompanying workflows', required: false }),
+    showHidden: core_1.Flags.boolean({ char: 'h', description: 'Show the option to install public but hidden apps', required: false }),
 };
 async function getConfigProperties(app) {
     const config = {};

package/dist/commands/groups/export.d.ts

@@ -0,0 +1,12 @@
+import { Command } from '@oclif/core';
+export declare const DEFAULT_FILE_LOCATION = "groups.yml";
+export default class ExportGroups extends Command {
+    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>;
+    };
+    run(): Promise<void>;
+}
+export declare function exportGroups(fileLocation: string, overwrite: boolean): Promise<void>;

package/dist/commands/groups/export.js

@@ -0,0 +1,93 @@
+"use strict";
+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 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");
+exports.DEFAULT_FILE_LOCATION = 'groups.yml';
+class ExportGroups extends core_1.Command {
+    async run() {
+        var _a;
+        const { flags } = await this.parse(ExportGroups);
+        try {
+            await (0, login_1.authUser)();
+            this.log('%s Getting Groups.', chalk_1.default.blue.bold('START'));
+            await exportGroups((_a = flags.outDir) !== null && _a !== void 0 ? _a : exports.DEFAULT_FILE_LOCATION, flags.overwrite);
+            this.log('%s Done', chalk_1.default.yellow.bold('GROUPS'));
+        }
+        catch (e) {
+            this.log(`%s Groups download Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            return;
+        }
+        this.log('%s Groups download Complete.', chalk_1.default.green.bold('COMPLETE'));
+    }
+}
+exports.default = ExportGroups;
+ExportGroups.description = 'Export all groups in the org.';
+ExportGroups.examples = [
+    `$ contrail groups export
+`,
+];
+ExportGroups.flags = {
+    outDir: core_1.Flags.string({ char: 'd', description: 'The location for the file to be saved', required: false, default: exports.DEFAULT_FILE_LOCATION }),
+    overwrite: core_1.Flags.boolean({ description: 'Replaces existing files if they exist', required: false, default: false })
+};
+async function exportGroups(fileLocation, overwrite) {
+    const allGroups = await new sdk_1.Entities().get({
+        entityName: 'group', relations: ['groupPrincipals']
+    });
+    const allUsersInOrg = await new sdk_1.Entities().get({
+        entityName: 'user-org',
+    });
+    const groups = [];
+    for (const group of allGroups) {
+        const groupPrincipals = getGroupPrincipals(group, allGroups, allUsersInOrg);
+        groups.push({
+            name: group.name,
+            groupPrincipals,
+        });
+    }
+    await 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.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');
+}
+function getGroupPrincipals(group, allGroups, orgUsers) {
+    const principals = [];
+    for (const principal of group.groupPrincipals) {
+        const [type, id] = principal.principalReference.split(':');
+        if (type === 'user') {
+            const user = orgUsers.find(x => x.user.id === id);
+            if (user) {
+                principals.push({
+                    type,
+                    email: user.user.email
+                });
+            }
+            else {
+                console.log('couldn\'t find user', id);
+            }
+        }
+        else if (type === 'group') {
+            const nestedGroup = allGroups.find(x => x.id === id);
+            principals.push({
+                type: 'group',
+                name: nestedGroup.name
+            });
+        }
+    }
+    return principals;
+}

package/dist/commands/groups/upload.d.ts

@@ -0,0 +1,10 @@
+import { Command } from '@oclif/core';
+export default class ImportGroups extends Command {
+    static description: string;
+    static examples: string[];
+    static args: {
+        groupsFile: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}
+export declare function uploadGroups(fileLocation: string): Promise<void>;

package/dist/commands/groups/upload.js

@@ -0,0 +1,166 @@
+"use strict";
+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");
+class ImportGroups extends core_1.Command {
+    async run() {
+        const { args } = await this.parse(ImportGroups);
+        try {
+            await (0, login_1.authUser)();
+            this.log('%s Uploading Groups.', chalk_1.default.blue.bold('START'));
+            this.log('%s Uploading', chalk_1.default.yellow.bold('GROUP'));
+            await uploadGroups(args.groupsFile);
+            this.log('%s Uploaded', chalk_1.default.yellow.bold('GROUP'));
+        }
+        catch (e) {
+            this.log(`%s Group Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            return;
+        }
+        this.log('%s Group Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    }
+}
+exports.default = ImportGroups;
+ImportGroups.description = 'Import all groups in the groups.yml file';
+ImportGroups.examples = [
+    `$ contrail groups import <GROUPS_FILE>
+`,
+];
+ImportGroups.args = {
+    groupsFile: core_1.Args.string({ description: 'The .yml file containing the groups', required: true }),
+};
+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 orgUsers = await new sdk_1.Entities().get({
+        entityName: 'user-org',
+    });
+    const toDelete = existingGroups.filter(x => !groupsToImport.map(y => y.name).includes(x.name));
+    const toCreate = groupsToImport.filter(x => !existingGroups.map(y => y.name).includes(x.name));
+    const toUpdate = existingGroups.filter(x => groupsToImport.map(y => y.name).includes(x.name));
+    const createdGroups = [];
+    // it's important to create all the groups first, to resolve any downstream principal dependencies
+    for (const group of toCreate) {
+        if (!group.groupPrincipals || !group.name) {
+            console.log('skipping invalid group');
+        }
+        createdGroups.push(await new sdk_1.Entities().create({
+            entityName: 'group', object: { name: group.name }
+        }));
+    }
+    const allGroupsAfterCreate = existingGroups.concat(createdGroups);
+    for (const group of toCreate) {
+        const createdGroup = createdGroups.find(x => x.name === group.name);
+        if (!createdGroup) {
+            continue;
+        }
+        await createGroupPrincipals(createdGroup, group.groupPrincipals, orgUsers, allGroupsAfterCreate);
+    }
+    for (const group of toUpdate) {
+        if (!group.groupPrincipals || !group.name) {
+            console.log('skipping invalid group');
+        }
+        await updateGroup(group.groupPrincipals, orgUsers, group, allGroupsAfterCreate);
+    }
+    for (const group of toDelete) {
+        if (!group.groupPrincipals || !group.name) {
+            console.log('skipping invalid group');
+        }
+        await new sdk_1.Entities().delete({ entityName: 'group', id: group.id });
+    }
+}
+exports.uploadGroups = uploadGroups;
+async function updateGroup(principals, orgUsers, existingGroup, allGroupsAfterCreate) {
+    const existingPrincipals = existingGroup.groupPrincipals;
+    for (const principal of principals) {
+        if (principal.type === 'user') {
+            const user = orgUsers.map(x => x.user).find(x => x.email === (principal === null || principal === void 0 ? void 0 : principal.email));
+            if (!user) {
+                console.log(`user ${principal.email} is not in this org's user list`);
+            }
+            const principalId = `user:${user.id}`;
+            if (existingPrincipals.map(x => x.principalReference).includes(principalId)) {
+                continue;
+            }
+            await new sdk_1.Entities().update({
+                entityName: 'group-principal', object: {
+                    principalReference: `user:${user.id}`,
+                    groupId: existingGroup.id
+                }
+            });
+        }
+        else if (principal.type === 'group') {
+            const group = allGroupsAfterCreate.find(x => x.name === principal.name);
+            if (!group) {
+                console.log(`group ${principal.name} is not in this org's group list`);
+            }
+            const principalId = `group:${principal.name}`;
+            if (existingPrincipals.map(x => x.principalReference).includes(principalId)) {
+                continue;
+            }
+            await new sdk_1.Entities().update({
+                entityName: 'group-principal', object: {
+                    principalReference: `group:${group.id}`,
+                    groupId: existingGroup.id
+                }
+            });
+        }
+    }
+}
+async function createGroupPrincipals(group, principals, orgUsers, allGroupsAfterCreate) {
+    for (const principal of principals) {
+        if (principal.type === 'user') {
+            try {
+                const user = orgUsers.map(x => x.user).find(x => x.email === (principal === null || principal === void 0 ? void 0 : principal.email));
+                if (!user) {
+                    console.log(`user ${principal.email} is not in this org's user list`);
+                }
+                await new sdk_1.Entities().create({
+                    entityName: 'group-principal', object: {
+                        principalReference: `user:${user.id}`,
+                        groupId: group.id
+                    }
+                });
+            }
+            catch (e) {
+                console.log('could not create group principal');
+            }
+        }
+        else if (principal.type === 'group') {
+            try {
+                const nestedGroup = allGroupsAfterCreate.find(x => x.name === principal.name);
+                if (!nestedGroup) {
+                    console.log(`group ${principal.name} is not in this org's group list`);
+                }
+                await new sdk_1.Entities().create({
+                    entityName: 'group-principal', object: {
+                        principalReference: `group:${nestedGroup.id}`,
+                        groupId: group.id
+                    }
+                });
+            }
+            catch (e) {
+                console.log('could not create nested group');
+            }
+        }
+    }
+}

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

@@ -0,0 +1,10 @@
+import { Command } from '@oclif/core';
+export default class ExportInstance extends Command {
+    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>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/instance/export.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const core_1 = require("@oclif/core");
+const getAll_1 = require("../types/getAll");
+const export_1 = require("../users/export");
+class ExportInstance extends core_1.Command {
+    async run() {
+        const { flags } = await this.parse(ExportInstance);
+        await (0, getAll_1.getAll)(flags.outDir, flags.overwrite);
+        await (0, export_1.exportUsers)(path.join(flags.outDir, 'users.yml'), flags.overwrite);
+    }
+}
+exports.default = ExportInstance;
+ExportInstance.description = 'Exports an data of an instance including types and users';
+ExportInstance.examples = [
+    `$ contrail instance export
+`,
+];
+ExportInstance.flags = {
+    outDir: core_1.Flags.string({ description: 'The directory to which to export the instance data. Defaults to the current directory', required: false, default: '.' }),
+    overwrite: core_1.Flags.boolean({ description: 'Replaces any existing export files in outDir', required: false, default: false })
+};

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

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export default class ImportInstance extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/instance/import.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const core_1 = require("@oclif/core");
+const loadAll_1 = require("../types/loadAll");
+const upload_1 = require("../users/upload");
+class ImportInstance extends core_1.Command {
+    async run() {
+        const { flags } = await this.parse(ImportInstance);
+        await (0, loadAll_1.loadAll)(flags.dir);
+        await (0, upload_1.uploadUsers)(path.join(flags.dir, 'users.yml'));
+    }
+}
+exports.default = ImportInstance;
+ImportInstance.description = 'Import the data to an instance, including types and users';
+ImportInstance.examples = [
+    `$ contrail instance import
+`,
+];
+ImportInstance.flags = {
+    dir: core_1.Flags.string({ description: 'The directory from which to export the instance data. Defaults to the current directory', required: false, default: '.' }),
+};

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

@@ -22,8 +22,12 @@ export interface ReducedDataHolder {
 export default class GetAllTypes extends Command {
     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>;
+    };
     run(): Promise<void>;
 }
-export declare function getAll(): Promise<void>;
+export declare function getAll(outDir: string, overwrite: boolean): Promise<void>;
 export declare function reduceTypes(dataHolder: DataHolder): any[];
 export declare function reduceData(data: DataHolder): ReducedDataHolder;

package/dist/commands/types/getAll.js

@@ -9,10 +9,12 @@ const login_1 = require("../../auth/login");
 const path = tslib_1.__importStar(require("path"));
 const type_extractor_1 = require("../../helpers/types/type-extractor");
 const types_1 = require("../../api/types");
+const file_helpers_1 = require("../../helpers/file-helpers");
 const yaml = require('js-yaml');
 class GetAllTypes extends core_1.Command {
     async run() {
-        await getAll();
+        const { flags } = await this.parse(GetAllTypes);
+        await getAll(flags.outDir, flags.overwrite);
     }
 }
 exports.default = GetAllTypes;
@@ -21,13 +23,18 @@ GetAllTypes.examples = [
     `$ contrail types getAll
 `,
 ];
-async function getAll() {
+GetAllTypes.flags = {
+    outDir: core_1.Flags.string({ char: 'd', description: 'The directory to which to export the type data. Defaults to the current directory', required: false, default: '.' }),
+    overwrite: core_1.Flags.boolean({ description: 'Replaces any existing export files in outDir', required: false, default: false })
+};
+async function getAll(outDir, overwrite) {
     try {
         const userConfig = await (0, login_1.authUser)();
         console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
         // make directory to house exports
-        const dir = `./contrail-export-${Date.now()}`;
-        fs_1.default.mkdirSync(dir);
+        if (!fs_1.default.existsSync(path.resolve(outDir))) {
+            fs_1.default.mkdirSync(path.resolve(outDir));
+        }
         const data = {
             types: await (0, type_extractor_1.getTypes)(),
             optionSets: await (0, types_1.getOptionSets)(),
@@ -39,7 +46,7 @@ async function getAll() {
             typePropertyPolicyLinks: await (0, types_1.getTypePropertyPolicyLinks)(),
         };
         const reducedData = reduceData(data);
-        saveData(reducedData, dir);
+        await saveData(reducedData, outDir, overwrite);
         console.log('%s Retrieved', chalk_1.default.yellow.bold('TYPES'));
     }
     catch (e) {
@@ -196,7 +203,7 @@ function reduceData(data) {
     };
 }
 exports.reduceData = reduceData;
-const saveTypesFunction = function (data, dir) {
+const saveTypesFunction = async (data, dir, overwrite) => {
     const roots = {};
     for (const type of data.reducedTypes) {
         const typePathParts = type.typePath.split(':');
@@ -222,10 +229,14 @@ const saveTypesFunction = function (data, dir) {
         if (!fileLabel) {
             console.warn('skipping bad type root:', root);
         }
-        fs_1.default.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
+        const pathToWrite = path.join(subDir, `${removeSlash(fileLabel)}.yml`);
+        if (fs_1.default.existsSync(pathToWrite)) {
+            await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+        }
+        fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
     }
 };
-function saveData(reducedData, dir) {
+async function saveData(reducedData, dir, overwrite) {
     const propertyToFolderMap = {
         reducedTypes: { filename: 'types', split: false, fileLabel: 'slug', saveFunction: saveTypesFunction },
         reducedOptionSets: { filename: 'option-sets', split: true, fileLabel: 'name' },
@@ -239,7 +250,7 @@ function saveData(reducedData, dir) {
     for (const [key, folder] of Object.entries(propertyToFolderMap)) {
         const CURRENT_DIR = process.cwd();
         if (folder['saveFunction']) {
-            folder['saveFunction'](reducedData, dir);
+            await folder['saveFunction'](reducedData, dir, overwrite);
         }
         else if (folder.split) {
             const subDir = path.join(CURRENT_DIR, dir, folder.filename);
@@ -251,13 +262,22 @@ function saveData(reducedData, dir) {
                 const fileLabel = item[folder.fileLabel];
                 if (!fileLabel) {
                     console.warn('skipping bad data:', item);
+                    continue;
                 }
-                fs_1.default.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
+                const pathToWrite = path.join(subDir, `${removeSlash(fileLabel)}.yml`);
+                if (fs_1.default.existsSync(pathToWrite)) {
+                    await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+                }
+                fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
             }
         }
         else {
             const yamlStr = yaml.dump(reducedData[key]);
-            fs_1.default.writeFileSync(path.join(CURRENT_DIR, dir, `${folder.filename}.yml`), yamlStr, 'utf8');
+            const pathToWrite = path.join(CURRENT_DIR, dir, `${folder.filename}.yml`);
+            if (fs_1.default.existsSync(pathToWrite)) {
+                await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+            }
+            fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
         }
     }
 }

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

@@ -1,7 +1,10 @@
 import { Command } from '@oclif/core';
-export default class GetAllTypes extends Command {
+export default class LoadAllTypes extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
     run(): Promise<void>;
 }
-export declare function loadAll(): Promise<void>;
+export declare function loadAll(dir: string): Promise<void>;

package/dist/commands/types/loadAll.js

@@ -11,26 +11,30 @@ const uploadUsageInfo_1 = require("./uploadUsageInfo");
 const uploadRuleSets_1 = require("./uploadRuleSets");
 const uploadTypePropertyPolicies_1 = require("./uploadTypePropertyPolicies");
 const type_uploader_1 = require("../../helpers/types/type-uploader");
-class GetAllTypes extends core_1.Command {
+class LoadAllTypes extends core_1.Command {
     async run() {
-        await loadAll();
+        const { flags } = await this.parse(LoadAllTypes);
+        await loadAll(flags.dir);
     }
 }
-exports.default = GetAllTypes;
-GetAllTypes.description = 'Get all Types and associated data for your Org';
-GetAllTypes.examples = [
-    `$ contrail types getAll
+exports.default = LoadAllTypes;
+LoadAllTypes.description = 'loads all the type data that has been exported by getAll';
+LoadAllTypes.examples = [
+    `$ contrail types loadAll
 `,
 ];
-async function loadAll() {
+LoadAllTypes.flags = {
+    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to load the types data. Defaults to the current directory.', required: false, default: '.' }),
+};
+async function loadAll(dir) {
     try {
         await (0, login_1.authUser)();
-        await (0, uploadOptionSets_1.uploadOptionSets)();
-        await (0, uploadOptionSetHierarchies_1.uploadOptionSetHierarchies)();
-        await (0, type_uploader_1.uploadTypes)();
-        await (0, uploadUsageInfo_1.uploadUsageInfo)();
-        await (0, uploadRuleSets_1.uploadRuleSets)();
-        await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)();
+        await (0, uploadOptionSets_1.uploadOptionSets)(dir);
+        await (0, uploadOptionSetHierarchies_1.uploadOptionSetHierarchies)(dir);
+        await (0, type_uploader_1.uploadTypes)(dir);
+        await (0, uploadUsageInfo_1.uploadUsageInfo)(dir);
+        await (0, uploadRuleSets_1.uploadRuleSets)(dir);
+        await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(dir);
     }
     catch (e) {
         console.log(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));

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

@@ -2,6 +2,9 @@ import { Command } from '@oclif/core';
 export default class UploadOptionSetHierarchies extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
     run(): Promise<void>;
 }
-export declare function uploadOptionSetHierarchies(): Promise<void>;
+export declare function uploadOptionSetHierarchies(dir: string): Promise<void>;

package/dist/commands/types/uploadOptionSetHierarchies.js

@@ -11,20 +11,24 @@ const core_1 = require("@oclif/core");
 const yaml = require('js-yaml');
 class UploadOptionSetHierarchies extends core_1.Command {
     async run() {
-        return await uploadOptionSetHierarchies();
+        const { flags } = await this.parse(UploadOptionSetHierarchies);
+        return await uploadOptionSetHierarchies(flags.dir);
     }
 }
 exports.default = UploadOptionSetHierarchies;
-UploadOptionSetHierarchies.description = 'Upload OptionSets for your Org. OptionSets are loaded from .yml files in the option-sets directory.';
+UploadOptionSetHierarchies.description = 'Upload Option Set Hierarchies for your Org. Option set hierarchies are loaded from .yml files in the option-set-hierarchies directory.';
 UploadOptionSetHierarchies.examples = [
     `$ contrail types uploadOptionSetHierarchies
 `,
 ];
-async function uploadOptionSetHierarchies() {
+UploadOptionSetHierarchies.flags = {
+    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the option set hierarchies data. Defaults to the current directory. The option set data will be loaded from $dir/option-set-hierarchies', required: false, default: '.' }),
+};
+async function uploadOptionSetHierarchies(dir) {
     try {
         await (0, login_1.authUser)();
         console.log('%s Uploading', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
-        const optionSetHierarchies = await loadOptionSetHierarchies();
+        const optionSetHierarchies = await loadOptionSetHierarchies(dir);
         await uploadOSH(optionSetHierarchies);
         console.log('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
     }
@@ -35,13 +39,13 @@ async function uploadOptionSetHierarchies() {
     console.log('%s Option set hierarchy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadOptionSetHierarchies = uploadOptionSetHierarchies;
-function loadOptionSetHierarchies() {
-    const TARGET_DIR = process.cwd();
+function loadOptionSetHierarchies(fromDir) {
     try {
-        const files = fs_1.default.readdirSync(path.join(TARGET_DIR, 'option-set-hierarchies'));
+        const dir = path.resolve(path.join(fromDir, 'option-set-hierarchies'));
+        const files = fs_1.default.readdirSync(dir);
         const OSHs = [];
         for (const file of files) {
-            OSHs.push(yaml.load(fs_1.default.readFileSync(path.join(TARGET_DIR, 'option-set-hierarchies', file), 'utf8')));
+            OSHs.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
         return OSHs;
     }
@@ -117,7 +121,7 @@ async function uploadOSH(loadedOSHs) {
 }
 // transforms the passed hierarchy from names to ids, and returns true if operation succeeded.
 function transformOSHNameToID(hierarchy, optionSets) {
-    console.log('passed hierarhy:', hierarchy);
+    console.log('passed hierarchy:', hierarchy);
     for (let i = 0; i < hierarchy.length; i++) {
         const os = optionSets.find(os => os.name === hierarchy[i]);
         if (!os) {