@contrail/cli 2.1.20 → 2.1.22

package/dist/commands/types/uploadOptionSetHierarchies.js

@@ -9,10 +9,13 @@ 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 yaml = require('js-yaml');
-class UploadOptionSetHierarchies extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+class UploadOptionSetHierarchies extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(UploadOptionSetHierarchies);
+        await super.setLogLevel(flags.logLevel);
         return await uploadOptionSetHierarchies(flags.dir);
     }
 }
@@ -23,23 +26,28 @@ UploadOptionSetHierarchies.examples = [
 `,
 ];
 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: '.' }),
+    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'));
+        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
         const optionSetHierarchies = await loadOptionSetHierarchies(dir);
         await uploadOSH(optionSetHierarchies);
         const optionSetHierarchyLinks = await loadOptionSetHierarchyLinks(dir);
         await uploadOSHLinks(optionSetHierarchyLinks);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
+        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
     }
     catch (e) {
-        console.log(`%s Option set hierarchy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Option set hierarchy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s Option set hierarchy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Option set hierarchy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadOptionSetHierarchies = uploadOptionSetHierarchies;
 function loadOptionSetHierarchies(fromDir) {
@@ -48,7 +56,7 @@ function loadOptionSetHierarchies(fromDir) {
         const files = fs_1.default.readdirSync(dir);
         const OSHs = [];
         for (const file of files) {
-            OSHs.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
+            OSHs.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
         return OSHs;
     }
@@ -58,7 +66,7 @@ function loadOptionSetHierarchies(fromDir) {
 }
 function loadOptionSetHierarchyLinks(fromDir) {
     try {
-        return yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'type-option-set-hierarchy-links.yml'), 'utf8'));
+        return js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-option-set-hierarchy-links.yml'), 'utf8'));
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -83,8 +91,8 @@ async function uploadOSH(loadedOSHs) {
     for (const loadedOSH of loadedOSHs) {
         loadedOSHByName[loadedOSH.name] = loadedOSH;
     }
-    console.debug('current OSH:', currentOSHs);
-    console.debug('loaded OSH:', loadedOSHs);
+    logger_1.default.debug('current OSH:', currentOSHs);
+    logger_1.default.debug('loaded OSH:', loadedOSHs);
     for (const osh of loadedOSHs) {
         try {
             const found = currentOSHByName[osh.name];
@@ -92,17 +100,17 @@ async function uploadOSH(loadedOSHs) {
                 if (!transformOSHNameToID(osh.hierarchy, optionSets)) {
                     continue;
                 }
-                console.log('Creating: ', osh);
+                logger_1.default.info('Creating: ', osh);
                 await new sdk_1.Entities().create({
                     entityName: 'option-set-hierarchy',
-                    object: osh
+                    object: osh,
                 });
             }
             else {
                 if (!transformOSHNameToID(osh.hierarchy, optionSets)) {
                     continue;
                 }
-                console.log('Updating: ', osh);
+                logger_1.default.info('Updating: ', osh);
                 await new sdk_1.Entities().update({
                     entityName: 'option-set-hierarchy',
                     id: found.id,
@@ -118,7 +126,7 @@ async function uploadOSH(loadedOSHs) {
         try {
             const found = loadedOSHByName[currentOSH.name];
             if (!found) {
-                console.log('Deleting: ', currentOSH.name);
+                logger_1.default.info('Deleting: ', currentOSH.name);
                 await new sdk_1.Entities().delete({
                     entityName: 'option-set-hierarchy',
                     id: currentOSH.id,
@@ -132,11 +140,11 @@ 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 hierarchy:', hierarchy);
+    logger_1.default.info('passed hierarchy:', hierarchy);
     for (let i = 0; i < hierarchy.length; i++) {
-        const os = optionSets.find(os => os.name === hierarchy[i]);
+        const os = optionSets.find((os) => os.name === hierarchy[i]);
         if (!os) {
-            console.error('could not find option set with name', hierarchy[i], ' at position', i, 'skipping...');
+            logger_1.default.error('could not find option set with name', hierarchy[i], ' at position', i, 'skipping...');
             return false;
         }
         hierarchy[i] = os.id;
@@ -146,7 +154,7 @@ function transformOSHNameToID(hierarchy, optionSets) {
 async function uploadOSHLinks(reducedOSHLinks) {
     const typesWithProperties = await (0, type_extractor_1.getTypes)();
     const typeProperties = [];
-    typesWithProperties.forEach(type => {
+    typesWithProperties.forEach((type) => {
         if (type.typeProperties) {
             for (const tp of type.typeProperties) {
                 tp.typeId = type.id;
@@ -163,11 +171,15 @@ async function uploadOSHLinks(reducedOSHLinks) {
     });
     const currentOSHLinkHashes = {};
     for (const currentLink of currentOSHLinks) {
-        const foundType = typesWithProperties.find(x => x.id === currentLink.typeId);
-        const foundOSH = currentOSHs.find(osh => osh.id === currentLink.optionSetHierarchyId);
-        const foundTPSlugs = typeProperties.filter(x => { var _a; return (_a = currentLink === null || currentLink === void 0 ? void 0 : currentLink.hierarchyTypePropertyIds) === null || _a === void 0 ? void 0 : _a.includes(x.id); }).map(x => x.slug);
-        if (!foundType || !foundOSH || (foundTPSlugs.length !== currentLink.hierarchyTypePropertyIds.length)) {
-            console.log('skipping unhashable, invalid type option set hierarchy link:', currentLink);
+        const foundType = typesWithProperties.find((x) => x.id === currentLink.typeId);
+        const foundOSH = currentOSHs.find((osh) => osh.id === currentLink.optionSetHierarchyId);
+        const foundTPSlugs = typeProperties
+            .filter((x) => { var _a; return (_a = currentLink === null || currentLink === void 0 ? void 0 : currentLink.hierarchyTypePropertyIds) === null || _a === void 0 ? void 0 : _a.includes(x.id); })
+            .map((x) => x.slug);
+        if (!foundType ||
+            !foundOSH ||
+            foundTPSlugs.length !== currentLink.hierarchyTypePropertyIds.length) {
+            logger_1.default.info('skipping unhashable, invalid type option set hierarchy link:', currentLink);
         }
         const hash = `${foundType.slug}|${foundOSH.name}|${foundTPSlugs.sort().join('|')}`;
         currentOSHLinkHashes[hash] = currentLink;
@@ -202,7 +214,7 @@ async function uploadOSHLinks(reducedOSHLinks) {
         try {
             const found = reducedLinksByHashes[currentLinkHash];
             if (!found) {
-                console.log('Deleting: ', currentLinkHash);
+                logger_1.default.info('Deleting: ', currentLinkHash);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-option-set-hierarchy-link',
                     id: currentLink['id'],
@@ -216,21 +228,21 @@ async function uploadOSHLinks(reducedOSHLinks) {
 }
 function transformReducedLink(OSHLink, typesWithProperties, OSHs) {
     var _a, _b;
-    const foundType = typesWithProperties.find(x => x.slug === OSHLink.typeSlug);
+    const foundType = typesWithProperties.find((x) => x.slug === OSHLink.typeSlug);
     if (!foundType) {
-        console.error('OSH Links: Could not find type with slug', OSHLink.typeSlug);
+        logger_1.default.error('OSH Links: Could not find type with slug', OSHLink.typeSlug);
         return false;
     }
     OSHLink.typeId = foundType.id;
-    const foundTPs = (_b = (_a = foundType === null || foundType === void 0 ? void 0 : foundType.typeProperties) === null || _a === void 0 ? void 0 : _a.filter(x => OSHLink.typePropertySlugs.includes(x.slug))) !== null && _b !== void 0 ? _b : [];
+    const foundTPs = (_b = (_a = foundType === null || foundType === void 0 ? void 0 : foundType.typeProperties) === null || _a === void 0 ? void 0 : _a.filter((x) => OSHLink.typePropertySlugs.includes(x.slug))) !== null && _b !== void 0 ? _b : [];
     if (foundTPs.length !== OSHLink.typePropertySlugs.length) {
-        console.error('OSH Links: Could not find all type properties with slugs', OSHLink.typePropertySlugs);
+        logger_1.default.error('OSH Links: Could not find all type properties with slugs', OSHLink.typePropertySlugs);
         return false;
     }
-    OSHLink.hierarchyTypePropertyIds = foundTPs.map(x => x.id);
-    const foundOSH = OSHs.find(x => x.name === OSHLink.optionSetHierarchyName);
+    OSHLink.hierarchyTypePropertyIds = foundTPs.map((x) => x.id);
+    const foundOSH = OSHs.find((x) => x.name === OSHLink.optionSetHierarchyName);
     if (!foundOSH) {
-        console.error('OSH Links: Could not find option set hierarchy with name', OSHLink.optionSetHierarchyName);
+        logger_1.default.error('OSH Links: Could not find option set hierarchy with name', OSHLink.optionSetHierarchyName);
         return false;
     }
     OSHLink.optionSetHierarchyId = foundOSH.id;

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class UploadOptionSets extends Command {
+import { BaseCommand } from '../basecommand';
+export default class UploadOptionSets extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/types/uploadOptionSets.js

@@ -8,10 +8,13 @@ const path = tslib_1.__importStar(require("path"));
 const login_1 = require("../../auth/login");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
-const yaml = require('js-yaml');
-class UploadOptionSets extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+class UploadOptionSets extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(UploadOptionSets);
+        await super.setLogLevel(flags.logLevel);
         return await uploadOptionSets(flags.dir);
     }
 }
@@ -22,21 +25,26 @@ UploadOptionSets.examples = [
 `,
 ];
 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: '.' }),
+    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'));
+        logger_1.default.info(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
+        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('OPTION SETS'));
         await uploadOS(dir);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('OPTION SETS'));
+        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('OPTION SETS'));
     }
     catch (e) {
-        console.log(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadOptionSets = uploadOptionSets;
 function loadOptionSets(fromDir) {
@@ -45,7 +53,7 @@ function loadOptionSets(fromDir) {
         const files = fs_1.default.readdirSync(dir);
         const optionSets = [];
         for (const file of files) {
-            optionSets.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
+            optionSets.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
         return optionSets;
     }
@@ -71,10 +79,10 @@ async function uploadOS(dir) {
             const found = currentOptionSetsByName[optionSet.name];
             if (!found) {
                 if (!optionSet.optionSet) {
-                    console.log('No OptionSet for: ', optionSet.name);
+                    logger_1.default.info('No OptionSet for: ', optionSet.name);
                     continue;
                 }
-                console.log('Creating: ', optionSet.name);
+                logger_1.default.info('Creating: ', optionSet.name);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-option-set',
                     object: {
@@ -85,7 +93,7 @@ async function uploadOS(dir) {
                 });
             }
             else {
-                console.log('Updating: ', optionSet.name);
+                logger_1.default.info('Updating: ', optionSet.name);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-option-set',
                     id: found.id,
@@ -105,7 +113,7 @@ async function uploadOS(dir) {
         try {
             const found = newOptionSetsByName[currentOptionSet.name];
             if (!found) {
-                console.log('Deleting: ', currentOptionSet.name);
+                logger_1.default.info('Deleting: ', currentOptionSet.name);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-option-set',
                     id: currentOptionSet.id,

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class UploadOptionSetsHierarchyLocalFile extends Command {
+import { BaseCommand } from '../basecommand';
+export default class UploadOptionSetsHierarchyLocalFile extends BaseCommand {
     static description: string;
     static examples: string[];
     static args: {

package/dist/commands/types/uploadOptionSetsHierarchyLocalFile.js

@@ -4,14 +4,17 @@ exports.uploadOptionSetsHierarchyLocalFile = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const csv = require('csvtojson');
+const csvtojson_1 = tslib_1.__importDefault(require("csvtojson"));
 const sdk_1 = require("@contrail/sdk");
 const util_1 = require("@contrail/util");
 const login_1 = require("../../auth/login");
 const core_1 = require("@oclif/core");
-class UploadOptionSetsHierarchyLocalFile extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+class UploadOptionSetsHierarchyLocalFile extends basecommand_1.BaseCommand {
     async run() {
         const { args, flags } = await this.parse(UploadOptionSetsHierarchyLocalFile);
+        await super.setLogLevel(flags.logLevel);
         await uploadOptionSetsHierarchyLocalFile(args.file, args.name);
     }
 }
@@ -23,30 +26,33 @@ UploadOptionSetsHierarchyLocalFile.examples = [
 ];
 UploadOptionSetsHierarchyLocalFile.args = {
     file: core_1.Args.string({ description: 'File to parse', required: true }),
-    name: core_1.Args.string({ description: 'The name to be give to the option set hierarchy', required: true }),
+    name: core_1.Args.string({
+        description: 'The name to be give to the option set hierarchy',
+        required: true,
+    }),
 };
 async function uploadOptionSetsHierarchyLocalFile(fileLocation, name) {
     try {
         await (0, login_1.authUser)();
-        console.log('%s Importing local file', chalk_1.default.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
-        console.log('Using File: ', fileLocation);
-        console.log('Using Name: ', name);
+        logger_1.default.info('%s Importing local file', chalk_1.default.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
+        logger_1.default.info('Using File: ', fileLocation);
+        logger_1.default.info('Using Name: ', name);
         await uploadOptionSetHierarchiesLocalFile(fileLocation, name);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
+        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
     }
     catch (e) {
-        console.log(`%s UPLOAD Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s UPLOAD Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s UPLOAD Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s UPLOAD Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadOptionSetsHierarchyLocalFile = uploadOptionSetsHierarchyLocalFile;
 async function loadOptionSetHierarchyCSV(fileLocation) {
     const TARGET_DIR = process.cwd();
     try {
         const fullPath = path.resolve(path.join(TARGET_DIR, fileLocation));
-        console.log('Getting file from path: ', fullPath);
-        return await csv().fromFile(fullPath);
+        logger_1.default.info('Getting file from path: ', fullPath);
+        return await (0, csvtojson_1.default)().fromFile(fullPath);
     }
     catch (e) {
         throw new Error(`ERROR PARSING CSV: ${e}`);
@@ -58,7 +64,7 @@ async function parseOptionSetHierarchiesLocalFile(fileLocation) {
         hierarchy: [],
         maxDepth: 0,
         name: 'No Name',
-        options: []
+        options: [],
     };
     if (!((uploadedOptionHierarchyData === null || uploadedOptionHierarchyData === void 0 ? void 0 : uploadedOptionHierarchyData.length) > 0)) {
         return optionSetHierarchy;
@@ -69,7 +75,8 @@ async function parseOptionSetHierarchiesLocalFile(fileLocation) {
     });
     const currentOptionSetsByName = {};
     for (const currentOptionSet of currentOptionSets) {
-        currentOptionSetsByName[util_1.StringUtil.convertToCamelCase(currentOptionSet.name)] = currentOptionSet;
+        currentOptionSetsByName[util_1.StringUtil.convertToCamelCase(currentOptionSet.name)] =
+            currentOptionSet;
     }
     const optionSetIds = [];
     for (const key of keysInOrder) {
@@ -93,9 +100,9 @@ async function uploadOptionSetHierarchiesLocalFile(fileLocation, name) {
     const currentOptionSetHierarchies = await new sdk_1.Entities().get({
         entityName: 'option-set-hierarchy',
     });
-    const existing = currentOptionSetHierarchies.find(osh => osh.name === name);
+    const existing = currentOptionSetHierarchies.find((osh) => osh.name === name);
     if (existing) {
-        console.log('Updating: ', optionSetHierarchy.name);
+        logger_1.default.info('Updating: ', optionSetHierarchy.name);
         await new sdk_1.Entities().update({
             entityName: 'option-set-hierarchy',
             id: existing.id,
@@ -103,7 +110,7 @@ async function uploadOptionSetHierarchiesLocalFile(fileLocation, name) {
         });
     }
     else {
-        console.log('Creating: ', optionSetHierarchy.name);
+        logger_1.default.info('Creating: ', optionSetHierarchy.name);
         await new sdk_1.Entities().create({
             entityName: 'option-set-hierarchy',
             object: optionSetHierarchy,
@@ -113,15 +120,15 @@ async function uploadOptionSetHierarchiesLocalFile(fileLocation, name) {
 function addRowToOptions(optionSetHierarchy, keysInOrder, row) {
     let options = optionSetHierarchy.options;
     for (let i = 0; i < keysInOrder.length; i++) {
-        const optionValues = options.map(op => op.value);
+        const optionValues = options.map((op) => op.value);
         const value = row[keysInOrder[i]];
         if (!optionValues.includes(value)) {
-            const obj = i === (keysInOrder.length - 1) ? { value: value } : { value: value, options: [] };
+            const obj = i === keysInOrder.length - 1 ? { value: value } : { value: value, options: [] };
             options.push(obj);
             options = obj.options;
         }
         else {
-            const optionObj = options.find(op => op.value === value);
+            const optionObj = options.find((op) => op.value === value);
             options = optionObj.options;
         }
     }

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class UploadRuleSets extends Command {
+import { BaseCommand } from '../basecommand';
+export default class UploadRuleSets extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/types/uploadRuleSets.js

@@ -8,10 +8,13 @@ const path = tslib_1.__importStar(require("path"));
 const login_1 = require("../../auth/login");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
-const yaml = require('js-yaml');
-class UploadRuleSets extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+class UploadRuleSets extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(UploadRuleSets);
+        await super.setLogLevel(flags.logLevel);
         await uploadRuleSets(flags.dir);
     }
 }
@@ -22,22 +25,27 @@ UploadRuleSets.examples = [
 `,
 ];
 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: '.' }),
+    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'));
+        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('RULE SET'));
         const [reducedRuleSets, reducedRuleSetLinks] = await loadReducedRuleSets(dir);
         await uploadRuleSetObjects(reducedRuleSets);
         await uploadRuleSetLinkObjects(reducedRuleSetLinks);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('RULE SET'));
+        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('RULE SET'));
     }
     catch (e) {
-        console.log(`%s Rule Set Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Rule Set Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s Rule set Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Rule set Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadRuleSets = uploadRuleSets;
 function loadReducedRuleSets(fromDir) {
@@ -47,9 +55,9 @@ function loadReducedRuleSets(fromDir) {
     try {
         const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
-            ruleSets.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
+            ruleSets.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        ruleSetLinks = yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'rule-set-links.yml'), 'utf8'));
+        ruleSetLinks = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'rule-set-links.yml'), 'utf8'));
         return [ruleSets, ruleSetLinks];
     }
     catch (e) {
@@ -68,20 +76,20 @@ async function uploadRuleSetObjects(reducedRuleSets) {
     for (const loadedRuleSet of reducedRuleSets) {
         loadedRuleSetsByName[loadedRuleSet.name] = loadedRuleSet;
     }
-    console.debug('current rule sets:', currentRuleSets);
-    console.debug('reduced rule sets:', reducedRuleSets);
+    logger_1.default.debug('current rule sets:', currentRuleSets);
+    logger_1.default.debug('reduced rule sets:', reducedRuleSets);
     for (const reducedRuleSet of reducedRuleSets) {
         try {
             const found = currentRuleSetsByName[reducedRuleSet.name];
             if (!found) {
-                console.log('Creating: ', reducedRuleSet.name);
+                logger_1.default.info('Creating: ', reducedRuleSet.name);
                 await new sdk_1.Entities().create({
                     entityName: 'type-rule-set',
-                    object: reducedRuleSet
+                    object: reducedRuleSet,
                 });
             }
             else {
-                console.log('Updating: ', reducedRuleSet.name);
+                logger_1.default.info('Updating: ', reducedRuleSet.name);
                 await new sdk_1.Entities().update({
                     entityName: 'type-rule-set',
                     id: found.id,
@@ -97,7 +105,7 @@ async function uploadRuleSetObjects(reducedRuleSets) {
         try {
             const found = loadedRuleSetsByName[currentRuleSet.name];
             if (!found) {
-                console.log('Deleting: ', currentRuleSet.name);
+                logger_1.default.info('Deleting: ', currentRuleSet.name);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-rule-set',
                     id: currentRuleSet.id,
@@ -121,8 +129,8 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
     });
     const currentLinksHashes = {};
     for (const currentLink of currentRuleSetLinks) {
-        const foundType = types.find(t => t.id === currentLink.typeId);
-        const foundRuleSet = currentRuleSets.find(rs => rs.id === currentLink.typeRuleSetId);
+        const foundType = types.find((t) => t.id === currentLink.typeId);
+        const foundRuleSet = currentRuleSets.find((rs) => rs.id === currentLink.typeRuleSetId);
         const hash = `${foundType.slug}|${foundRuleSet.name}`;
         currentLinksHashes[hash] = currentLink;
     }
@@ -131,8 +139,8 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
         const hash = `${loadedLink.type}|${loadedLink.ruleSet}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
-    // console.debug('reduced rule set links:', reducedLinksByHashes);
-    // console.debug('current rule set links:', currentLinksHashes);
+    // logger.debug('reduced rule set links:', reducedLinksByHashes);
+    // logger.debug('current rule set links:', currentLinksHashes);
     for (const loadedRuleSetLink of loadedRuleSetLinks) {
         try {
             const found = currentLinksHashes[`${loadedRuleSetLink.type}|${loadedRuleSetLink.ruleSet}`];
@@ -140,7 +148,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
                 if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
                     continue;
                 }
-                console.log('Creating: ', loadedRuleSetLink);
+                logger_1.default.info('Creating: ', loadedRuleSetLink);
                 await new sdk_1.Entities().create({
                     entityName: 'type-rule-set-link',
                     object: {
@@ -153,7 +161,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
                 if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
                     continue;
                 }
-                console.log('skipping updating existing rule set link: ', loadedRuleSetLink);
+                logger_1.default.info('skipping updating existing rule set link: ', loadedRuleSetLink);
             }
         }
         catch (err) {
@@ -164,7 +172,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
         try {
             const found = reducedLinksByHashes[currentLinkHash];
             if (!found) {
-                console.log('Deleting: ', currentLinkHash);
+                logger_1.default.info('Deleting: ', currentLinkHash);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-rule-set-link',
                     id: currentLink['id'],
@@ -177,15 +185,15 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
     }
 }
 function transformReducedLink(ruleSetLink, types, ruleSets) {
-    const foundType = types.find(t => t.slug === ruleSetLink.type);
+    const foundType = types.find((t) => t.slug === ruleSetLink.type);
     if (!foundType) {
-        console.error('Could not find type with name', ruleSetLink.type);
+        logger_1.default.error('Could not find type with name', ruleSetLink.type);
         return false;
     }
     ruleSetLink.type = foundType.id;
-    const foundRuleSet = ruleSets.find(rs => rs.name === ruleSetLink.ruleSet);
+    const foundRuleSet = ruleSets.find((rs) => rs.name === ruleSetLink.ruleSet);
     if (!foundRuleSet) {
-        console.error('Could not find rule set with name', foundType.ruleSet);
+        logger_1.default.error('Could not find rule set with name', foundType.ruleSet);
         return false;
     }
     ruleSetLink.ruleSet = foundRuleSet.id;

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class UploadTypePolicies extends Command {
+import { BaseCommand } from '../basecommand';
+export default class UploadTypePolicies extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {