@contrail/cli 2.0.3 → 2.0.4

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({ 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) {

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

@@ -2,6 +2,9 @@ import { Command } from '@oclif/core';
 export default class UploadOptionSets 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 uploadOptionSets(): Promise<void>;
+export declare function uploadOptionSets(dir: string): Promise<void>;

package/dist/commands/types/uploadOptionSets.js

@@ -11,7 +11,8 @@ const core_1 = require("@oclif/core");
 const yaml = require('js-yaml');
 class UploadOptionSets extends core_1.Command {
     async run() {
-        return await uploadOptionSets();
+        const { flags } = await this.parse(UploadOptionSets);
+        return await uploadOptionSets(flags.dir);
     }
 }
 exports.default = UploadOptionSets;
@@ -20,12 +21,15 @@ UploadOptionSets.examples = [
     `$ contrail types uploadOptionSets
 `,
 ];
-async function uploadOptionSets() {
+UploadOptionSets.flags = {
+    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the option set data. Defaults to the current directory. The option set data will be loaded from $dir/option-sets', required: false, default: '.' }),
+};
+async function uploadOptionSets(dir) {
     try {
         const userConfig = await (0, login_1.authUser)();
         console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
         console.log('%s Uploading', chalk_1.default.yellow.bold('OPTION SETS'));
-        await uploadOS();
+        await uploadOS(dir);
         console.log('%s Uploaded', chalk_1.default.yellow.bold('OPTION SETS'));
     }
     catch (e) {
@@ -35,13 +39,13 @@ async function uploadOptionSets() {
     console.log('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadOptionSets = uploadOptionSets;
-function loadOptionSets() {
-    const TARGET_DIR = process.cwd();
+function loadOptionSets(fromDir) {
     try {
-        const files = fs_1.default.readdirSync(path.join(TARGET_DIR, 'option-sets'));
+        const dir = path.resolve(path.join(fromDir, 'option-sets'));
+        const files = fs_1.default.readdirSync(dir);
         const optionSets = [];
         for (const file of files) {
-            optionSets.push(yaml.load(fs_1.default.readFileSync(path.join(TARGET_DIR, 'option-sets', file), 'utf8')));
+            optionSets.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
         return optionSets;
     }
@@ -49,8 +53,8 @@ function loadOptionSets() {
         throw new Error(`ERROR PARSING YAML: ${e}`);
     }
 }
-async function uploadOS() {
-    const optionSets = loadOptionSets();
+async function uploadOS(dir) {
+    const optionSets = loadOptionSets(dir);
     const currentOptionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
     });

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

@@ -2,6 +2,9 @@ import { Command } from '@oclif/core';
 export default class UploadRuleSets 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 uploadRuleSets(): Promise<void>;
+export declare function uploadRuleSets(dir: string): Promise<void>;

package/dist/commands/types/uploadRuleSets.js

@@ -11,7 +11,8 @@ const core_1 = require("@oclif/core");
 const yaml = require('js-yaml');
 class UploadRuleSets extends core_1.Command {
     async run() {
-        await uploadRuleSets();
+        const { flags } = await this.parse(UploadRuleSets);
+        await uploadRuleSets(flags.dir);
     }
 }
 exports.default = UploadRuleSets;
@@ -20,11 +21,14 @@ UploadRuleSets.examples = [
     `$ contrail types uploadRuleSets
 `,
 ];
-async function uploadRuleSets() {
+UploadRuleSets.flags = {
+    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the rule set data. Defaults to the current directory. The rule set data will be loaded from $dir/rule-sets/*.yml', required: false, default: '.' }),
+};
+async function uploadRuleSets(dir) {
     try {
         await (0, login_1.authUser)();
         console.log('%s Uploading', chalk_1.default.yellow.bold('RULE SET'));
-        const [reducedRuleSets, reducedRuleSetLinks] = await loadReducedRuleSets();
+        const [reducedRuleSets, reducedRuleSetLinks] = await loadReducedRuleSets(dir);
         await uploadRuleSetObjects(reducedRuleSets);
         await uploadRuleSetLinkObjects(reducedRuleSetLinks);
         console.log('%s Uploaded', chalk_1.default.yellow.bold('RULE SET'));
@@ -36,16 +40,16 @@ async function uploadRuleSets() {
     console.log('%s Rule set Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadRuleSets = uploadRuleSets;
-function loadReducedRuleSets() {
+function loadReducedRuleSets(fromDir) {
     const ruleSets = [];
     let ruleSetLinks = [];
-    const TARGET_DIR = process.cwd();
+    const dir = path.join(fromDir, 'rule-sets');
     try {
-        const files = fs_1.default.readdirSync(path.join(TARGET_DIR, 'rule-sets'));
+        const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
-            ruleSets.push(yaml.load(fs_1.default.readFileSync(path.join(TARGET_DIR, 'rule-sets', file), 'utf8')));
+            ruleSets.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        ruleSetLinks = yaml.load(fs_1.default.readFileSync(path.join(TARGET_DIR, 'rule-set-links.yml'), 'utf8'));
+        ruleSetLinks = yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'rule-set-links.yml'), 'utf8'));
         return [ruleSets, ruleSetLinks];
     }
     catch (e) {

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

@@ -2,6 +2,9 @@ import { Command } from '@oclif/core';
 export default class UploadTypePropertyPolicies 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 uploadTypePropertyPolicies(): Promise<void>;
+export declare function uploadTypePropertyPolicies(dir: string): Promise<void>;

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -12,7 +12,8 @@ const type_extractor_1 = require("../../helpers/types/type-extractor");
 const yaml = require('js-yaml');
 class UploadTypePropertyPolicies extends core_1.Command {
     async run() {
-        return await uploadTypePropertyPolicies();
+        const { flags } = await this.parse(UploadTypePropertyPolicies);
+        return await uploadTypePropertyPolicies(flags.dir);
     }
 }
 exports.default = UploadTypePropertyPolicies;
@@ -21,11 +22,14 @@ UploadTypePropertyPolicies.examples = [
     `$ contrail types uploadTypePropertyPolicies
 `,
 ];
-async function uploadTypePropertyPolicies() {
+UploadTypePropertyPolicies.flags = {
+    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the type property policy data. Defaults to the current directory. The type property policy data will be loaded from $dir/type-property-policies/*.yml', required: false, default: '.' }),
+};
+async function uploadTypePropertyPolicies(dir) {
     try {
         await (0, login_1.authUser)();
         console.log('%s Uploading', chalk_1.default.yellow.bold('TYPE PROPERTY POLICY'));
-        const [reducedTypePropertyPolicies, reducedTypePropertyPolicyLinks] = await loadTPPolicies();
+        const [reducedTypePropertyPolicies, reducedTypePropertyPolicyLinks] = await loadTPPolicies(dir);
         await uploadTPPolicyObjects(reducedTypePropertyPolicies);
         await uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks);
         console.log('%s Uploaded', chalk_1.default.yellow.bold('TYPE PROPERTY POLICY'));
@@ -37,16 +41,16 @@ async function uploadTypePropertyPolicies() {
     console.log('%s Type Property Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadTypePropertyPolicies = uploadTypePropertyPolicies;
-function loadTPPolicies() {
+function loadTPPolicies(fromDir) {
     const tpps = [];
     let tppLinks = [];
-    const TARGET_DIR = process.cwd();
+    const dir = path.join(fromDir, 'type-property-policies');
     try {
-        const files = fs_1.default.readdirSync(path.join(TARGET_DIR, 'type-property-policies'));
+        const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
-            tpps.push(yaml.load(fs_1.default.readFileSync(path.join(TARGET_DIR, 'type-property-policies', file), 'utf8')));
+            tpps.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        tppLinks = yaml.load(fs_1.default.readFileSync(path.join(TARGET_DIR, 'type-property-policy-links.yml'), 'utf8'));
+        tppLinks = yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'type-property-policy-links.yml'), 'utf8'));
         return [tpps, tppLinks];
     }
     catch (e) {

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

@@ -2,6 +2,9 @@ import { Command } from '@oclif/core';
 export default class UploadUsageInfo 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 uploadUsageInfo(): Promise<void>;
+export declare function uploadUsageInfo(dir: string): Promise<void>;

package/dist/commands/types/uploadUsageInfo.js

@@ -12,7 +12,8 @@ const type_extractor_1 = require("../../helpers/types/type-extractor");
 const yaml = require('js-yaml');
 class UploadUsageInfo extends core_1.Command {
     async run() {
-        await uploadUsageInfo();
+        const { flags } = await this.parse(UploadUsageInfo);
+        await uploadUsageInfo(flags.dir);
     }
 }
 exports.default = UploadUsageInfo;
@@ -21,11 +22,14 @@ UploadUsageInfo.examples = [
     `$ contrail types uploadUsageInfo
 `,
 ];
-async function uploadUsageInfo() {
+UploadUsageInfo.flags = {
+    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the usage info data. Defaults to the current directory. The option set data will be loaded from $dir/usage-info.yml', required: false, default: '.' }),
+};
+async function uploadUsageInfo(dir) {
     try {
         await (0, login_1.authUser)();
         console.log('%s Uploading', chalk_1.default.yellow.bold('USAGE INFO'));
-        const reducedUsageInfo = await loadUsageInfo();
+        const reducedUsageInfo = await loadUsageInfo(dir);
         await uploadUsageInfoObjects(reducedUsageInfo);
         console.log('%s Uploaded', chalk_1.default.yellow.bold('USAGE INFO'));
     }
@@ -36,10 +40,9 @@ async function uploadUsageInfo() {
     console.log('%s Usage Info Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadUsageInfo = uploadUsageInfo;
-function loadUsageInfo() {
-    const TARGET_DIR = process.cwd();
+function loadUsageInfo(dir) {
     try {
-        const doc = yaml.load(fs_1.default.readFileSync(path.join(TARGET_DIR, 'usage-info.yml'), 'utf8'));
+        const doc = yaml.load(fs_1.default.readFileSync(path.join(dir, 'usage-info.yml'), 'utf8'));
         return doc;
     }
     catch (e) {

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

@@ -4,6 +4,8 @@ export default class ExportUsers extends Command {
     static examples: string[];
     static flags: {
         fileOut: 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 exportUsers(fileLocation: string, overwrite: boolean): Promise<void>;

package/dist/commands/users/export.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.exportUsers = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const sdk_1 = require("@contrail/sdk");
@@ -8,14 +9,15 @@ 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");
 class ExportUsers extends core_1.Command {
     async run() {
         var _a;
-        const { args, flags } = await this.parse(ExportUsers);
+        const { flags } = await this.parse(ExportUsers);
         try {
             await (0, login_1.authUser)();
             this.log('%s Getting Users.', chalk_1.default.blue.bold('START'));
-            await exportUsers((_a = flags.fileOut) !== null && _a !== void 0 ? _a : 'users.yml');
+            await exportUsers((_a = flags.fileOut) !== null && _a !== void 0 ? _a : 'users.yml', flags.overwrite);
             this.log('%s Done', chalk_1.default.yellow.bold('USERS'));
         }
         catch (e) {
@@ -33,8 +35,9 @@ ExportUsers.examples = [
 ];
 ExportUsers.flags = {
     fileOut: core_1.Flags.string({ char: 'f', description: 'The location for the file to be saved', required: false }),
+    overwrite: core_1.Flags.boolean({ description: 'Replaces existing files if they exist', required: false, default: false })
 };
-async function exportUsers(fileLocation) {
+async function exportUsers(fileLocation, overwrite) {
     const allUsersInOrg = await new sdk_1.Entities().get({
         entityName: 'user-org',
     });
@@ -51,10 +54,15 @@ async function exportUsers(fileLocation) {
             ...userInOrg.user
         });
     }
-    saveData({ users: users }, fileLocation);
+    saveData({ users: users }, fileLocation, overwrite);
 }
-function saveData(data, fileLocation) {
+exports.exportUsers = exportUsers;
+function saveData(data, fileLocation, overwrite) {
     const yamlStr = js_yaml_1.default.dump(data);
     const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, fileLocation)), yamlStr, 'utf8');
+    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
+    if (fs_1.default.existsSync(pathToWrite)) {
+        (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+    }
+    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
 }

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

@@ -7,3 +7,4 @@ export default class ImportUsers extends Command {
     };
     run(): Promise<void>;
 }
+export declare function uploadUsers(fileLocation: string): Promise<void>;

package/dist/commands/users/upload.js

@@ -1,5 +1,6 @@
 "use strict";
 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");
@@ -63,3 +64,4 @@ async function uploadUsers(fileLocation) {
         });
     }
 }
+exports.uploadUsers = uploadUsers;