@contrail/cli 2.1.28 → 2.2.2

package/dist/commands/types/uploadOptionSetsHierarchyLocalFile.js

@@ -37,13 +37,13 @@ async function uploadOptionSetsHierarchyLocalFile(fileLocation, name) {
         logger_1.default.info('Using File: ', fileLocation);
         logger_1.default.info('Using Name: ', name);
         await uploadOptionSetHierarchiesLocalFile(fileLocation, name);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SET HIERARCHY UPLOAD')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s UPLOAD Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} UPLOAD Failed . ${e}`);
         return;
     }
-    logger_1.default.info('%s UPLOAD Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} UPLOAD Complete.`);
 }
 exports.uploadOptionSetsHierarchyLocalFile = uploadOptionSetsHierarchyLocalFile;
 async function loadOptionSetHierarchyCSV(fileLocation) {
@@ -101,7 +101,7 @@ async function uploadOptionSetHierarchiesLocalFile(fileLocation, name) {
     });
     const existing = currentOptionSetHierarchies.find((osh) => osh.name === name);
     if (existing) {
-        logger_1.default.info('Updating: ', optionSetHierarchy.name);
+        logger_1.default.info(`Updating:  ${optionSetHierarchy.name}`);
         await new sdk_1.Entities().update({
             entityName: 'option-set-hierarchy',
             id: existing.id,
@@ -109,7 +109,7 @@ async function uploadOptionSetHierarchiesLocalFile(fileLocation, name) {
         });
     }
     else {
-        logger_1.default.info('Creating: ', optionSetHierarchy.name);
+        logger_1.default.info(`Creating:  ${optionSetHierarchy.name}`);
         await new sdk_1.Entities().create({
             entityName: 'option-set-hierarchy',
             object: optionSetHierarchy,

package/dist/commands/types/uploadRuleSets.js

@@ -34,17 +34,17 @@ UploadRuleSets.flags = {
 async function uploadRuleSets(dir) {
     try {
         await (0, login_1.authUser)();
-        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('RULE SET'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('RULE SET')} Uploading`);
         const [reducedRuleSets, reducedRuleSetLinks] = await loadReducedRuleSets(dir);
         await uploadRuleSetObjects(reducedRuleSets);
         await uploadRuleSetLinkObjects(reducedRuleSetLinks);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('RULE SET'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('RULE SET')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s Rule Set Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Rule Set Upload Failed. ${e}`);
         return;
     }
-    logger_1.default.info('%s Rule set Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Rule set Upload Complete.`);
 }
 exports.uploadRuleSets = uploadRuleSets;
 function loadReducedRuleSets(fromDir) {
@@ -67,28 +67,28 @@ async function uploadRuleSetObjects(reducedRuleSets) {
     const currentRuleSets = await new sdk_1.Entities().get({
         entityName: 'type-rule-set',
     });
-    const currentRuleSetsByName = {};
+    const currentRuleSetsByIdentifier = {};
     for (const currentRuleSet of currentRuleSets) {
-        currentRuleSetsByName[currentRuleSet.name] = currentRuleSet;
+        currentRuleSetsByIdentifier[currentRuleSet.identifier] = currentRuleSet;
     }
-    const loadedRuleSetsByName = {};
+    const loadedRuleSetsByIdentifier = {};
     for (const loadedRuleSet of reducedRuleSets) {
-        loadedRuleSetsByName[loadedRuleSet.name] = loadedRuleSet;
+        loadedRuleSetsByIdentifier[loadedRuleSet.identifier] = loadedRuleSet;
     }
-    logger_1.default.debug('current rule sets:', currentRuleSets);
-    logger_1.default.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];
+            const found = currentRuleSetsByIdentifier[reducedRuleSet.identifier];
             if (!found) {
-                logger_1.default.info('Creating: ', reducedRuleSet.name);
+                logger_1.default.info(`Creating: ${reducedRuleSet.identifier}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-rule-set',
                     object: reducedRuleSet,
                 });
             }
             else {
-                logger_1.default.info('Updating: ', reducedRuleSet.name);
+                logger_1.default.info(`Updating: ${reducedRuleSet.identifier}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-rule-set',
                     id: found.id,
@@ -102,9 +102,9 @@ async function uploadRuleSetObjects(reducedRuleSets) {
     }
     for (const currentRuleSet of currentRuleSets) {
         try {
-            const found = loadedRuleSetsByName[currentRuleSet.name];
+            const found = loadedRuleSetsByIdentifier[currentRuleSet.identifier];
             if (!found) {
-                logger_1.default.info('Deleting: ', currentRuleSet.name);
+                logger_1.default.info(`Deleting: ${currentRuleSet.identifier}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-rule-set',
                     id: currentRuleSet.id,
@@ -138,8 +138,6 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
         const hash = `${loadedLink.type}|${loadedLink.ruleSet}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
-    // 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}`];
@@ -147,7 +145,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
                 if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
                     continue;
                 }
-                logger_1.default.info('Creating: ', loadedRuleSetLink);
+                logger_1.default.info(`Creating: ${loadedRuleSetLink}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-rule-set-link',
                     object: {
@@ -160,7 +158,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
                 if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
                     continue;
                 }
-                logger_1.default.info('skipping updating existing rule set link: ', loadedRuleSetLink);
+                logger_1.default.info(`skipping updating existing rule set link: ${loadedRuleSetLink}`);
             }
         }
         catch (err) {
@@ -171,7 +169,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
         try {
             const found = reducedLinksByHashes[currentLinkHash];
             if (!found) {
-                logger_1.default.info('Deleting: ', currentLinkHash);
+                logger_1.default.info(`Deleting: ${currentLinkHash}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-rule-set-link',
                     id: currentLink['id'],
@@ -186,13 +184,13 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
 function transformReducedLink(ruleSetLink, types, ruleSets) {
     const foundType = types.find((t) => t.slug === ruleSetLink.type);
     if (!foundType) {
-        logger_1.default.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);
     if (!foundRuleSet) {
-        logger_1.default.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.js

@@ -36,17 +36,17 @@ UploadTypePolicies.flags = {
 async function uploadTypePolicies(dir) {
     try {
         await (0, login_1.authUser)();
-        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('TYPE POLICY'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE POLICY')} Uploading`);
         const [reducedTypePolicies, reducedTypePolicyLinks] = await loadTypePolicies(dir);
         await uploadTypePolicyObjects(reducedTypePolicies);
         await uploadTypePolicyLinks(reducedTypePolicyLinks);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('TYPE POLICY'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE POLICY')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s Type Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Type Policy Upload Failed . ${e}`);
         return;
     }
-    logger_1.default.info('%s Type Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Type Policy Upload Complete.`);
 }
 exports.uploadTypePolicies = uploadTypePolicies;
 function loadTypePolicies(fromDir) {
@@ -105,26 +105,26 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
     const currentTypePolicies = await new sdk_1.Entities().get({
         entityName: 'type-policy',
     });
-    const currentTypePolicyByLabel = {};
+    const currentTypePolicyByIdentifier = {};
     for (const currentTypePolicy of currentTypePolicies) {
-        currentTypePolicyByLabel[currentTypePolicy.label] = currentTypePolicy;
+        currentTypePolicyByIdentifier[currentTypePolicy.identifier] = currentTypePolicy;
     }
-    const loadedTypePolicyByName = {};
+    const loadedTypePolicyByIdentifier = {};
     for (const loadedTPP of reducedTypePolicies) {
-        loadedTypePolicyByName[loadedTPP.label] = loadedTPP;
+        loadedTypePolicyByIdentifier[loadedTPP.identifier] = loadedTPP;
     }
-    for (const [label, loadedTPP] of Object.entries(loadedTypePolicyByName)) {
+    for (const [identifier, loadedTPP] of Object.entries(loadedTypePolicyByIdentifier)) {
         try {
-            const found = currentTypePolicyByLabel[label];
+            const found = currentTypePolicyByIdentifier[identifier];
             if (!found) {
-                logger_1.default.info('Creating: ', label);
+                logger_1.default.info(`Creating:  ${identifier}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-policy',
                     object: loadedTPP,
                 });
             }
             else {
-                logger_1.default.info('Updating: ', label);
+                logger_1.default.info(`Updating:  ${identifier}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-policy',
                     id: found.id,
@@ -136,11 +136,11 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
             throw new Error(`Error Uploading Type Policy: ${err}`);
         }
     }
-    for (const [label, currentTPP] of Object.entries(currentTypePolicyByLabel)) {
+    for (const [identifier, currentTPP] of Object.entries(currentTypePolicyByIdentifier)) {
         try {
-            const found = loadedTypePolicyByName[label];
+            const found = loadedTypePolicyByIdentifier[identifier];
             if (!found) {
-                logger_1.default.info('Deleting: ', label);
+                logger_1.default.info(`Deleting:  ${identifier}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-policy',
                     id: currentTPP['id'],
@@ -165,19 +165,19 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
         const foundType = types.find((type) => type.id === currentLink.typeId);
         const foundTypePolicy = currentTypePolicies.find((tp) => tp.id === currentLink.typePolicyId);
         if (!foundType || !foundTypePolicy) {
-            logger_1.default.info('skipping unhashable, invalid policy link:', currentLink);
+            logger_1.default.info(`skipping unhashable, invalid policy link: ${currentLink}`);
         }
-        const hash = `${foundType.slug}|${foundTypePolicy.label}`;
+        const hash = `${foundType.slug}|${foundTypePolicy.identifier}`;
         currentLinksHashes[hash] = currentLink;
     }
     const reducedLinksByHashes = {};
     for (const loadedLink of reducedTypePolicyLinks) {
-        const hash = `${loadedLink.typeSlug}|${loadedLink.typePolicyLabel}`;
+        const hash = `${loadedLink.typeSlug}|${loadedLink.typePolicyIdentifier}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
     for (const loadedTPLink of reducedTypePolicyLinks) {
         try {
-            const found = currentLinksHashes[`${loadedTPLink.typeSlug}|${loadedTPLink.typePolicyLabel}`];
+            const found = currentLinksHashes[`${loadedTPLink.typeSlug}|${loadedTPLink.typePolicyIdentifier}`];
             if (!found) {
                 if (!transformReducedLink(loadedTPLink, types, currentTypePolicies)) {
                     continue;
@@ -204,7 +204,7 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
         try {
             const found = reducedLinksByHashes[currentLinkHash];
             if (!found) {
-                logger_1.default.info('Deleting: ', currentLinkHash);
+                logger_1.default.info(`Deleting:  ${currentLinkHash}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-policy-link',
                     id: currentLink['id'],
@@ -219,13 +219,13 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
 function transformReducedLink(typePolicyLink, types, typePolicies) {
     const foundType = types.find((type) => type.slug === typePolicyLink.typeSlug);
     if (!foundType) {
-        logger_1.default.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.identifier === typePolicyLink.typePolicyIdentifier);
     if (!foundTypePolicy) {
-        logger_1.default.error('Could not find type policy with label', typePolicyLink.typePolicyLabel);
+        logger_1.default.error(`Could not find type policy with identifier ${typePolicyLink.typePolicyIdentifier}`);
         return false;
     }
     typePolicyLink.typePolicyId = foundTypePolicy.id;

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -40,15 +40,15 @@ async function uploadTypePropertyPolicies(dir) {
         const [reducedTypePropertyPolicies, reducedTypePropertyPolicyLinks] = await loadTPPolicies(dir);
         await uploadTPPolicyObjects(reducedTypePropertyPolicies);
         await uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('TYPE PROPERTY POLICY'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE PROPERTY POLICY')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s Type Property Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Type Property Policy Upload Failed . ${e}`);
         //TODO make this only print if a debug flag is set
         console.trace(e);
         return;
     }
-    logger_1.default.info('%s Type Property Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Type Property Policy Upload Complete.`);
 }
 exports.uploadTypePropertyPolicies = uploadTypePropertyPolicies;
 function loadTPPolicies(fromDir) {
@@ -119,14 +119,14 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
         try {
             const found = currentTPPByLabel[label];
             if (!found) {
-                logger_1.default.info('Creating: ', label);
+                logger_1.default.info(`Creating:  ${label}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-policy',
                     object: loadedTPP,
                 });
             }
             else {
-                logger_1.default.info('Updating: ', label);
+                logger_1.default.info(`Updating:  ${label}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-policy',
                     id: found.id,
@@ -142,7 +142,7 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
         try {
             const found = loadedTPPByName[label];
             if (!found) {
-                logger_1.default.info('Deleting: ', label);
+                logger_1.default.info(`Deleting:  ${label}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-policy',
                     id: currentTPP['id'],
@@ -177,19 +177,19 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
         const foundTypeProperty = typeProperties.find((tp) => tp.id === currentLink.typePropertyId);
         const foundTPP = currentTPPs.find((tpp) => tpp.id === currentLink.typePropertyPolicyId);
         if (!foundTypeProperty || !foundTPP) {
-            logger_1.default.info('skipping unhashable, invalid policy link:', currentLink);
+            logger_1.default.info(`skipping unhashable, invalid policy link: ${currentLink}`);
         }
-        const hash = `${foundTypeProperty.typeSlug}${foundTypeProperty.slug}|${foundTPP.label}`;
+        const hash = `${foundTypeProperty.typeSlug}${foundTypeProperty.slug}|${foundTPP.identifier}`;
         currentLinksHashes[hash] = currentLink;
     }
     const reducedLinksByHashes = {};
     for (const loadedLink of reducedTypePropertyPolicyLinks) {
-        const hash = `${loadedLink.typeSlug}|${loadedLink.typePropertySlug}|${loadedLink.typePropertyPolicyLabel}`;
+        const hash = `${loadedLink.typeSlug}|${loadedLink.typePropertySlug}|${loadedLink.typePropertyPolicyIdentifier}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
     for (const loadedTPPLink of reducedTypePropertyPolicyLinks) {
         try {
-            const found = currentLinksHashes[`${loadedTPPLink.typeSlug}|${loadedTPPLink.typePropertySlug}|${loadedTPPLink.typePropertyPolicyLabel}`];
+            const found = currentLinksHashes[`${loadedTPPLink.typeSlug}|${loadedTPPLink.typePropertySlug}|${loadedTPPLink.typePropertyPolicyIdentifier}`];
             if (!found) {
                 if (!transformReducedLink(loadedTPPLink, typeProperties, currentTPPs)) {
                     continue;
@@ -216,7 +216,7 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
         try {
             const found = reducedLinksByHashes[currentLinkHash];
             if (!found) {
-                logger_1.default.info('Deleting: ', currentLinkHash);
+                logger_1.default.info(`Deleting:  ${currentLinkHash}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-policy-link',
                     id: currentLink['id'],
@@ -231,13 +231,13 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
 function transformReducedLink(TPPLink, typeProperties, typePropertyPolicies) {
     const foundTP = typeProperties.find((tp) => tp.slug === TPPLink.typePropertySlug && tp.typeSlug === TPPLink.typeSlug);
     if (!foundTP) {
-        logger_1.default.error('Could not find type property with label', TPPLink.typePropertySlug);
+        logger_1.default.error(`Could not find type property with slug ${TPPLink.typePropertySlug}`);
         return false;
     }
     TPPLink.typePropertyId = foundTP.id;
-    const foundTPP = typePropertyPolicies.find((tpp) => tpp.label === TPPLink.typePropertyPolicyLabel);
+    const foundTPP = typePropertyPolicies.find((tpp) => tpp.identifier === TPPLink.typePropertyPolicyIdentifier);
     if (!foundTPP) {
-        logger_1.default.error('Could not find type property policy with label', TPPLink.typePropertyPolicyLabel);
+        logger_1.default.error(`Could not find type property policy with identifier ${TPPLink.typePropertyPolicyIdentifier}`);
         return false;
     }
     TPPLink.typePropertyPolicyId = foundTPP.id;

package/dist/commands/types/uploadUsageInfo.js

@@ -27,7 +27,7 @@ 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',
+        description: 'The directory from which to export the usage info data. Defaults to the current directory. The usage info data will be loaded from $dir/usage-info.yml',
         required: false,
         default: '.',
     }),
@@ -35,16 +35,16 @@ UploadUsageInfo.flags = {
 async function uploadUsageInfo(dir) {
     try {
         await (0, login_1.authUser)();
-        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('USAGE INFO'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('USAGE INFO')} Uploading`);
         const reducedUsageInfo = await loadUsageInfo(dir);
         await uploadUsageInfoObjects(reducedUsageInfo);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('USAGE INFO'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('USAGE INFO')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s Usage Info Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Usage Info Upload Failed . ${e}`);
         return;
     }
-    logger_1.default.info('%s Usage Info Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Usage Info Upload Complete.`);
 }
 exports.uploadUsageInfo = uploadUsageInfo;
 function loadUsageInfo(dir) {
@@ -70,7 +70,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
         const foundType = typesWithProperties.find((t) => t.id === currentUI.typeId);
         const foundTypeProperty = typeProperties.find((tp) => tp.id === currentUI.typePropertyId);
         if (!foundType || !foundTypeProperty) {
-            logger_1.default.info('skipping unhashable, invalid usage info:', currentUI);
+            logger_1.default.info(`skipping unhashable, invalid usage info: ${currentUI}`);
             continue;
         }
         const hash = `${foundType.slug}|${foundTypeProperty.slug}`;
@@ -81,7 +81,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
         const hash = `${loadedUI.typeSlug}|${loadedUI.typePropertySlug}`;
         reducedUsageInfoHashes[hash] = loadedUI;
     }
-    logger_1.default.debug('current usage info:', currentUsageInfo);
+    logger_1.default.debug(`current usage info: ${currentUsageInfo}`);
     logger_1.default.debug('loaded usage info:', loadedUsageInfo);
     for (const loadedUI of loadedUsageInfo) {
         try {
@@ -90,7 +90,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
                 if (!transformReducedUI(loadedUI, typesWithProperties, typeProperties)) {
                     continue;
                 }
-                logger_1.default.debug('Creating: ', loadedUI);
+                logger_1.default.debug(`Creating:  ${loadedUI}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-usage-info',
                     object: {
@@ -110,7 +110,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
                 if (!transformReducedUI(loadedUI, typesWithProperties, typeProperties)) {
                     continue;
                 }
-                logger_1.default.info('Updating: ', loadedUI);
+                logger_1.default.info(`Updating:  ${loadedUI}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-usage-info',
                     id: found.id,
@@ -129,7 +129,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
         try {
             const found = reducedUsageInfoHashes[hash];
             if (!found) {
-                logger_1.default.debug('Deleting: ', hash);
+                logger_1.default.debug(`Creating:  ${hash}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-usage-info',
                     id: currentUI['id'],
@@ -145,13 +145,13 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
 function transformReducedUI(reducedUsageInfo, types, typeProperties) {
     const foundType = types.find((t) => t.slug === reducedUsageInfo.typeSlug);
     if (!foundType) {
-        logger_1.default.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);
     if (!foundTypeProperty) {
-        logger_1.default.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/webhooks/create.js

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const login_1 = require("../../auth/login");
 const webhooks_1 = require("../../api/webhooks");
 const basecommand_1 = require("../../basecommand");
-const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class CreateWebhooks extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(CreateWebhooks);
         await (0, login_1.authUser)();
         const webhook = await (0, webhooks_1.createWebhook)({});
         if (flags.json) {
-            logger_1.default.info(JSON.stringify(webhook, null, 2));
+            console.log(JSON.stringify(webhook, null, 2));
         }
         else {
-            logger_1.default.info(webhook.id);
+            console.log(webhook.id);
         }
     }
 }

package/dist/commands/webhooks/list.js

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const login_1 = require("../../auth/login");
 const webhooks_1 = require("../../api/webhooks");
+const login_1 = require("../../auth/login");
 const basecommand_1 = require("../../basecommand");
-const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class ListWebhooks extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(ListWebhooks);
         await (0, login_1.authUser)();
         const webhooks = await (0, webhooks_1.getWebhooks)();
         if (flags.json) {
-            logger_1.default.info(JSON.stringify(webhooks, null, 2));
+            console.info(JSON.stringify(webhooks, null, 2));
         }
         else {
-            logger_1.default.info(webhooks.map((x) => x.id).join('\n'));
+            console.info(webhooks.map((x) => x.id).join('\n'));
         }
     }
 }

package/dist/helpers/app/actions-deployer.js

@@ -31,7 +31,7 @@ class ActionsDeployer {
         // FETCH ALL ACTIONS FROM THE API.
         const existingActions = await getActionsForAppVersion(app);
         // UPSERT / DELETE BASED ON ACTION IDENTIFIER
-        logger_1.default.info('%s \tDeploying actions.', chalk_1.default.yellow.bold('ACTION'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ACTION')} \tDeploying actions.`);
         if (appDeclaration.actions) {
             const localActionKeys = Object.keys(appDeclaration.actions);
             if ((localActionKeys === null || localActionKeys === void 0 ? void 0 : localActionKeys.length) > 0) {
@@ -42,7 +42,7 @@ class ActionsDeployer {
         }
     }
     async deployAction(actionKey, actionDeclaration, app, existingActions) {
-        logger_1.default.info(`%s \tDeploying action: ${actionKey}`, chalk_1.default.yellow.bold('ACTION'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ACTION')} \tDeploying action: ${actionKey}`);
         const identifier = getActionDeclarationIdentifier(actionKey, app);
         const existingDefinition = existingActions.find((ad) => ad.identifier === identifier);
         if (!existingDefinition) {
@@ -74,7 +74,7 @@ class ActionsDeployer {
             entityName: 'event-workflow-action-definition',
             object: newObject,
         });
-        logger_1.default.info(`%s      Created new action definition: ${actionKey}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ACTION')} Created new action definition: ${actionKey}`);
         return actionDefinition;
     }
     async updateActionDefinition(existingActionDefinition, actionDeclaration, app) {
@@ -103,7 +103,7 @@ class ActionsDeployer {
             id: existingActionDefinition.id,
             object: updates,
         });
-        logger_1.default.info(`%s      Updated existing action definition: ${actionDefinition.identifier}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ACTION')} Updated existing action definition: ${actionDefinition.identifier}`);
         return actionDefinition;
     }
     async getFunction(actionDeclaration) {

package/dist/helpers/app/app-deployer.js

@@ -24,11 +24,11 @@ class AppDeployer {
     async deploy(appDeclaration) {
         let app = await this.getExistingApp(appDeclaration);
         if (!app) {
-            logger_1.default.info('%s      Creating new app.', chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Creating new app.`);
             app = await this.createNewApp(appDeclaration);
         }
         else {
-            logger_1.default.info('%s      Updating existing app.', chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Updating existing app.`);
             app = await this.updateExistingApp(appDeclaration, app);
         }
         if (this.dryRun) {
@@ -79,14 +79,14 @@ class AppDeployer {
             return {};
         }
         let app = await new sdk_1.Entities().create({ entityName: 'app', object: newApp });
-        logger_1.default.info(`%s      Created new app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Created new app: ${app.name}`);
         const isDocker = Object.hasOwnProperty.call(appDeclaration, 'dockerImageRef');
         if (!isDocker) {
             // this is the expected default behavior
             const appCodePackage = await createNodePackage(appDeclaration.appIdentifier, this.debug, this.dryRun);
             app.appCodePackageId = appCodePackage.id;
             app = await new sdk_1.Entities().update({ entityName: 'app', id: app.id, object: app });
-            logger_1.default.info(`%s      Updated app with code package: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Updated app with code package: ${app.name}`);
         }
         return app;
     }
@@ -113,6 +113,7 @@ class AppDeployer {
             : [];
         const updates = {
             name: appDeclaration.appName,
+            version: appDeclaration.version,
             public: appDeclaration.visibility === 'public',
             hidden: appDeclaration.hidden,
             description: appDeclaration.appDescription,
@@ -127,6 +128,7 @@ class AppDeployer {
             appCodePackageId: appCodePackageId !== null && appCodePackageId !== void 0 ? appCodePackageId : null,
             frameworkVersion: 2,
         };
+        logger_1.default.debug(`app update: ${JSON.stringify(updates, null, 2)}`);
         if (this.dryRun) {
             logger_1.default.info('Dry run, not creating app');
             return {};
@@ -136,7 +138,7 @@ class AppDeployer {
             id: existingApp.id,
             object: updates,
         });
-        logger_1.default.info(`%s      Updated app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Updated app: ${app.name}`);
         return app;
     }
     async remove(appDeclaration) {
@@ -144,11 +146,11 @@ class AppDeployer {
         if (app) {
             const actions = await (0, actions_deployer_1.getActionsForAppVersion)(app);
             for (const action of actions) {
-                logger_1.default.info(`%s      Deleting action: ${action.identifier}`, chalk_1.default.yellow.bold('APP'));
+                logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Deleting action: ${action.identifier}`);
                 await (0, actions_deployer_1.deleteAction)(action.id);
             }
             app = await new sdk_1.Entities().delete({ entityName: 'app', id: app.id });
-            logger_1.default.info(`%s      Deleted app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.green.bold('APP')}      Deleted app: ${app.name}`);
         }
         else {
             throw new Error('App not found.');
@@ -177,7 +179,7 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
             child_process_1.default.execSync('npx tsc --outDir tmp/dist');
         }
         catch (e) {
-            logger_1.default.error('%s      Failed to build package.', chalk_1.default.red.bold('APP'));
+            logger_1.default.error(`${chalk_1.default.red.bold('APP')}      Failed to build package.`);
             const stdOut = e.stdout.toString();
             const stdErr = e.stderr.toString();
             logger_1.default.error('Build Error(stdout):', stdOut);
@@ -224,7 +226,7 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
         return appCodePackage;
     }
     catch (e) {
-        logger_1.default.error('%s      Failed to create app package.', chalk_1.default.red.bold('APP'));
+        logger_1.default.error(`${chalk_1.default.red.bold('APP')}      Failed to create app package.`);
         throw e;
     }
     finally {