@contrail/cli 1.0.31 → 1.0.32

package/lib/types/parse-types.js

@@ -12,11 +12,11 @@ export async function ParseTypesFromLocalFiles(args) {
         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'));
@@ -30,11 +30,11 @@ export async function ParseTypesFromFiles(args) {
         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'));
@@ -48,13 +48,13 @@ export async function ParseTypesFromTemplateFromLocalFiles(args) {
         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'));
+        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) {
         console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));

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.31",
+  "version": "1.0.32",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
+    "lint": "eslint . --fix",
     "test": "jest --watch"
   },
   "author": "",
@@ -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}`);
         }

package/src/auth/login.ts

@@ -5,151 +5,151 @@ import { Auth, AuthContext } from './auth';
 import { getConfig, storeConfig } from '../config/config';
 
 const CONFIGURATION = {
-    userPoolId: 'us-east-1_x8hXZUsL6',
-    clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
+  userPoolId: 'us-east-1_x8hXZUsL6',
+  clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
 };
 
 export async function authUser(): Promise<AuthContext> {
-    console.debug("authorizing user")
-    const config = await getConfig();
-    if (
-        config &&
+  console.debug('authorizing user');
+  const config = await getConfig();
+  if (
+    config &&
         config.apiUserToken &&
         config.apiGateway &&
         config.orgSlug
-    ) {
-        console.debug("populating auth config from fs config")
-        Auth.config = {
-            apiUserToken: config.apiUserToken,
-            apiGateway: config.apiGateway,
-            orgSlug: config.orgSlug,
-        };
-        setSdkConfig(Auth.config);
-        try {
-            return await refreshCurrentUserOrg();
-        } catch (e) {
-            console.log("Token expired. Requesting auth credentials...")
-        }
-
-    }
-    const questions = [];
-    if (!process.env.CONTRAIL_CLI_EMAIL) {
-        questions.push({
-            type: 'input',
-            name: 'email',
-            validate: (val) => !!val,
-            message: 'Email',
-        });
-    }
-    if (!process.env.CONTRAIL_CLI_PASSWORD) {
-        questions.push({
-            type: 'password',
-            name: 'password',
-            validate: (val) => !!val,
-            message: 'Password',
-        });
-    }
-    if (!process.env.CONTRAIL_CLI_ORGSLUG) {
-        questions.push({
-            type: 'input',
-            name: 'orgSlug',
-            validate: (val) => !!val,
-            message: 'Org (slug)',
-        });
-    }
-
-    const answers = await inquirer.prompt(questions);
-    const params = {
-        email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
-        password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
-        orgSlug: process.env.CONTRAIL_CLI_ORGSLUG || answers.orgSlug,
+  ) {
+    console.debug('populating auth config from fs config');
+    Auth.config = {
+      apiUserToken: config.apiUserToken,
+      apiGateway: config.apiGateway,
+      orgSlug: config.orgSlug,
     };
-    if (!params.email || !params.password) {
-        throw new Error('Email and Password required');
+    setSdkConfig(Auth.config);
+    try {
+      return await refreshCurrentUserOrg();
+    } catch (e) {
+      console.log('Token expired. Requesting auth credentials...');
     }
 
-    const poolData = {
-        UserPoolId: CONFIGURATION.userPoolId,
-        ClientId: CONFIGURATION.clientId,
-    };
+  }
+  const questions = [];
+  if (!process.env.CONTRAIL_CLI_EMAIL) {
+    questions.push({
+      type: 'input',
+      name: 'email',
+      validate: (val) => !!val,
+      message: 'Email',
+    });
+  }
+  if (!process.env.CONTRAIL_CLI_PASSWORD) {
+    questions.push({
+      type: 'password',
+      name: 'password',
+      validate: (val) => !!val,
+      message: 'Password',
+    });
+  }
+  if (!process.env.CONTRAIL_CLI_ORGSLUG) {
+    questions.push({
+      type: 'input',
+      name: 'orgSlug',
+      validate: (val) => !!val,
+      message: 'Org (slug)',
+    });
+  }
 
-    const userPool = new AmazonCognitoIdentity.CognitoUserPool(poolData);
-    const authData = {
-        Username: params.email,
-        Password: params.password,
-    };
+  const answers = await inquirer.prompt(questions);
+  const params = {
+    email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
+    password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
+    orgSlug: process.env.CONTRAIL_CLI_ORGSLUG || answers.orgSlug,
+  };
+  if (!params.email || !params.password) {
+    throw new Error('Email and Password required');
+  }
 
-    const authDetails = new AmazonCognitoIdentity.AuthenticationDetails(authData);
-    const userData = {
-        Username: params.email,
-        Pool: userPool,
-    };
+  const poolData = {
+    UserPoolId: CONFIGURATION.userPoolId,
+    ClientId: CONFIGURATION.clientId,
+  };
+
+  const userPool = new AmazonCognitoIdentity.CognitoUserPool(poolData);
+  const authData = {
+    Username: params.email,
+    Password: params.password,
+  };
+
+  const authDetails = new AmazonCognitoIdentity.AuthenticationDetails(authData);
+  const userData = {
+    Username: params.email,
+    Pool: userPool,
+  };
 
-    const cognitoUser = new AmazonCognitoIdentity.CognitoUser(userData);
+  const cognitoUser = new AmazonCognitoIdentity.CognitoUser(userData);
 
-    return new Promise((resolve, reject) => {
-        cognitoUser.authenticateUser(authDetails, {
-            onSuccess: async (result) => {
-                const user = result;
-                const config = await setAuthContext(user, params);
+  return new Promise((resolve, reject) => {
+    cognitoUser.authenticateUser(authDetails, {
+      onSuccess: async (result) => {
+        const user = result;
+        const config = await setAuthContext(user, params);
 
-                resolve(config);
-            },
-            onFailure: (err) => {
-                reject(err);
-            },
-        });
+        resolve(config);
+      },
+      onFailure: (err) => {
+        reject(err);
+      },
     });
+  });
 }
 
 async function setAuthContext(user, params): Promise<AuthContext> {
-    const config = await getConfig();
-    let apiGateway;
-    console.log(config.environments)
-    if(config.environments) {
-        const questions = [];
-        questions.push({
-            type: 'list',
-            name: 'environment',
-            message: 'Which environment would you like to use?',
-            choices: Object.keys(config.environments),
-            default: Object.keys(config.environments)[0],
-        });
-        const answers = await inquirer.prompt(questions);
-        apiGateway = config.environments[answers.environment]
-    } else {
-        apiGateway = 'https://api.vibeiq.com/prod/api';
-    }
+  const config = await getConfig();
+  let apiGateway;
+  console.log(config.environments);
+  if(config.environments) {
+    const questions = [];
+    questions.push({
+      type: 'list',
+      name: 'environment',
+      message: 'Which environment would you like to use?',
+      choices: Object.keys(config.environments),
+      default: Object.keys(config.environments)[0],
+    });
+    const answers = await inquirer.prompt(questions);
+    apiGateway = config.environments[answers.environment];
+  } else {
+    apiGateway = 'https://api.vibeiq.com/prod/api';
+  }
 
-    // Set Auth Config
-    Auth.config = {
-        apiUserToken: user.idToken.jwtToken,
-        apiGateway,
-        orgSlug: params.orgSlug,
-    };
-    // SET SDK CONFIG
-    setSdkConfig(Auth.config);
+  // Set Auth Config
+  Auth.config = {
+    apiUserToken: user.idToken.jwtToken,
+    apiGateway,
+    orgSlug: params.orgSlug,
+  };
+  // SET SDK CONFIG
+  setSdkConfig(Auth.config);
 
-    return refreshCurrentUserOrg();
+  return refreshCurrentUserOrg();
 }
 
 async function refreshCurrentUserOrg() {
-    console.debug("refreshing current user org")
-    const currentUser = await Request.request('/users/current', {
-        method: 'GET',
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-        },
-    });
-    if (!currentUser) {
-        throw Error('Could not get current user');
-    }
-    const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
-    if (org) {
-        Auth.config.orgId = org.orgId || org.id;
-    }
-    // cache config in the fs
-    storeConfig(Object.assign({}, Auth.config))
-    return Object.assign({}, Auth.config);
+  console.debug('refreshing current user org');
+  const currentUser = await Request.request('/users/current', {
+    method: 'GET',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+  });
+  if (!currentUser) {
+    throw Error('Could not get current user');
+  }
+  const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
+  if (org) {
+    Auth.config.orgId = org.orgId || org.id;
+  }
+  // cache config in the fs
+  storeConfig(Object.assign({}, Auth.config));
+  return Object.assign({}, Auth.config);
 }