@contrail/cli 1.0.30 → 1.0.32

package/lib/colors/color-loader.js

@@ -7,7 +7,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);
         }
@@ -21,10 +21,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) {
         console.log(`%s Loading Colors Failed. ${e}`, chalk.red.bold('FAIL'));
@@ -33,7 +33,7 @@ export async function loadColors() {
     console.log('%s Loading Colors Complete.', chalk.green.bold('COMPLETE'));
 }
 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();
@@ -45,10 +45,10 @@ async function getLocalColors() {
     }
 }
 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) {
@@ -69,7 +69,7 @@ async function uploadColors() {
     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] === '#') {

package/lib/config/config.js

@@ -9,7 +9,7 @@ export async function initializeVibeIQConfig() {
         await fsPromises.mkdir(configDirectoryLocation, { recursive: true });
     }
     catch (e) {
-        console.error("could not initialize vibeiq directory");
+        console.error('could not initialize vibeiq directory');
         throw e;
     }
     try {
@@ -48,7 +48,7 @@ export async function writeVibeIQConfig(config) {
     }
 }
 export async function getConfig() {
-    console.debug("getting config from file system");
+    console.debug('getting config from file system');
     return await readVibeIQConfig();
 }
 export async function deleteConfigs(configNames) {

package/lib/interfaces.d.ts

@@ -21,7 +21,6 @@ export interface AppDeclaration {
     workflows?: {
         [key: string]: WorkflowDefinition | WorkflowTemplateDeclaration;
     };
-    isDockerBased?: boolean;
     dockerImageRef?: string;
 }
 export interface ConfigPropertyElements {
@@ -38,6 +37,7 @@ export interface AppActionDeclaration {
     name: string;
     description?: string;
     actionConfiguration?: ConfigPropertyElements;
+    async?: boolean;
 }
 export interface AppTriggerDeclaration {
     key: string;
@@ -116,7 +116,7 @@ export interface EventWorkflowActionDefinition {
     ownerKey?: string;
     public?: boolean;
     configProperties?: ConfigProperty[];
-    isDockerBased?: boolean;
+    async?: boolean;
 }
 export declare class TriggerKeyDefinition {
     name: string;

package/lib/types/interfaces.js

@@ -0,0 +1 @@
+export {};

package/lib/types/option-set-merger.js

@@ -9,11 +9,11 @@ export async function MergeOptionSets(args) {
         if ((args === null || args === void 0 ? void 0 : 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) {
         console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));

package/lib/types/option-set-parser.js

@@ -9,11 +9,11 @@ export async function ParseOptionSetsLocalFiles(args) {
         if ((args === null || args === void 0 ? void 0 : 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) {
         console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));

package/lib/types/option-set-uploader.js

@@ -8,9 +8,9 @@ export async function UploadOptionSets(args) {
     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('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) {
         console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));

package/lib/types/parse-types.d.ts

@@ -1,2 +1,3 @@
 export declare function ParseTypesFromLocalFiles(args: any): Promise<void>;
 export declare function ParseTypesFromFiles(args: any): Promise<void>;
+export declare function ParseTypesFromTemplateFromLocalFiles(args: any): Promise<void>;

package/lib/types/parse-types.js

@@ -1,4 +1,4 @@
-import { GetSuggestedTypes } from '@contrail/types';
+import { GetSuggestedTypes, GetTypesFromTemplate } from '@contrail/types';
 import chalk from 'chalk';
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
@@ -6,16 +6,17 @@ import * as csvToJson from 'csvtojson';
 import { authUser } from '../auth/login';
 import { getCSVFromFile } from './csv-parser';
 const yaml = require('js-yaml');
+// This uses local files to get the data to parse into types
 export async function ParseTypesFromLocalFiles(args) {
     try {
         if ((args === null || args === void 0 ? void 0 : 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.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) {
         console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
@@ -23,16 +24,37 @@ export async function ParseTypesFromLocalFiles(args) {
     }
     console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
 }
+// This uses VibeIq file ids to get the data to parse into types
 export async function ParseTypesFromFiles(args) {
     try {
         if ((args === null || args === void 0 ? void 0 : 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.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) {
+        console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
+}
+// This uses local files to get type template file and the data file to parse into types
+export async function ParseTypesFromTemplateFromLocalFiles(args) {
+    try {
+        if ((args === null || args === void 0 ? void 0 : args.length) < 5) {
+            throw new Error('File names must be included.');
+        }
+        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'));
     }
     catch (e) {
         console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
@@ -46,7 +68,7 @@ async function loadDataFromLocalCSV(fileName) {
         const separator = getSeparatorByPlatform();
         const fullPath = CURRENT_DIR + separator + fileName;
         console.log('Getting file from path: ', fullPath);
-        const csvData = await csvToJson.default().fromFile(fullPath);
+        const csvData = await csvToJson.default({ flatKeys: true }).fromFile(fullPath);
         return csvData;
     }
     catch (e) {
@@ -72,6 +94,25 @@ async function parseTypesFromLocalFiles(fileLocations) {
     saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
     saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }
+async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFileLocation) {
+    let templateCSVData = [];
+    let dataCSVData = [];
+    try {
+        console.log('Getting template from fileLocation: ', templateFileLocation);
+        templateCSVData = await loadDataFromLocalCSV(templateFileLocation);
+        console.log(`CSV import was successful. ${templateCSVData === null || templateCSVData === void 0 ? void 0 : templateCSVData.length} rows found.`);
+        console.log('Getting data from fileLocation: ', dataFileLocation);
+        dataCSVData = await loadDataFromLocalCSV(dataFileLocation);
+        console.log(`CSV import was successful. ${dataCSVData === null || dataCSVData === void 0 ? void 0 : dataCSVData.length} rows found.`);
+    }
+    catch (e) {
+        console.log('Error importing csv data.', e);
+        throw e;
+    }
+    const types = GetTypesFromTemplate(templateCSVData, dataCSVData);
+    saveData({ optionSets: types.OptionSets }, 'parsed_optionSets.yml');
+    saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
+}
 async function parseTypesFromFiles(fileIds) {
     await authUser();
     // get csv data

package/lib/types/types-extractor.js

@@ -8,19 +8,19 @@ 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);
-        console.log(`%s Retrieved`, chalk.yellow.bold('TYPES'));
+        console.log('%s Retrieved', chalk.yellow.bold('TYPES'));
     }
     catch (e) {
         console.log(`%s Types Retrieval Failed. ${e}`, chalk.red.bold('FAIL'));

package/lib/types/types-properties-merger.js

@@ -10,13 +10,13 @@ export async function MergeTypeProperties(args) {
         if ((args === null || args === void 0 ? void 0 : 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);
         const typePaths = args.slice(4);
         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) {
         console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));

package/lib/types/types-uploader.d.ts

@@ -1 +1 @@
-export declare function uploadTypes(args: any): Promise<void>;
+export declare function uploadTypes(): Promise<void>;

package/lib/types/types-uploader.js

@@ -4,14 +4,14 @@ import fs from 'fs';
 import { authUser } from '../auth/login';
 import { getSeparatorByPlatform } from '../common';
 import * as _ from 'lodash';
-const yaml = require('js-yaml');
-export async function uploadTypes(args) {
+import yaml from 'js-yaml';
+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) {
         console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));
@@ -146,7 +146,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         validationFunction: newPropertyType.validationFunction,
                     }),
                     headers: {
-                        'Accept': 'application/json',
+                        Accept: 'application/json',
                         'Content-Type': 'application/json',
                     },
                 });
@@ -186,7 +186,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                 await Request.request(`/types/${type.id}/type-properties/${currentPropertyType.id}`, {
                     method: 'DELETE',
                     headers: {
-                        'Accept': 'application/json',
+                        Accept: 'application/json',
                         'Content-Type': 'application/json',
                     },
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {
@@ -17,14 +17,14 @@
   "scripts": {
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
+    "lint": "eslint . --fix",
     "test": "jest --watch"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
     "@contrail/sdk": "^1.0.154",
-    "@contrail/types": "^2.0.61",
+    "@contrail/types": "^2.0.69",
     "@contrail/util": "^1.0.17",
     "amazon-cognito-identity-js": "^5.2.3",
     "arg": "^4.0.1",
@@ -32,6 +32,7 @@
     "chalk": "^4.0.0",
     "command-line-usage": "^6.1.1",
     "csvtojson": "^2.0.10",
+    "eslint-plugin-unused-imports": "^2.0.0",
     "esm": "^3.2.25",
     "execa": "^5.0.0",
     "inquirer": "^8.2.0",
@@ -45,12 +46,13 @@
     "@types/jest": "^23.3.14",
     "@types/lodash": "^4.14.178",
     "@types/node": "^14.6.4",
+    "@typescript-eslint/eslint-plugin": "^5.32.0",
+    "@typescript-eslint/parser": "^5.32.0",
+    "eslint": "^8.21.0",
     "jest": "^29.3.1",
     "prettier": "^1.19.1",
     "ts-jest": "^29.0.3",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.0.1"
+    "typescript": "^4.9.3"
   },
   "jest": {
     "moduleFileExtensions": [

package/src/apps/deploy-app/actions-deployer.ts

@@ -6,7 +6,6 @@ import { getSeparatorByPlatform } from '../../common';
 
 import fs from 'fs';
 
-
 export async function getActionsForApp(app: App) {
   return await new Entities().get({
     entityName: 'event-workflow-action-definition',
@@ -14,16 +13,16 @@ export async function getActionsForApp(app: App) {
   });
 }
 
-
 export function getActionDeclarationIdentifier(actionKey, app: App) {
   return app.identifier + ':' + actionKey;
 }
 
-export async function deleteAction(actionId): Promise<any>{
+export async function deleteAction(actionId): Promise<any> {
   return await new Entities().delete({ entityName: 'event-workflow-action-definition', id: actionId });
 }
 
 export class ActionsDeployer {
+
   async deployActions(appDeclaration: AppDeclaration, app: App) {
 
     // FETCH ALL ACTIONS FROM THE API.
@@ -31,16 +30,23 @@ export class ActionsDeployer {
 
     // UPSERT / DELETE BASED ON ACTION IDENTIFIER
     console.log('%s \tDeploying actions.', chalk.yellow.bold('ACTION'));
-
+    let appActionIdentifiers = [];
     if (appDeclaration.actions) {
-      const localActions = Object.keys(appDeclaration.actions);
-      if (localActions?.length > 0) {
-        for (const actionKey of localActions) {
+      const localActionKeys = Object.keys(appDeclaration.actions);
+      appActionIdentifiers = localActionKeys.map(x => getActionDeclarationIdentifier(x, app));
+      if (localActionKeys?.length > 0) {
+        for (const actionKey of localActionKeys) {
           await this.deployAction(actionKey, appDeclaration.actions[actionKey], app, existingActions);
         }
       }
     }
+    const toDelete = existingActions.filter(x => !appActionIdentifiers.includes(x.identifier));
+    for (const action of toDelete) {
+      console.log(`%s \tDeleting action: ${action.identifier}`, chalk.yellow.bold('ACTION'));
+      await deleteAction(action.id);
+    }
   }
+
   async deployAction(actionKey: string, actionDeclaration: AppActionDeclaration, app: App, existingActions: Array<any>) {
     console.log(`%s \tDeploying action: ${actionKey}`, chalk.yellow.bold('ACTION'));
 
@@ -63,8 +69,9 @@ export class ActionsDeployer {
       identifier: getActionDeclarationIdentifier(actionKey, app),
       name: actionDeclaration.name,
       ownerKey: `app:${app.id}`,
-      public: 'public' in actionDeclaration? actionDeclaration.public: app.public,
+      public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
       configProperties,
+      async: actionDeclaration.async,
     };
 
     const functionString = await this.getFunction(actionDeclaration);
@@ -94,8 +101,9 @@ export class ActionsDeployer {
 
     const updates: EventWorkflowActionDefinition = {
       name: actionDeclaration.name,
-      public: 'public' in actionDeclaration? actionDeclaration.public: app.public,
+      public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
       configProperties,
+      async: actionDeclaration.async,
     };
 
     const functionString = await this.getFunction(actionDeclaration);
@@ -114,7 +122,6 @@ export class ActionsDeployer {
     return actionDefinition;
   }
 
-
   async getFunction(actionDeclaration: AppActionDeclaration): Promise<string> {
     if (!actionDeclaration.handler) {
       return;

package/src/apps/deploy-app/app-deployer.ts

@@ -10,10 +10,10 @@ export class AppDeployer {
   public async deploy(appDeclaration: AppDeclaration) {
     let app = await this.getExistingApp(appDeclaration);
     if (!app) {
-      console.log(`%s      Creating new app.`, chalk.yellow.bold('APP'));
+      console.log('%s      Creating new app.', chalk.yellow.bold('APP'));
       app = await this.createNewApp(appDeclaration);
     } else {
-      console.log(`%s      Updating existing app.`, chalk.yellow.bold('APP'));
+      console.log('%s      Updating existing app.', chalk.yellow.bold('APP'));
       app = await this.updateExistingApp(appDeclaration, app);
     }
     await new ActionsDeployer().deployActions(appDeclaration, app);
@@ -65,7 +65,6 @@ export class AppDeployer {
       keywords: appDeclaration.keywords,
       configProperties,
       triggerKeyDefinitions,
-      isDockerBased: appDeclaration.isDockerBased,
       dockerImageRef: appDeclaration.dockerImageRef,
     };
     const app = await new Entities().create({ entityName: 'app', object: newApp });
@@ -105,7 +104,7 @@ export class AppDeployer {
   public async remove(appDeclaration: AppDeclaration) {
     let app = await this.getExistingApp(appDeclaration);
     if (app) {
-      const actions = await getActionsForApp(app)
+      const actions = await getActionsForApp(app);
       for(const action of actions)
       {
         console.log(`%s      Deleting action: ${action.identifier}`, chalk.yellow.bold('APP'));

package/src/apps/deploy-app/workflow-definition-deployer.ts

@@ -1,7 +1,7 @@
 import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
 import { App, AppDeclaration, WorkflowDefinition } from '../../interfaces';
-import { getActionDeclarationIdentifier, getActionsForApp } from './actions-deployer'
+import { getActionDeclarationIdentifier, getActionsForApp } from './actions-deployer';
 
 export class WorkflowDefinitionDeployer {
   async deployWorkflowDefinitions(appDeclaration: AppDeclaration, app: App) {
@@ -70,7 +70,7 @@ export class WorkflowDefinitionDeployer {
   }
 
   private async populateActionIds(workflowDefinition: WorkflowDefinition, app: App) {
-    let availableAppActions = await getActionsForApp(app);
+    const availableAppActions = await getActionsForApp(app);
     if (!workflowDefinition.workflowDefinition?.paths) {
       return;
     }
@@ -82,7 +82,7 @@ export class WorkflowDefinitionDeployer {
         const actionKey = actionConfiguration.action;
         const action = availableAppActions.find(
           action => action.identifier === getActionDeclarationIdentifier(actionKey, app)
-        )
+        );
         if (!action) {
           throw new Error(`Could not find action ${actionKey} declared in workflow definition ${workflowDefinition.name}`);
         }