@contrail/cli 3.4.0 → 3.4.2-alpha.1

package/dist/commands/types/mergeOptionSets.js

@@ -1,120 +1,117 @@
-"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"));
-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.';
-    static examples = [
+"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");
+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 = [
         `$ contrail types mergeOptionSets <File Path>
-`,
-    ];
-    static flags = {
-        ...basecommand_1.BaseCommand.baseFlags,
-    };
-    static args = {
-        file: core_1.Args.string({ description: 'File to merge with the cloud option sets', required: true }),
-    };
-    async run() {
-        try {
-            this.log(`${chalk_1.default.yellow.bold('OPTION SET MERGE')} Importing local file`);
-            this.log('Using File: ', this.args.file);
-            await mergeOptionSets(this.args.file);
-            this.log(`${chalk_1.default.yellow.bold('OPTION SET MERGE')} Merged`);
-        }
-        catch (e) {
-            this.log(`${chalk_1.default.red.bold('FAIL')} Merge Failed. ${e}`);
-            return;
-        }
-        this.log(`${chalk_1.default.green.bold('COMPLETE')} Merge Complete.`);
-    }
-}
-exports.default = MergeOptionSets;
-function loadOptionSets(fileLocation) {
-    const TARGET_DIR = process.cwd();
-    try {
-        const fullPath = path.resolve(path.join(TARGET_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 mergeOptionSets(fileLocation) {
-    const uploadedOptionSets = loadOptionSets(fileLocation);
-    await (0, login_1.authUser)();
-    const currentOptionSetsFull = await new sdk_1.Entities().get({
-        entityName: 'type-property-option-set',
-    });
-    const currentOptionSets = currentOptionSetsFull.map((os) => Object.assign({}, {
-        name: os.name,
-        isArchived: os.isArchived,
-        slug: os.slug,
-        optionSet: os.optionSet,
-    }));
-    const currentOptionSetsByName = {};
-    for (const currentOptionSet of currentOptionSets) {
-        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
-    }
-    const uploadedOptionSetsByName = {};
-    for (const optionSet of uploadedOptionSets) {
-        uploadedOptionSetsByName[optionSet.name] = optionSet;
-    }
-    const mergedOptionSets = [];
-    for (const uploadedOptionSet of uploadedOptionSets) {
-        const existing = currentOptionSetsByName[uploadedOptionSet.name];
-        if (!existing) {
-            if (!uploadedOptionSet.optionSet) {
-                logger_1.default.info(`No OptionSet for: ${uploadedOptionSet.name}`);
-                continue;
-            }
-            logger_1.default.info(`Adding New: ${uploadedOptionSet.name}`);
-            mergedOptionSets.push(uploadedOptionSet);
-        }
-        else {
-            logger_1.default.info(`Merging: ${uploadedOptionSet.name}`);
-            mergedOptionSets.push(mergeOptionSet(existing, uploadedOptionSet));
-        }
-    }
-    for (const currentOptionSet of currentOptionSets) {
-        const found = uploadedOptionSetsByName[currentOptionSet.name];
-        if (!found) {
-            logger_1.default.info(`Adding Existing: ${currentOptionSet.name}`);
-            mergedOptionSets.push(currentOptionSet);
-        }
-    }
-    saveData(mergedOptionSets);
-}
-function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
-    const merged = {
-        name: uploadedOptionSet.name,
-        slug: uploadedOptionSet.slug,
-        optionSet: uploadedOptionSet.optionSet,
-        isArchived: uploadedOptionSet.isArchived,
-    };
-    if (existingOptionSet?.optionSet?.length > 0) {
-        for (const keyVal of existingOptionSet.optionSet) {
-            const value = keyVal.value;
-            const display = keyVal.display;
-            const disabled = keyVal?.disabled;
-            const found = merged.optionSet.find((keyVal) => keyVal.value === value);
-            if (!found) {
-                merged.optionSet.push({ value, display, disabled });
-            }
-        }
-    }
-    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');
-}
+`,
+    ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+    };
+    static args = {
+        file: core_1.Args.string({
+            description: 'File (or directory) to merge with the cloud option sets',
+            required: true,
+        }),
+    };
+    async run() {
+        try {
+            this.log(`${chalk_1.default.yellow.bold('OPTION SET MERGE')} Importing local file`);
+            this.log('Using File: ', this.args.file);
+            await mergeOptionSets(this.args.file);
+            this.log(`${chalk_1.default.yellow.bold('OPTION SET MERGE')} Merged`);
+        }
+        catch (e) {
+            this.log(`${chalk_1.default.red.bold('FAIL')} Merge Failed. ${e}`);
+            return;
+        }
+        this.log(`${chalk_1.default.green.bold('COMPLETE')} Merge Complete.`);
+    }
+}
+exports.default = MergeOptionSets;
+function loadOptionSets(fileLocation) {
+    const osh = new option_set_helper_1.OptionSetHelper();
+    return osh.loadOptionSets(fileLocation);
+}
+async function mergeOptionSets(fileLocation) {
+    const uploadedOptionSets = await loadOptionSets(fileLocation);
+    await (0, login_1.authUser)();
+    const currentOptionSetsFull = await new sdk_1.Entities().get({
+        entityName: 'type-property-option-set',
+    });
+    const currentOptionSets = currentOptionSetsFull.map((os) => Object.assign({}, {
+        name: os.name,
+        isArchived: os.isArchived,
+        slug: os.slug,
+        optionSet: os.optionSet,
+    }));
+    const currentOptionSetsByName = {};
+    for (const currentOptionSet of currentOptionSets) {
+        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
+    }
+    const uploadedOptionSetsByName = {};
+    for (const optionSet of uploadedOptionSets) {
+        uploadedOptionSetsByName[optionSet.name] = optionSet;
+    }
+    const mergedOptionSets = [];
+    for (const uploadedOptionSet of uploadedOptionSets) {
+        const existing = currentOptionSetsByName[uploadedOptionSet.name];
+        if (!existing) {
+            if (!uploadedOptionSet.optionSet) {
+                logger_1.default.info(`No OptionSet for: ${uploadedOptionSet.name}`);
+                continue;
+            }
+            logger_1.default.info(`Adding New: ${uploadedOptionSet.name}`);
+            mergedOptionSets.push(uploadedOptionSet);
+        }
+        else {
+            logger_1.default.info(`Merging: ${uploadedOptionSet.name}`);
+            mergedOptionSets.push(mergeOptionSet(existing, uploadedOptionSet));
+        }
+    }
+    for (const currentOptionSet of currentOptionSets) {
+        const found = uploadedOptionSetsByName[currentOptionSet.name];
+        if (!found) {
+            logger_1.default.info(`Adding Existing: ${currentOptionSet.name}`);
+            mergedOptionSets.push(currentOptionSet);
+        }
+    }
+    saveData(mergedOptionSets);
+}
+function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
+    const merged = {
+        name: uploadedOptionSet.name,
+        slug: uploadedOptionSet.slug,
+        optionSet: uploadedOptionSet.optionSet,
+        isArchived: uploadedOptionSet.isArchived,
+    };
+    if (existingOptionSet?.optionSet?.length > 0) {
+        for (const keyVal of existingOptionSet.optionSet) {
+            const value = keyVal.value;
+            const display = keyVal.display;
+            const disabled = keyVal?.disabled;
+            const found = merged.optionSet.find((keyVal) => keyVal.value === value);
+            if (!found) {
+                merged.optionSet.push({ value, display, disabled });
+            }
+        }
+    }
+    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.d.ts

@@ -1,15 +1,15 @@
-import { BaseCommand } from '../../basecommand';
-export default class MergeTypeProperties extends BaseCommand {
-    static description: string;
-    static examples: string[];
-    static strict: boolean;
-    static flags: {
-        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    static args: {
-        file: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
-        typePaths: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
-    };
-    run(): Promise<void>;
-}
+import { BaseCommand } from '../../basecommand';
+export default class MergeTypeProperties extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static strict: boolean;
+    static flags: {
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static args: {
+        file: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+        typePaths: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/types/mergeTypeProperties.js

@@ -1,96 +1,96 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
-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 type_extractor_1 = require("../../helpers/types/type-extractor");
-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 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';
-    static examples = [
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+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 type_extractor_1 = require("../../helpers/types/type-extractor");
+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 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';
+    static examples = [
         `$ contrail types mergeTypeProperties <File Path> <TypePaths>
-    `,
-    ];
-    // variable argument length
-    static strict = false;
-    static flags = {
-        ...basecommand_1.BaseCommand.baseFlags,
-    };
-    static args = {
-        file: core_1.Args.string({ description: 'File to parse', required: true }),
-        typePaths: core_1.Args.string({ description: 'A list of the type paths to merge', required: true }),
-    };
-    async run() {
-        try {
-            this.log(`${chalk_1.default.yellow.bold('TYPE PROPERTIES MERGE')} Importing local file`);
-            this.log('Using File: ', this.args.file);
-            logger_1.default.info(`argv: ${JSON.stringify(this.argv)}`);
-            const typePaths = this.argv.slice(1);
-            this.log('Using TypePaths: ', typePaths);
-            await mergeTypeProperties(this.args.file, typePaths);
-            this.log(`${chalk_1.default.yellow.bold('TYPE PROPERTIES MERGE')} Merged`);
-        }
-        catch (e) {
-            this.log(`${chalk_1.default.red.bold('FAIL')} Merge Failed. ${e}`);
-            return;
-        }
-        this.log(`${chalk_1.default.green.bold('COMPLETE')} Merge Complete.`);
-    }
-}
-exports.default = MergeTypeProperties;
-function loadTypeProperties(fileLocation) {
-    const TARGET_DIR = process.cwd();
-    try {
-        const fullPath = path.join(TARGET_DIR, fileLocation);
-        return js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function mergeTypeProperties(fileLocation, typePaths) {
-    const uploadedTypeProperties = loadTypeProperties(fileLocation);
-    await (0, login_1.authUser)();
-    const data = {
-        types: await (0, type_extractor_1.getTypes)(),
-        optionSets: await (0, types_2.getOptionSets)(),
-        optionSetHierarchies: [],
-        optionSetHierarchyLinks: [],
-        ruleSets: [],
-        ruleSetLinks: [],
-        usageInfo: [],
-        typePropertyPolicies: [],
-        typePropertyPolicyLinks: [],
-        typePolicies: [],
-        typePolicyLinks: [],
-    };
-    const reducedData = await (0, types_1.getAllReducedTypes)(data);
-    for (const typePath of typePaths) {
-        const foundType = reducedData.reducedTypes.find((reducedTypes) => reducedTypes.typePath === typePath);
-        if (!foundType) {
-            logger_1.default.warn(`${chalk_1.default.red.bold('WARNING')} No Type found for: ${typePath}`);
-        }
-        mergeType(foundType, uploadedTypeProperties);
-    }
-    saveData({ types: reducedData.reducedTypes });
-}
-function mergeType(reducedType, typePropertiesToAdd) {
-    for (const typeProperty of typePropertiesToAdd) {
-        const found = reducedType.typeProperties.find((tp) => tp.slug === typeProperty.slug);
-        if (!found) {
-            reducedType.typeProperties.push(typeProperty);
-        }
-    }
-}
-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');
-}
+    `,
+    ];
+    // variable argument length
+    static strict = false;
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+    };
+    static args = {
+        file: core_1.Args.string({ description: 'File to parse', required: true }),
+        typePaths: core_1.Args.string({ description: 'A list of the type paths to merge', required: true }),
+    };
+    async run() {
+        try {
+            this.log(`${chalk_1.default.yellow.bold('TYPE PROPERTIES MERGE')} Importing local file`);
+            this.log('Using File: ', this.args.file);
+            logger_1.default.info(`argv: ${JSON.stringify(this.argv)}`);
+            const typePaths = this.argv.slice(1);
+            this.log('Using TypePaths: ', typePaths);
+            await mergeTypeProperties(this.args.file, typePaths);
+            this.log(`${chalk_1.default.yellow.bold('TYPE PROPERTIES MERGE')} Merged`);
+        }
+        catch (e) {
+            this.log(`${chalk_1.default.red.bold('FAIL')} Merge Failed. ${e}`);
+            return;
+        }
+        this.log(`${chalk_1.default.green.bold('COMPLETE')} Merge Complete.`);
+    }
+}
+exports.default = MergeTypeProperties;
+function loadTypeProperties(fileLocation) {
+    const TARGET_DIR = process.cwd();
+    try {
+        const fullPath = path.join(TARGET_DIR, fileLocation);
+        return js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function mergeTypeProperties(fileLocation, typePaths) {
+    const uploadedTypeProperties = loadTypeProperties(fileLocation);
+    await (0, login_1.authUser)();
+    const data = {
+        types: await (0, type_extractor_1.getTypes)(),
+        optionSets: await (0, types_2.getOptionSets)(),
+        optionSetHierarchies: [],
+        optionSetHierarchyLinks: [],
+        ruleSets: [],
+        ruleSetLinks: [],
+        usageInfo: [],
+        typePropertyPolicies: [],
+        typePropertyPolicyLinks: [],
+        typePolicies: [],
+        typePolicyLinks: [],
+    };
+    const reducedData = await (0, types_1.getAllReducedTypes)(data);
+    for (const typePath of typePaths) {
+        const foundType = reducedData.reducedTypes.find((reducedTypes) => reducedTypes.typePath === typePath);
+        if (!foundType) {
+            logger_1.default.warn(`${chalk_1.default.red.bold('WARNING')} No Type found for: ${typePath}`);
+        }
+        mergeType(foundType, uploadedTypeProperties);
+    }
+    saveData({ types: reducedData.reducedTypes });
+}
+function mergeType(reducedType, typePropertiesToAdd) {
+    for (const typeProperty of typePropertiesToAdd) {
+        const found = reducedType.typeProperties.find((tp) => tp.slug === typeProperty.slug);
+        if (!found) {
+            reducedType.typeProperties.push(typeProperty);
+        }
+    }
+}
+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/parseOptionSetsHierarchyLocalFile.d.ts

@@ -1,14 +1,14 @@
-import { BaseCommand } from '../../basecommand';
-export default class ParseOptionSetsHierarchyLocalFile extends BaseCommand {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    static args: {
-        file: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
-    };
-    run(): Promise<void>;
-}
-export declare function parseOptionSetsHierarchyLocalFile(fileLocation: any): Promise<void>;
+import { BaseCommand } from '../../basecommand';
+export default class ParseOptionSetsHierarchyLocalFile extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    static args: {
+        file: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}
+export declare function parseOptionSetsHierarchyLocalFile(fileLocation: any): Promise<void>;