@contrail/cli 2.1.20 → 2.1.22

package/dist/commands/types/uploadTypePolicies.js

@@ -10,10 +10,13 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
 const type_extractor_1 = require("../../helpers/types/type-extractor");
 const users_1 = require("../../api/users");
-const yaml = require('js-yaml');
-class UploadTypePolicies 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 UploadTypePolicies extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(UploadTypePolicies);
+        await super.setLogLevel(flags.logLevel);
         return await uploadTypePolicies(flags.dir);
     }
 }
@@ -24,22 +27,27 @@ UploadTypePolicies.examples = [
 `,
 ];
 UploadTypePolicies.flags = {
-    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the type policy data. Defaults to the current directory. The type policy data will be loaded from $dir/type-policies/*.yml', required: false, default: '.' }),
+    dir: core_1.Flags.string({
+        char: 'd',
+        description: 'The directory from which to export the type policy data. Defaults to the current directory. The type policy data will be loaded from $dir/type-policies/*.yml',
+        required: false,
+        default: '.',
+    }),
 };
 async function uploadTypePolicies(dir) {
     try {
         await (0, login_1.authUser)();
-        console.log('%s Uploading', chalk_1.default.yellow.bold('TYPE POLICY'));
+        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('TYPE POLICY'));
         const [reducedTypePolicies, reducedTypePolicyLinks] = await loadTypePolicies(dir);
         await uploadTypePolicyObjects(reducedTypePolicies);
         await uploadTypePolicyLinks(reducedTypePolicyLinks);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('TYPE POLICY'));
+        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('TYPE POLICY'));
     }
     catch (e) {
-        console.log(`%s Type Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Type Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s Type Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Type Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadTypePolicies = uploadTypePolicies;
 function loadTypePolicies(fromDir) {
@@ -49,9 +57,9 @@ function loadTypePolicies(fromDir) {
     try {
         const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
-            tps.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
+            tps.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        tpLinks = yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'type-policy-links.yml'), 'utf8'));
+        tpLinks = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-policy-links.yml'), 'utf8'));
         return [tps, tpLinks];
     }
     catch (e) {
@@ -64,27 +72,27 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
     function fillPrincipal(statement) {
         const principal = statement === null || statement === void 0 ? void 0 : statement.principal;
         if (!principal) {
-            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            logger_1.default.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
             return statement;
         }
         const [type, identifier] = principal.split(':');
         if (!type || !identifier) {
-            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            logger_1.default.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
             return statement;
         }
         if (type === 'group') {
-            const group = groups.find(x => x.name === identifier);
+            const group = groups.find((x) => x.name === identifier);
             if (!group) {
-                console.log(`Could not find group ${identifier}`);
+                logger_1.default.info(`Could not find group ${identifier}`);
             }
             else {
                 statement.principal = `group:${group.id}`;
             }
         }
         else if (type === 'user') {
-            const orgUser = orgUsers.find(x => x.user.email === identifier);
+            const orgUser = orgUsers.find((x) => x.user.email === identifier);
             if (!orgUser) {
-                console.log(`Could not find user ${identifier}`);
+                logger_1.default.info(`Could not find user ${identifier}`);
             }
             else {
                 statement.principal = `user:${orgUser.user.id}`;
@@ -92,8 +100,8 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
         }
         return statement;
     }
-    reducedTypePolicies.forEach(policy => {
-        policy.policy.statements = policy.policy.statements.map(x => fillPrincipal(x));
+    reducedTypePolicies.forEach((policy) => {
+        policy.policy.statements = policy.policy.statements.map((x) => fillPrincipal(x));
     });
     const currentTypePolicies = await new sdk_1.Entities().get({
         entityName: 'type-policy',
@@ -110,14 +118,14 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
         try {
             const found = currentTypePolicyByLabel[label];
             if (!found) {
-                console.log('Creating: ', label);
+                logger_1.default.info('Creating: ', label);
                 await new sdk_1.Entities().create({
                     entityName: 'type-policy',
-                    object: loadedTPP
+                    object: loadedTPP,
                 });
             }
             else {
-                console.log('Updating: ', label);
+                logger_1.default.info('Updating: ', label);
                 await new sdk_1.Entities().update({
                     entityName: 'type-policy',
                     id: found.id,
@@ -133,7 +141,7 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
         try {
             const found = loadedTypePolicyByName[label];
             if (!found) {
-                console.log('Deleting: ', label);
+                logger_1.default.info('Deleting: ', label);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-policy',
                     id: currentTPP['id'],
@@ -155,10 +163,10 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
     });
     const currentLinksHashes = {};
     for (const currentLink of currentTypePolicyLinks) {
-        const foundType = types.find(type => type.id === currentLink.typeId);
-        const foundTypePolicy = currentTypePolicies.find(tp => tp.id === currentLink.typePolicyId);
+        const foundType = types.find((type) => type.id === currentLink.typeId);
+        const foundTypePolicy = currentTypePolicies.find((tp) => tp.id === currentLink.typePolicyId);
         if (!foundType || !foundTypePolicy) {
-            console.log('skipping unhashable, invalid policy link:', currentLink);
+            logger_1.default.info('skipping unhashable, invalid policy link:', currentLink);
         }
         const hash = `${foundType.slug}|${foundTypePolicy.label}`;
         currentLinksHashes[hash] = currentLink;
@@ -197,7 +205,7 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
         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-policy-link',
                     id: currentLink['id'],
@@ -210,15 +218,15 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
     }
 }
 function transformReducedLink(typePolicyLink, types, typePolicies) {
-    const foundType = types.find(type => type.slug === typePolicyLink.typeSlug);
+    const foundType = types.find((type) => type.slug === typePolicyLink.typeSlug);
     if (!foundType) {
-        console.error('Could not find type with slug', typePolicyLink.typeSlug);
+        logger_1.default.error('Could not find type with slug', typePolicyLink.typeSlug);
         return false;
     }
     typePolicyLink.typeId = foundType.id;
-    const foundTypePolicy = typePolicies.find(tpp => tpp.label === typePolicyLink.typePolicyLabel);
+    const foundTypePolicy = typePolicies.find((tpp) => tpp.label === typePolicyLink.typePolicyLabel);
     if (!foundTypePolicy) {
-        console.error('Could not find type policy with label', typePolicyLink.typePolicyLabel);
+        logger_1.default.error('Could not find type policy with label', typePolicyLink.typePolicyLabel);
         return false;
     }
     typePolicyLink.typePolicyId = foundTypePolicy.id;

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

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

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -10,10 +10,13 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
 const type_extractor_1 = require("../../helpers/types/type-extractor");
 const users_1 = require("../../api/users");
-const yaml = require('js-yaml');
-class UploadTypePropertyPolicies 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 UploadTypePropertyPolicies extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(UploadTypePropertyPolicies);
+        await super.setLogLevel(flags.logLevel);
         return await uploadTypePropertyPolicies(flags.dir);
     }
 }
@@ -24,24 +27,29 @@ UploadTypePropertyPolicies.examples = [
 `,
 ];
 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: '.' }),
+    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'));
+        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('TYPE PROPERTY POLICY'));
         const [reducedTypePropertyPolicies, reducedTypePropertyPolicyLinks] = await loadTPPolicies(dir);
         await uploadTPPolicyObjects(reducedTypePropertyPolicies);
         await uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('TYPE PROPERTY POLICY'));
+        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('TYPE PROPERTY POLICY'));
     }
     catch (e) {
-        console.log(`%s Type Property Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Type Property Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         //TODO make this only print if a debug flag is set
         console.trace(e);
         return;
     }
-    console.log('%s Type Property Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Type Property Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadTypePropertyPolicies = uploadTypePropertyPolicies;
 function loadTPPolicies(fromDir) {
@@ -51,9 +59,9 @@ function loadTPPolicies(fromDir) {
     try {
         const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
-            tpps.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
+            tpps.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        tppLinks = yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'type-property-policy-links.yml'), 'utf8'));
+        tppLinks = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-property-policy-links.yml'), 'utf8'));
         return [tpps, tppLinks];
     }
     catch (e) {
@@ -66,27 +74,27 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
     function fillPrincipal(statement) {
         const principal = statement === null || statement === void 0 ? void 0 : statement.principal;
         if (!principal) {
-            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            logger_1.default.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
             return statement;
         }
         const [type, identifier] = principal.split(':');
         if (!type || !identifier) {
-            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            logger_1.default.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
             return statement;
         }
         if (type === 'group') {
-            const group = groups.find(x => x.name === identifier);
+            const group = groups.find((x) => x.name === identifier);
             if (!group) {
-                console.log(`Could not find group ${identifier}`);
+                logger_1.default.info(`Could not find group ${identifier}`);
             }
             else {
                 statement.principal = `group:${group.id}`;
             }
         }
         else if (type === 'user') {
-            const orgUser = orgUsers.find(x => x.user.email === identifier);
+            const orgUser = orgUsers.find((x) => x.user.email === identifier);
             if (!orgUser) {
-                console.log(`Could not find user ${identifier}`);
+                logger_1.default.info(`Could not find user ${identifier}`);
             }
             else {
                 statement.principal = `user:${orgUser.user.id}`;
@@ -94,8 +102,8 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
         }
         return statement;
     }
-    reducedTypePropertyPolicies.forEach(policy => {
-        policy.policy.statements = policy.policy.statements.map(x => fillPrincipal(x));
+    reducedTypePropertyPolicies.forEach((policy) => {
+        policy.policy.statements = policy.policy.statements.map((x) => fillPrincipal(x));
     });
     const currentTPPolicies = await new sdk_1.Entities().get({
         entityName: 'type-property-policy',
@@ -112,14 +120,14 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
         try {
             const found = currentTPPByLabel[label];
             if (!found) {
-                console.log('Creating: ', label);
+                logger_1.default.info('Creating: ', label);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-policy',
-                    object: loadedTPP
+                    object: loadedTPP,
                 });
             }
             else {
-                console.log('Updating: ', label);
+                logger_1.default.info('Updating: ', label);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-policy',
                     id: found.id,
@@ -135,7 +143,7 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
         try {
             const found = loadedTPPByName[label];
             if (!found) {
-                console.log('Deleting: ', label);
+                logger_1.default.info('Deleting: ', label);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-policy',
                     id: currentTPP['id'],
@@ -150,7 +158,7 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
 async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
     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;
@@ -167,10 +175,10 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
     });
     const currentLinksHashes = {};
     for (const currentLink of currentTPPLinks) {
-        const foundTypeProperty = typeProperties.find(tp => tp.id === currentLink.typePropertyId);
-        const foundTPP = currentTPPs.find(tpp => tpp.id === currentLink.typePropertyPolicyId);
+        const foundTypeProperty = typeProperties.find((tp) => tp.id === currentLink.typePropertyId);
+        const foundTPP = currentTPPs.find((tpp) => tpp.id === currentLink.typePropertyPolicyId);
         if (!foundTypeProperty || !foundTPP) {
-            console.log('skipping unhashable, invalid policy link:', currentLink);
+            logger_1.default.info('skipping unhashable, invalid policy link:', currentLink);
         }
         const hash = `${foundTypeProperty.typeSlug}${foundTypeProperty.slug}|${foundTPP.label}`;
         currentLinksHashes[hash] = currentLink;
@@ -209,7 +217,7 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
         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-property-policy-link',
                     id: currentLink['id'],
@@ -222,15 +230,15 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
     }
 }
 function transformReducedLink(TPPLink, typeProperties, typePropertyPolicies) {
-    const foundTP = typeProperties.find(tp => tp.slug === TPPLink.typePropertySlug && tp.typeSlug === TPPLink.typeSlug);
+    const foundTP = typeProperties.find((tp) => tp.slug === TPPLink.typePropertySlug && tp.typeSlug === TPPLink.typeSlug);
     if (!foundTP) {
-        console.error('Could not find type property with label', TPPLink.typePropertySlug);
+        logger_1.default.error('Could not find type property with label', TPPLink.typePropertySlug);
         return false;
     }
     TPPLink.typePropertyId = foundTP.id;
-    const foundTPP = typePropertyPolicies.find(tpp => tpp.label === TPPLink.typePropertyPolicyLabel);
+    const foundTPP = typePropertyPolicies.find((tpp) => tpp.label === TPPLink.typePropertyPolicyLabel);
     if (!foundTPP) {
-        console.error('Could not find type property policy with label', TPPLink.typePropertyPolicyLabel);
+        logger_1.default.error('Could not find type property policy with label', TPPLink.typePropertyPolicyLabel);
         return false;
     }
     TPPLink.typePropertyPolicyId = foundTPP.id;

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

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

package/dist/commands/types/uploadTypes.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadTypes = void 0;
 const type_uploader_1 = require("../../helpers/types/type-uploader");
 const core_1 = require("@oclif/core");
-const yaml = require('js-yaml');
-class UploadTypes extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+class UploadTypes extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(UploadTypes);
+        await super.setLogLevel(flags.logLevel);
         return await uploadTypes(flags.dir);
     }
 }
@@ -17,9 +18,14 @@ UploadTypes.examples = [
 `,
 ];
 UploadTypes.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/types', 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/types',
+        required: false,
+        default: '.',
+    }),
 };
 async function uploadTypes(dir) {
-    (0, type_uploader_1.uploadTypes)(dir);
+    await (0, type_uploader_1.uploadTypes)(dir);
 }
 exports.uploadTypes = uploadTypes;

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

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

package/dist/commands/types/uploadUsageInfo.js

@@ -9,10 +9,13 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const path = tslib_1.__importStar(require("path"));
 const core_1 = require("@oclif/core");
 const type_extractor_1 = require("../../helpers/types/type-extractor");
-const yaml = require('js-yaml');
-class UploadUsageInfo 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 UploadUsageInfo extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(UploadUsageInfo);
+        await super.setLogLevel(flags.logLevel);
         await uploadUsageInfo(flags.dir);
     }
 }
@@ -23,26 +26,31 @@ UploadUsageInfo.examples = [
 `,
 ];
 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: '.' }),
+    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'));
+        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('USAGE INFO'));
         const reducedUsageInfo = await loadUsageInfo(dir);
         await uploadUsageInfoObjects(reducedUsageInfo);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('USAGE INFO'));
+        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('USAGE INFO'));
     }
     catch (e) {
-        console.log(`%s Usage Info Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Usage Info Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s Usage Info Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Usage Info Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.uploadUsageInfo = uploadUsageInfo;
 function loadUsageInfo(dir) {
     try {
-        const doc = yaml.load(fs_1.default.readFileSync(path.join(dir, 'usage-info.yml'), 'utf8'));
+        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, 'usage-info.yml'), 'utf8'));
         return doc;
     }
     catch (e) {
@@ -52,18 +60,18 @@ function loadUsageInfo(dir) {
 async function uploadUsageInfoObjects(loadedUsageInfo) {
     const typesWithProperties = await (0, type_extractor_1.getTypes)();
     const typeProperties = typesWithProperties
-        .filter(t => !!t.typeProperties)
-        .map(t => t.typeProperties)
+        .filter((t) => !!t.typeProperties)
+        .map((t) => t.typeProperties)
         .reduce((a, b) => a.concat(b));
     const currentUsageInfo = await new sdk_1.Entities().get({
         entityName: 'type-property-usage-info',
     });
     const currentUsageInfosHashes = {};
     for (const currentUI of currentUsageInfo) {
-        const foundType = typesWithProperties.find(t => t.id === currentUI.typeId);
-        const foundTypeProperty = typeProperties.find(tp => tp.id === currentUI.typePropertyId);
+        const foundType = typesWithProperties.find((t) => t.id === currentUI.typeId);
+        const foundTypeProperty = typeProperties.find((tp) => tp.id === currentUI.typePropertyId);
         if (!foundType || !foundTypeProperty) {
-            console.log('skipping unhashable, invalid usage info:', currentUI);
+            logger_1.default.info('skipping unhashable, invalid usage info:', currentUI);
             continue;
         }
         const hash = `${foundType.slug}|${foundTypeProperty.slug}`;
@@ -74,8 +82,8 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
         const hash = `${loadedUI.typeSlug}|${loadedUI.typePropertySlug}`;
         reducedUsageInfoHashes[hash] = loadedUI;
     }
-    console.debug('current usage info:', currentUsageInfo);
-    console.debug('loaded usage info:', loadedUsageInfo);
+    logger_1.default.debug('current usage info:', currentUsageInfo);
+    logger_1.default.debug('loaded usage info:', loadedUsageInfo);
     for (const loadedUI of loadedUsageInfo) {
         try {
             const found = currentUsageInfosHashes[`${loadedUI.typeSlug}|${loadedUI.typePropertySlug}`];
@@ -83,7 +91,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
                 if (!transformReducedUI(loadedUI, typesWithProperties, typeProperties)) {
                     continue;
                 }
-                console.debug('Creating: ', loadedUI);
+                logger_1.default.debug('Creating: ', loadedUI);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-usage-info',
                     object: {
@@ -96,21 +104,21 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
                         numberFormat: loadedUI.numberFormat,
                         defaultValue: loadedUI.defaultValue,
                         label: loadedUI.label,
-                    }
+                    },
                 });
             }
             else {
                 if (!transformReducedUI(loadedUI, typesWithProperties, typeProperties)) {
                     continue;
                 }
-                console.log('Updating: ', loadedUI);
+                logger_1.default.info('Updating: ', loadedUI);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-usage-info',
                     id: found.id,
                     object: {
                         editable: loadedUI.editable,
                         used: loadedUI.used,
-                    }
+                    },
                 });
             }
         }
@@ -122,7 +130,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
         try {
             const found = reducedUsageInfoHashes[hash];
             if (!found) {
-                console.debug('Deleting: ', hash);
+                logger_1.default.debug('Deleting: ', hash);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-usage-info',
                     id: currentUI['id'],
@@ -136,15 +144,15 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
 }
 // transforms the reduced Usage Info from name slugs to ids
 function transformReducedUI(reducedUsageInfo, types, typeProperties) {
-    const foundType = types.find(t => t.slug === reducedUsageInfo.typeSlug);
+    const foundType = types.find((t) => t.slug === reducedUsageInfo.typeSlug);
     if (!foundType) {
-        console.error('Could not find type with slug', reducedUsageInfo.typeSlug, 'while transforming', reducedUsageInfo);
+        logger_1.default.error('Could not find type with slug', reducedUsageInfo.typeSlug, 'while transforming', reducedUsageInfo);
         return false;
     }
     reducedUsageInfo.typeId = foundType.id;
-    const foundTypeProperty = typeProperties.find(tp => tp.slug === reducedUsageInfo.typePropertySlug);
+    const foundTypeProperty = typeProperties.find((tp) => tp.slug === reducedUsageInfo.typePropertySlug);
     if (!foundTypeProperty) {
-        console.error('Could not find type property with slug', reducedUsageInfo.typePropertySlug, 'while transforming', reducedUsageInfo);
+        logger_1.default.error('Could not find type property with slug', reducedUsageInfo.typePropertySlug, 'while transforming', reducedUsageInfo);
         return false;
     }
     reducedUsageInfo.typePropertyId = foundTypeProperty.id;

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

@@ -1,6 +1,6 @@
-import { Command } from '@oclif/core';
+import { BaseCommand } from '../basecommand';
 export declare const DEFAULT_FILE_LOCATION = "users.yml";
-export default class ExportUsers extends Command {
+export default class ExportUsers extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/users/export.js

@@ -10,11 +10,13 @@ const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const users_1 = require("../../api/users");
+const basecommand_1 = require("../basecommand");
 exports.DEFAULT_FILE_LOCATION = 'users.yml';
-class ExportUsers extends core_1.Command {
+class ExportUsers extends basecommand_1.BaseCommand {
     async run() {
         var _a;
         const { flags } = await this.parse(ExportUsers);
+        await super.setLogLevel(flags.logLevel);
         try {
             await (0, login_1.authUser)();
             this.log('%s Getting Users.', chalk_1.default.blue.bold('START'));
@@ -35,8 +37,17 @@ ExportUsers.examples = [
 `,
 ];
 ExportUsers.flags = {
-    outFile: core_1.Flags.string({ char: 'f', 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 })
+    outFile: core_1.Flags.string({
+        char: 'f',
+        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 exportUsers(fileLocation, overwrite) {
     const allUsersInOrg = await (0, users_1.getUserOrgs)();
@@ -50,7 +61,7 @@ async function exportUsers(fileLocation, overwrite) {
         }
         users.push({
             role: userInOrg.role,
-            ...userInOrg.user
+            ...userInOrg.user,
         });
     }
     users = users.sort((one, two) => (one.email < two.email ? -1 : 1));

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

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