@contrail/cli 1.0.31 → 1.0.32

package/src/types/types-extractor.ts

@@ -11,23 +11,23 @@ export async function getTypes(args) {
   try {
     const userConfig = await authUser();
     console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
-    console.log(`%s Retrieving`, chalk.yellow.bold('OPTION SETS'));
+    console.log('%s Retrieving', chalk.yellow.bold('OPTION SETS'));
 
     const optionSets = await new Entities().get({
       entityName: 'type-property-option-set',
     });
     await getOptionSets(optionSets);
 
-    console.log(`%s Retrieved`, chalk.yellow.bold('OPTION SETS'));
-    console.log(`%s Retrieving`, chalk.yellow.bold('TYPES'));
+    console.log('%s Retrieved', chalk.yellow.bold('OPTION SETS'));
+    console.log('%s Retrieving', chalk.yellow.bold('TYPES'));
 
     const reducedTypes = await getReducedTypes(optionSets);
     const typesHolder = {
       types: reducedTypes,
     };
-    saveData(typesHolder)
+    saveData(typesHolder);
 
-    console.log(`%s Retrieved`, chalk.yellow.bold('TYPES'));
+    console.log('%s Retrieved', chalk.yellow.bold('TYPES'));
 
   }
   catch (e) {

package/src/types/types-properties-merger.ts

@@ -12,7 +12,7 @@ export async function MergeTypeProperties(args) {
     if (args?.length < 5) {
       throw new Error('File name must be included along with a type path.');
     }
-    console.log(`%s Importing local file`, chalk.yellow.bold('TYPE PROPERTIES MERGE'));
+    console.log('%s Importing local file', chalk.yellow.bold('TYPE PROPERTIES MERGE'));
     const fileLocation = args[3];
     console.log('Using File: ', fileLocation);
 
@@ -20,7 +20,7 @@ export async function MergeTypeProperties(args) {
     console.log('Using TypePaths: ', typePaths);
 
     await mergeTypeProperties(fileLocation, typePaths);
-    console.log(`%s Merged`, chalk.yellow.bold('TYPE PROPERTIES MERGE'));
+    console.log('%s Merged', chalk.yellow.bold('TYPE PROPERTIES MERGE'));
 
   }
   catch (e) {
@@ -62,17 +62,17 @@ async function mergeTypeProperties(fileLocation, typePaths) {
     if (!foundType){
       console.log(`%s No Type found for: ${typePath}`, chalk.red.bold('WARNING'));
     }
-    mergeType(foundType, uploadedTypeProperties)
+    mergeType(foundType, uploadedTypeProperties);
   }
 
-  saveData({types: reducedTypes})
+  saveData({types: reducedTypes});
 }
 
 function mergeType(reducedType: ReducedType, typePropertiesToAdd: ReducedTypeProperty[]) {
   for (const typeProperty of typePropertiesToAdd) {
-    const found = reducedType.typeProperties.find(tp => tp.slug === typeProperty.slug)
+    const found = reducedType.typeProperties.find(tp => tp.slug === typeProperty.slug);
     if (!found) {
-      reducedType.typeProperties.push(typeProperty)
+      reducedType.typeProperties.push(typeProperty);
     }
   }
 }

package/src/types/types-uploader.ts

@@ -1,21 +1,21 @@
 import { Entities, Request } from '@contrail/sdk';
-import { ReducedType, ReducedTypeProperty } from './interfaces';
+import { ReducedType } from './interfaces';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
 import { getSeparatorByPlatform } from '../common';
 import * as _ from 'lodash';
 
-const yaml = require('js-yaml');
+import yaml from 'js-yaml';
 
-export async function uploadTypes(args) {
+export async function uploadTypes() {
   try {
     const userConfig = await authUser();
     console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
 
-    console.log(`%s Uploading`, chalk.yellow.bold('TYPES'));
+    console.log('%s Uploading', chalk.yellow.bold('TYPES'));
     await uploadReducedTypes();
-    console.log(`%s Uploaded`, chalk.yellow.bold('TYPES'));
+    console.log('%s Uploaded', chalk.yellow.bold('TYPES'));
 
   }
   catch (e) {
@@ -155,27 +155,27 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
         await Request.request(
           `/types/${type.id}/type-properties`,
           {
-          method: 'POST',
-          body: JSON.stringify({
-            isArchived: newPropertyType.isArchived,
-            propertyType: newPropertyType.propertyType,
-            slug: newPropertyType.slug,
-            label: newPropertyType.label,
-            editable: newPropertyType.editable,
-            core: newPropertyType.core,
-            typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
-            formula: newPropertyType.formula,
-            referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
-            defaultValue: newPropertyType.defaultValue,
-            propertyLevel: newPropertyType.propertyLevel,
-            formulaFunction: newPropertyType.formulaFunction,
-            validationFunction: newPropertyType.validationFunction,
-          }),
-          headers: {
-              'Accept': 'application/json',
+            method: 'POST',
+            body: JSON.stringify({
+              isArchived: newPropertyType.isArchived,
+              propertyType: newPropertyType.propertyType,
+              slug: newPropertyType.slug,
+              label: newPropertyType.label,
+              editable: newPropertyType.editable,
+              core: newPropertyType.core,
+              typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
+              formula: newPropertyType.formula,
+              referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
+              defaultValue: newPropertyType.defaultValue,
+              propertyLevel: newPropertyType.propertyLevel,
+              formulaFunction: newPropertyType.formulaFunction,
+              validationFunction: newPropertyType.validationFunction,
+            }),
+            headers: {
+              Accept: 'application/json',
               'Content-Type': 'application/json',
-          },
-      });
+            },
+          });
       }
       else if (found && !newPropertyType.inherited && !typePropertiesEqual(found, newPropertyType, optionSetIdByName)) {
         console.log('Updating Type-Property: ', newPropertyType.slug);
@@ -213,12 +213,12 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
         await Request.request(
           `/types/${type.id}/type-properties/${currentPropertyType.id}`,
           {
-          method: 'DELETE',
-          headers: {
-              'Accept': 'application/json',
+            method: 'DELETE',
+            headers: {
+              Accept: 'application/json',
               'Content-Type': 'application/json',
-          },
-      });
+            },
+          });
       }
     } catch (err) {
       throw new Error(`Error Deleting Properties: ${err}`);
@@ -261,4 +261,4 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName): b
   };
 
   return _.isEqual(reducedProperty1, reducedProperty2);
