@contrail/cli 1.0.31 → 1.0.32

package/src/cli.ts

@@ -9,7 +9,7 @@ import { MergeOptionSets } from './types/option-set-merger';
 import { MergeTypeProperties } from './types/types-properties-merger';
 import { ParseTypesFromFiles, ParseTypesFromLocalFiles, ParseTypesFromTemplateFromLocalFiles } from './types/parse-types';
 import { loadColors, deleteColors } from './colors/color-loader';
-import {listConfig, removeConfig} from './config/configCommands'
+import {listConfig, removeConfig} from './config/configCommands';
 import {deleteWorkflowTemplate, deployWorkflowTemplate, listWorkflowTemplate} from './workflows/workflowCommands';
 const cliUsage = require('command-line-usage');
 
@@ -42,132 +42,132 @@ export async function cli(args) {
   command = commandParts[1];
 
   switch (domain) {
-    case 'app': {
-      switch (command) {
-        case 'create': {
-          create(args);
-          break;
-        }
-        case 'deploy': {
-          deployApp(args);
-          break;
-        }
-        case 'remove': {
-          removeApp(args);
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
+  case 'app': {
+    switch (command) {
+    case 'create': {
+      create(args);
       break;
     }
-    case 'types': {
-      switch (command) {
-        case 'getAll': {
-          getTypes(args);
-          break;
-        }
-        case 'uploadTypes': {
-          uploadTypes(args);
-          break;
-        }
-        case 'uploadOptionSets': {
-          UploadOptionSets(args);
-          break;
-        }
-        case 'parseOptionSetsLocalFiles': {
-          ParseOptionSetsLocalFiles(args);
-          break;
-        }
-        case 'parseTypesFromLocalFiles': {
-          ParseTypesFromLocalFiles(args);
-          break;
-        }
-        case 'parseTypesFromTemplateFromLocalFiles': {
-          ParseTypesFromTemplateFromLocalFiles(args);
-          break;
-        }
-        case 'parseTypesFromFiles': {
-          ParseTypesFromFiles(args);
-          break;
-        }
-        case 'mergeOptionSets': {
-          MergeOptionSets(args);
-          break;
-        }
-        case 'mergeTypeProperties': {
-          MergeTypeProperties(args);
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
+    case 'deploy': {
+      deployApp(args);
       break;
     }
+    case 'remove': {
+      removeApp(args);
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
+  case 'types': {
+    switch (command) {
+    case 'getAll': {
+      getTypes(args);
+      break;
+    }
+    case 'uploadTypes': {
+      uploadTypes();
+      break;
+    }
+    case 'uploadOptionSets': {
+      UploadOptionSets(args);
+      break;
+    }
+    case 'parseOptionSetsLocalFiles': {
+      ParseOptionSetsLocalFiles(args);
+      break;
+    }
+    case 'parseTypesFromLocalFiles': {
+      ParseTypesFromLocalFiles(args);
+      break;
+    }
+    case 'parseTypesFromTemplateFromLocalFiles': {
+      ParseTypesFromTemplateFromLocalFiles(args);
+      break;
+    }
+    case 'parseTypesFromFiles': {
+      ParseTypesFromFiles(args);
+      break;
+    }
+    case 'mergeOptionSets': {
+      MergeOptionSets(args);
+      break;
+    }
+    case 'mergeTypeProperties': {
+      MergeTypeProperties(args);
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
 
-    case 'colors': {
-      switch (command) {
-        case 'load': {
-          await loadColors();
-          break;
-        }
-        case 'delete': {
-          await deleteColors();
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
+  case 'colors': {
+    switch (command) {
+    case 'load': {
+      await loadColors();
       break;
     }
-    case 'workflow-templates': {
-      switch (command) {
-        case 'load': {
-          await deployWorkflowTemplate();
-          break;
-        }
-        case 'delete': {
-          await deleteWorkflowTemplate();
-          break;
-        }
-        case 'list': {
-          await listWorkflowTemplate();
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
+    case 'delete': {
+      await deleteColors();
       break;
     }
-    case 'config': {
-      switch (command) {
-        case 'list': {
-          await listConfig();
-          break;
-        }
-        case 'remove': {
-          await removeConfig(args);
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
+  case 'workflow-templates': {
+    switch (command) {
+    case 'load': {
+      await deployWorkflowTemplate();
+      break;
+    }
+    case 'delete': {
+      await deleteWorkflowTemplate();
       break;
     }
-    case 'help':
-    case '-help':
-    case '--help': {
-      printHelp();
+    case 'list': {
+      await listWorkflowTemplate();
       break;
     }
     default: {
       printIllegalCommand();
     }
+    }
+    break;
+  }
+  case 'config': {
+    switch (command) {
+    case 'list': {
+      await listConfig();
+      break;
+    }
+    case 'remove': {
+      await removeConfig(args);
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
+  case 'help':
+  case '-help':
+  case '--help': {
+    printHelp();
+    break;
+  }
+  default: {
+    printIllegalCommand();
+  }
   }
 }
 
@@ -244,13 +244,13 @@ const helpSections = [
       'parseTypesFromFiles <fileIds>           Parse CSV files into Types and ',
       '.                                       OptionSets from VibeIQ Files.\n',
       'mergeOptionSets <File Path>             Merge the OptionSets from an existing',
-      '.                                       org and the OptionSets passed in.', 
+      '.                                       org and the OptionSets passed in.',
       '.                                       File must be .yml\n',
-      'mergeTypeProperties <File Path> <TypePaths> ', 
+      'mergeTypeProperties <File Path> <TypePaths> ',
       '.                                       Merge the TypeProperties from an existing',
       '.                                       org and the TypeProperties passed in.',
-      '.                                       Add to Types via TypePath', 
+      '.                                       Add to Types via TypePath',
       '.                                       File must be .yml\n',
     ],
   },
-];
+];

package/src/colors/color-loader.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { authUser } from '../auth/login';
 import { getSeparatorByPlatform } from '../common';
 
-const csv = require('csvtojson')
+const csv = require('csvtojson');
 
 interface Color {
   name: string;
@@ -17,7 +17,7 @@ export async function deleteColors() {
   try {
     await authUser();
     const colors = await getExistingColors();
-    console.log("Deleting %s colors", colors.length)
+    console.log('Deleting %s colors', colors.length);
     for (const color of colors) {
       await deleteColor(color);
     }
@@ -32,10 +32,10 @@ export async function deleteColors() {
 export async function loadColors() {
   try {
     await authUser();
-    console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
-    console.log(`%s Uploading`, chalk.yellow.bold('COLORS'));
+    console.log('%s Getting Existing Colors', chalk.yellow.bold('COLORS'));
+    console.log('%s Uploading', chalk.yellow.bold('COLORS'));
     await uploadColors();
-    console.log(`%s Uploaded`, chalk.yellow.bold('COLORS'));
+    console.log('%s Uploaded', chalk.yellow.bold('COLORS'));
 
   }
   catch (e) {
@@ -47,23 +47,23 @@ export async function loadColors() {
 }
 
 async function getLocalColors() {
-  console.log("loading colors from local file")
+  console.log('loading colors from local file');
   const TARGET_DIR = process.cwd();
   try {
     const separator = getSeparatorByPlatform();
 
-    const csvFilePath = TARGET_DIR + separator + 'colors.csv'
-    return await csv().fromFile(csvFilePath)
+    const csvFilePath = TARGET_DIR + separator + 'colors.csv';
+    return await csv().fromFile(csvFilePath);
   } catch (e) {
     throw new Error(`ERROR PARSING COLORS CSV: ${e}`);
   }
 }
 
 async function getExistingColors() {
-  console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
+  console.log('%s Getting Existing Colors', chalk.yellow.bold('COLORS'));
   try {
     const result = await new Entities().get({ entityName: 'color', take: 3000}); //, useSearch: false }); Not in EntitiesClientGetOptions yet
-    console.log("Found %s existing colors", result.length)
+    console.log('Found %s existing colors', result.length);
     return result;
   } catch (e) {
     throw new Error(`ERROR DOWNLOADING COLORS: ${e}`);
@@ -81,10 +81,10 @@ async function deleteColor(color) {
 async function uploadColors() {
   const colors: Color[] = await getLocalColors();
   const existingColors = await getExistingColors();
-  const existingNamesValues = existingColors.filter(x => x.name).map(x => x.name)
+  const existingNamesValues = existingColors.filter(x => x.name).map(x => x.name);
   for (const color of colors) {
     if (existingNamesValues.includes(color.name)) {
-      console.log(`%s SKIPPING %s (%s)`, chalk.yellow.bold('COLORS'), color.hex, color.name);
+      console.log('%s SKIPPING %s (%s)', chalk.yellow.bold('COLORS'), color.hex, color.name);
       continue;
     }
     if (color.hex.length > 1 && color.hex[0] === '#') {
@@ -93,15 +93,15 @@ async function uploadColors() {
     const o: any = {
       hex: color.hex,
       name: color.name
-    }
+    };
     if (color.red) {
-      o.red = color.red
+      o.red = color.red;
     }
     if (color.green) {
-      o.green = color.green
+      o.green = color.green;
     }
     if (color.blue) {
-      o.blue = color.blue
+      o.blue = color.blue;
     }
 
     await new Entities().create({

package/src/config/config.ts

@@ -1,4 +1,4 @@
-import { readFileSync, access, promises as fsPromises, write } from 'fs';
+import { promises as fsPromises } from 'fs';
 import { join } from 'path';
 import {homedir} from  'os';
 const userHomeDir = homedir();
@@ -7,16 +7,16 @@ const configFileLocation = join(configDirectoryLocation, 'config.json');
 
 export async function initializeVibeIQConfig() {
   try{
-    await fsPromises.mkdir(configDirectoryLocation, {recursive: true})
+    await fsPromises.mkdir(configDirectoryLocation, {recursive: true});
   } catch (e) {
-    console.error("could not initialize vibeiq directory")
-    throw e
+    console.error('could not initialize vibeiq directory');
+    throw e;
   }
 
   try {
     await fsPromises.writeFile(configFileLocation, '{}');
   } catch (e) {
-    console.error(`could not initialize config file (${configFileLocation}).`)
+    console.error(`could not initialize config file (${configFileLocation}).`);
     throw e;
   }
 }
@@ -38,18 +38,17 @@ export async function readVibeIQConfig() {
   }
 }
 
-
 export async function writeVibeIQConfig(config: Object) {
   try {
     await fsPromises.writeFile(configFileLocation, JSON.stringify(config, null, 2));
   } catch (e) {
     console.error(`Could not open config file (${configFileLocation}) for writing.`);
-    throw e
+    throw e;
   }
 }
 
 export async function getConfig() {
-  console.debug("getting config from file system")
+  console.debug('getting config from file system');
   return await readVibeIQConfig();
 }
 
@@ -67,10 +66,9 @@ export async function storeConfig(incomingConfig: Object, merge=true) {
     config = {
       ... await readVibeIQConfig(),
       ... incomingConfig
-    }
+    };
   } else {
-    config = incomingConfig
+    config = incomingConfig;
   }
   await writeVibeIQConfig(config);
 }
-

package/src/config/configCommands.ts

@@ -1,6 +1,6 @@
 import {deleteConfigs, readVibeIQConfig} from './config';
 export async function listConfig() {
-  console.log(await readVibeIQConfig())
+  console.log(await readVibeIQConfig());
 }
 
 export async function removeConfig(args) {

package/src/interfaces.ts

@@ -15,7 +15,6 @@ export interface AppDeclaration {
   appConfiguration: ConfigPropertyElements;
   triggers: { [key: string]: AppTriggerDeclaration };
   workflows?: { [key: string]: WorkflowDefinition|WorkflowTemplateDeclaration };
-  isDockerBased?: boolean;
   dockerImageRef?: string;
 }
 
@@ -35,6 +34,7 @@ export interface AppActionDeclaration {
   name: string;
   description?: string;
   actionConfiguration?: ConfigPropertyElements;
+  async?: boolean; // defaults to false
 }
 
 export interface AppTriggerDeclaration {
@@ -44,7 +44,6 @@ export interface AppTriggerDeclaration {
   description?: string;
 }
 
-
 export interface WorkflowDefinition {
   id?: string;
   identifier: string;
@@ -105,10 +104,10 @@ export interface App {
 }
 
 export class ConfigProperty {
-	slug: string;
-	propertyType: string;
-	options?: any[];
-	label: string;
+  slug: string;
+  propertyType: string;
+  options?: any[];
+  label: string;
 }
 
 export interface EventWorkflowActionDefinition {
@@ -119,12 +118,12 @@ export interface EventWorkflowActionDefinition {
   ownerKey?: string;
   public?: boolean;
   configProperties?: ConfigProperty[];
-  isDockerBased?: boolean;
+  async?: boolean;
 }
 
 export class TriggerKeyDefinition {
-	name: string;
-	description?: string;
-	triggerKey: string;
+  name: string;
+  description?: string;
+  triggerKey: string;
   external?: boolean;
 }

package/src/types/csv-parser.ts

@@ -1,5 +1,5 @@
 import csvToJson from 'csvtojson';
-import * as client from 'https'
+import * as client from 'https';
 import { Entities } from '@contrail/sdk';
 
 export async function getCSVFromFile(loadFileId: string): Promise<any[]> {

package/src/types/option-set-merger.ts

@@ -11,12 +11,12 @@ export async function MergeOptionSets(args) {
     if (args?.length < 4) {
       throw new Error('File name must be included.');
     }
-    console.log(`%s Importing local file`, chalk.yellow.bold('OPTION SET MERGE'));
+    console.log('%s Importing local file', chalk.yellow.bold('OPTION SET MERGE'));
     const fileLocation = args[3];
     console.log('Using File: ', fileLocation);
 
     await mergeOptionSets(fileLocation);
-    console.log(`%s Merged`, chalk.yellow.bold('OPTION SET MERGE'));
+    console.log('%s Merged', chalk.yellow.bold('OPTION SET MERGE'));
 
   }
   catch (e) {
@@ -66,7 +66,7 @@ async function mergeOptionSets(fileLocation) {
     uploadedOptionSetsByName[optionSet.name] = optionSet;
   }
 
-  const mergedOptionSets: any[] = []
+  const mergedOptionSets: any[] = [];
   for (const uploadedOptionSet of uploadedOptionSets) {
     const existing = currentOptionSetsByName[uploadedOptionSet.name];
     if (!existing) {
@@ -91,7 +91,7 @@ async function mergeOptionSets(fileLocation) {
     }
   }
 
-  saveData({optionSets: mergedOptionSets})
+  saveData({optionSets: mergedOptionSets});
 }
 
 function mergeOptionSet(existingOptionSet: ReducedOptionSet, uploadedOptionSet: ReducedOptionSet) {
@@ -99,15 +99,15 @@ function mergeOptionSet(existingOptionSet: ReducedOptionSet, uploadedOptionSet:
     name: uploadedOptionSet.name,
     optionSet: uploadedOptionSet.optionSet,
     isArchived: uploadedOptionSet.isArchived,
-  }
+  };
 
   for (const keyVal of existingOptionSet.optionSet) {
-    const value = keyVal.value
-    const display = keyVal.display
+    const value = keyVal.value;
+    const display = keyVal.display;
 
-    const found = merged.optionSet.find(keyVal => keyVal.value === value)
+    const found = merged.optionSet.find(keyVal => keyVal.value === value);
     if (!found) {
-      merged.optionSet.push({value, display})
+      merged.optionSet.push({value, display});
     }
 
   }

package/src/types/option-set-parser.ts

@@ -1,9 +1,8 @@
-import { ReducedOptionSet } from './interfaces';
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
 import { parseOptionSets } from '@contrail/types';
 import chalk from 'chalk';
-const csv = require('csvtojson')
+const csv = require('csvtojson');
 const yaml = require('js-yaml');
 
 export async function ParseOptionSetsLocalFiles(args) {
@@ -11,12 +10,12 @@ export async function ParseOptionSetsLocalFiles(args) {
     if (args?.length < 4) {
       throw new Error('File name must be included.');
     }
-    console.log(`%s Importing local file`, chalk.yellow.bold('OPTION SET PARSE'));
+    console.log('%s Importing local file', chalk.yellow.bold('OPTION SET PARSE'));
     const fileLocation = args[3];
     console.log('Using File: ', fileLocation);
 
     await parseOptionSetsLocalFiles(fileLocation);
-    console.log(`%s Parsed`, chalk.yellow.bold('OPTION SET PARSE'));
+    console.log('%s Parsed', chalk.yellow.bold('OPTION SET PARSE'));
 
   }
   catch (e) {
@@ -35,7 +34,7 @@ async function loadOptionSetCSV(fileLocation) {
     const fullPath = TARGET_DIR + separator + fileLocation;
     console.log('Getting file from path: ', fullPath);
 
-    return await csv().fromFile(fullPath)
+    return await csv().fromFile(fullPath);
   } catch (e) {
     throw new Error(`ERROR PARSING CSV: ${e}`);
   }
@@ -50,7 +49,7 @@ async function parseOptionSetsLocalFiles(fileLocation) {
   // }
 
   const parsedOptionSets = parseOptionSets(uploadedOptionData);
-  saveData({optionSets: parsedOptionSets})
+  saveData({optionSets: parsedOptionSets});
 }
 
 function saveData(data) {

package/src/types/option-set-uploader.ts

@@ -12,9 +12,9 @@ export async function UploadOptionSets(args) {
     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('OPTION SETS'));
+    console.log('%s Uploading', chalk.yellow.bold('OPTION SETS'));
     await uploadOptionSets();
-    console.log(`%s Uploaded`, chalk.yellow.bold('OPTION SETS'));
+    console.log('%s Uploaded', chalk.yellow.bold('OPTION SETS'));
 
   }
   catch (e) {

package/src/types/parse-types.ts

@@ -14,12 +14,12 @@ export async function ParseTypesFromLocalFiles(args) {
     if (args?.length < 4) {
       throw new Error('File names must be included.');
     }
-    console.log(`%s Parsing`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    console.log('%s Parsing', chalk.yellow.bold('TYPES AND OPTION SETS'));
     const fileLocations = (args as Array<string>).slice(3);
     console.log('Using File Location(s): ', fileLocations);
 
     await parseTypesFromLocalFiles(fileLocations);
-    console.log(`%s Parsed`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    console.log('%s Parsed', chalk.yellow.bold('TYPES AND OPTION SETS'));
 
   }
   catch (e) {
@@ -36,12 +36,12 @@ export async function ParseTypesFromFiles(args) {
     if (args?.length < 4) {
       throw new Error('File ids must be included.');
     }
-    console.log(`%s Parsing`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    console.log('%s Parsing', chalk.yellow.bold('TYPES AND OPTION SETS'));
     const fileIds = (args as Array<string>).slice(3);
     console.log('Using FileId(s): ', fileIds);
 
     await parseTypesFromFiles(fileIds);
-    console.log(`%s Parsed`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    console.log('%s Parsed', chalk.yellow.bold('TYPES AND OPTION SETS'));
 
   }
   catch (e) {
@@ -58,14 +58,14 @@ export async function ParseTypesFromTemplateFromLocalFiles(args) {
     if (args?.length < 5) {
       throw new Error('File names must be included.');
     }
-    console.log(`%s Parsing`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    console.log('%s Parsing', chalk.yellow.bold('TYPES AND OPTION SETS'));
     const templateFileLocation = args[3];
     const dataFileLocation = args[4];
     console.log('Using Template File Location: ', templateFileLocation);
     console.log('Using Data File Location: ', dataFileLocation);
 
     await parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFileLocation);
-    console.log(`%s Parsed`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    console.log('%s Parsed', chalk.yellow.bold('TYPES AND OPTION SETS'));
 
   }
   catch (e) {
@@ -109,7 +109,7 @@ async function parseTypesFromLocalFiles(fileLocations: string[]) {
   }
 
   console.log(`CSV imports were successful. ${csvJSONData?.length} total rows found.`);
-  const suggestions = GetSuggestedTypes(csvJSONData)
+  const suggestions = GetSuggestedTypes(csvJSONData);
   saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
   saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }
@@ -132,7 +132,7 @@ async function parseTypesFromTemplateFromLocalFiles(templateFileLocation: string
     throw e;
   }
 
-  const types = GetTypesFromTemplate(templateCSVData, dataCSVData)
+  const types = GetTypesFromTemplate(templateCSVData, dataCSVData);
   saveData({ optionSets: types.OptionSets }, 'parsed_optionSets.yml');
   saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
 }
@@ -156,7 +156,7 @@ async function parseTypesFromFiles(fileIds: string[]) {
   }
 
   console.log(`CSV downloads were successful. ${csvJSONData?.length} total rows found.`);
-  const suggestions = GetSuggestedTypes(csvJSONData)
+  const suggestions = GetSuggestedTypes(csvJSONData);
 
   saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
   saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');