-}
+}

package/src/workflows/workflow-template-deployer.ts

@@ -1,8 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
-import { App, AppDeclaration, WorkflowTemplate, WorkflowTemplateDeclaration } from '../interfaces';
-import { getActionDeclarationIdentifier, getActionsForApp } from '../apps/deploy-app/actions-deployer'
-import { deleteWorkflowTemplate } from './workflowCommands';
+import { WorkflowTemplate, WorkflowTemplateDeclaration } from '../interfaces';
 
 export class WorkflowTemplateDeployer {
   async deployWorkflows(wtDeclaration: WorkflowTemplateDeclaration) {
@@ -77,7 +75,7 @@ export class WorkflowTemplateDeployer {
           const actionEntity: any = await getActionByIdentifier(actionKey);
           actionConfiguration.id = actionEntity.id;
         } catch (e) {
-          console.log(e)
+          console.log(e);
         }
         if(!actionConfiguration.id) {
           throw new Error(`Could not find action ${actionKey} declared in ${workflowKey}`);

package/src/workflows/workflowCommands.ts

@@ -35,7 +35,6 @@ export async function deployWorkflowTemplate() {
   await new WorkflowTemplateDeployer().deployWorkflows(wtDeclaration);
 }
 
-
 export async function listWorkflowTemplate() {
   await authUser();
   return await new WorkflowTemplateDeployer().listExistingWorkflowTemplates();

package/templates/javascript/actions/example/action.js

@@ -1,38 +1,38 @@
-async function execute(config, event, Functions) {        
-  const getBodyFromEvent = (config, event) => {            
-    let body = Functions.stringUtil.parseVariables(config.message, event);            
-    console.log('body: ', body);            
-    if (config.sendDetails) {                
-      const data = event;                
-      const properties = {};                
-      let addedProperty = false;                
-      for (const property of config.fieldsToForward) {                    
-        const variableLevels = property.split('.');                    
-        let replacementValue = data;                    
-        for (let i = 0; i < variableLevels.length; i++) {                        
-          replacementValue = replacementValue[variableLevels[i]];                    
-        }                    
-        properties[property] = replacementValue;                    
-        addedProperty = true;                
-      }                
-      if (addedProperty) {                    
-        body = body + ' Properties: ' + JSON.stringify(properties) + '.';                
-      }            
-    }            
-    return JSON.stringify({ text: body });        
-  };        
-  const body = getBodyFromEvent(config, event);        
-  console.log('Sending message: ', body);        
-  const response = await Functions.fetch(config.url, {            
-    method: 'POST',            
-    body: body,            
-    headers: { 'Content-Type': 'application/json' }        
-  });        
-  if (!response.ok) {            
-    console.log('Webhook event failed to publish');            
-    console.log('Response: ', JSON.stringify(response));        
-  }        
-  else {            
-    console.log('Published!');        
-  }    
+async function execute(config, event, Functions) {
+  const getBodyFromEvent = (config, event) => {
+    let body = Functions.stringUtil.parseVariables(config.message, event);
+    console.log('body: ', body);
+    if (config.sendDetails) {
+      const data = event;
+      const properties = {};
+      let addedProperty = false;
+      for (const property of config.fieldsToForward) {
+        const variableLevels = property.split('.');
+        let replacementValue = data;
+        for (let i = 0; i < variableLevels.length; i++) {
+          replacementValue = replacementValue[variableLevels[i]];
+        }
+        properties[property] = replacementValue;
+        addedProperty = true;
+      }
+      if (addedProperty) {
+        body = body + ' Properties: ' + JSON.stringify(properties) + '.';
+      }
+    }
+    return JSON.stringify({ text: body });
+  };
+  const body = getBodyFromEvent(config, event);
+  console.log('Sending message: ', body);
+  const response = await Functions.fetch(config.url, {
+    method: 'POST',
+    body: body,
+    headers: { 'Content-Type': 'application/json' }
+  });
+  if (!response.ok) {
+    console.log('Webhook event failed to publish');
+    console.log('Response: ', JSON.stringify(response));
+  }
+  else {
+    console.log('Published!');
+  }
 }

package/templates/typescript/actions/exampleAction.ts

@@ -1,4 +1,4 @@
-export { } // Leave empty export - This allows for multiple files with a function named execute.
+export { }; // Leave empty export - This allows for multiple files with a function named execute.
 async function execute(config, event, Functions) {
   const getBodyFromEvent = (config, event) => {
     let body = Functions.stringUtil.parseVariables(config.message, event);

package/templates/typescript/app.yml

@@ -4,7 +4,7 @@ appDescription: "Your app description."
 visibility: public
 publisher: "Your company name"
 version: 1.0
-isDockerBased: true # this flag should be deprecated since all apps should be docker-based anyway
+# dockerImageRef: repo/name:tag
 
 # eventWorkflowTriggerKeyMapping will be used to parse an incoming event into a key that can trigger workflows
 # {} indicates a field on the event. You can use nested fields by separating the levels with a '.'