@contrail/cli 1.0.23 → 1.0.25

package/lib/apps/deploy-app/app-deployer.js

@@ -57,6 +57,8 @@ export class AppDeployer {
             keywords: appDeclaration.keywords,
             configProperties,
             triggerKeyDefinitions,
+            isDockerBased: appDeclaration.isDockerBased,
+            dockerImageRef: appDeclaration.dockerImageRef,
         };
         const app = await new Entities().create({ entityName: 'app', object: newApp });
         console.log(`%s      Created new app: ${app.name}`, chalk.yellow.bold('APP'));
@@ -81,6 +83,7 @@ export class AppDeployer {
             keywords: appDeclaration.keywords,
             configProperties,
             triggerKeyDefinitions,
+            isDockerBased: appDeclaration.isDockerBased,
         };
         const app = await new Entities().update({ entityName: 'app', id: existingApp.id, object: updates });
         console.log(`%s      Updated app: ${app.name}`, chalk.yellow.bold('APP'));

package/lib/apps/deploy-app/docker-action-builder.d.ts

@@ -0,0 +1,10 @@
+import { App, AppDeclaration, AppActionDeclaration } from '../../interfaces';
+export declare class ActionsDeployer {
+    deployActions(appDeclaration: AppDeclaration, app: App): Promise<void>;
+    getActionsForApp(app: App): Promise<any>;
+    deployAction(actionKey: string, actionDeclaration: AppActionDeclaration, app: App, existingActions: Array<any>): Promise<void>;
+    private createNewActionDefinition;
+    private updateActionDefinition;
+    getActionDeclarationIdentifier(actionKey: any, app: App): string;
+    getFunction(actionDeclaration: AppActionDeclaration): Promise<string>;
+}

package/lib/apps/deploy-app/docker-action-builder.js

@@ -0,0 +1,97 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import { ConfigPropertiesParser } from './app-template-parsers';
+import { getSeparatorByPlatform } from '../../common';
+import fs from 'fs';
+export class ActionsDeployer {
+    async deployActions(appDeclaration, app) {
+        // FETCH ALL ACTIONS FROM THE API.
+        const existingActions = await this.getActionsForApp(app);
+        // UPSERT / DELETE BASED ON ACTION IDENTIFIER
+        console.log('%s \tDeploying actions.', chalk.yellow.bold('ACTION'));
+        for (const actionKey of Object.keys(appDeclaration.actions)) {
+            await this.deployAction(actionKey, appDeclaration.actions[actionKey], app, existingActions);
+        }
+    }
+    async getActionsForApp(app) {
+        return await new Entities().get({
+            entityName: 'event-workflow-action-definition',
+            criteria: { ownerKey: `app:${app.id}` },
+        });
+    }
+    async deployAction(actionKey, actionDeclaration, app, existingActions) {
+        console.log(`%s \tDeploying action: ${actionKey}`, chalk.yellow.bold('ACTION'));
+        const identifier = this.getActionDeclarationIdentifier(actionKey, app);
+        const existingDefinition = existingActions.find(ad => ad.identifier === identifier);
+        if (!existingDefinition) {
+            await this.createNewActionDefinition(actionKey, actionDeclaration, app);
+        }
+        else {
+            await this.updateActionDefinition(existingDefinition, actionDeclaration);
+        }
+    }
+    async createNewActionDefinition(actionKey, actionDeclaration, app) {
+        let configProperties;
+        if (actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) {
+            configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
+        }
+        const newObject = {
+            identifier: this.getActionDeclarationIdentifier(actionKey, app),
+            name: actionDeclaration.name,
+            ownerKey: `app:${app.id}`,
+            public: app.public,
+            configProperties,
+        };
+        const functionString = await this.getFunction(actionDeclaration);
+        if (functionString) {
+            newObject.executeFunctionString = functionString;
+        }
+        const actionDefinition = await new Entities().create({
+            entityName: 'event-workflow-action-definition',
+            object: newObject,
+        });
+        console.log(`%s      Created new action definition: ${actionKey}`, chalk.yellow.bold('APP'));
+        return actionDefinition;
+    }
+    async updateActionDefinition(existingActionDefinition, actionDeclaration) {
+        let configProperties;
+        if (actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) {
+            configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
+        }
+        else if (!(actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) && existingActionDefinition.configProperties) {
+            configProperties = null;
+        }
+        const updates = {
+            name: actionDeclaration.name,
+            // public: actionDeclaration.public, // TODO - an actions visibility is allowed to change
+            configProperties,
+        };
+        const functionString = await this.getFunction(actionDeclaration);
+        if (functionString) {
+            updates.executeFunctionString = functionString;
+        }
+        const actionDefinition = await new Entities().update({
+            entityName: 'event-workflow-action-definition',
+            id: existingActionDefinition.id,
+            object: updates,
+        });
+        console.log(`%s      Updated existing action definition: ${actionDefinition.identifier}`, chalk.yellow.bold('APP'));
+        return actionDefinition;
+    }
+    getActionDeclarationIdentifier(actionKey, app) {
+        return app.identifier + ':' + actionKey;
+    }
+    async getFunction(actionDeclaration) {
+        if (!actionDeclaration.handler) {
+            return;
+        }
+        if (!actionDeclaration.handler.endsWith('.js')) {
+            throw new Error('Action handler must be a .js file.');
+        }
+        const CURRENT_DIR = process.cwd();
+        const separator = getSeparatorByPlatform();
+        const functionLocation = CURRENT_DIR + separator + actionDeclaration.handler;
+        const content = fs.readFileSync(functionLocation);
+        return content.toString();
+    }
+}

package/lib/apps/deploy-app/interfaces.d.ts

@@ -18,9 +18,7 @@ export interface AppDeclaration {
     triggers: {
         [key: string]: AppTriggerDeclaration;
     };
-    workflows?: {
-        [key: string]: WorkflowDefinitionDeclaration | WorkflowTemplateDeclaration;
-    };
+    isDockerBased?: boolean;
 }
 export interface ConfigPropertyElements {
     [key: string]: ConfigPropertyElement;
@@ -42,44 +40,6 @@ export interface AppTriggerDeclaration {
     external?: boolean;
     description?: string;
 }
-export interface WorkflowDefinitionDeclaration {
-    id?: string;
-    identifier: string;
-    name: string;
-    triggerKey: string;
-    workflowDefinition: WorkflowDefinition;
-    ownerKey: string;
-    isActive: boolean;
-    public: boolean;
-    supportingAppId?: string;
-}
-export interface WorkflowTemplateDeclaration {
-    id?: string;
-    identifier: string;
-    name: string;
-    triggerKey: string;
-    workflowDefinition: WorkflowDefinition;
-    ownerKey: string;
-    isActive: boolean;
-    supportingAppId?: string;
-    messageGroupId?: string;
-    parallelWorkerCount?: number;
-}
-export interface WorkflowDefinition {
-    paths: WorkflowConditional[];
-}
-export interface WorkflowConditional {
-    conditional: string;
-    actionDefinitionConfigs: ActionDefinitionConfig[];
-}
-export interface ActionDefinitionConfig {
-    name: string;
-    action: string;
-    config?: {
-        [key: string]: any;
-    };
-    id?: string;
-}
 export interface App {
     id: string;
     identifier: string;
@@ -106,6 +66,7 @@ export interface EventWorkflowActionDefinition {
     ownerKey?: string;
     public?: boolean;
     configProperties?: ConfigProperty[];
+    isDockerBased?: boolean;
 }
 export declare class TriggerKeyDefinition {
     name: string;

package/lib/interfaces.d.ts

@@ -21,6 +21,8 @@ export interface AppDeclaration {
     workflows?: {
         [key: string]: WorkflowDefinition | WorkflowTemplateDeclaration;
     };
+    isDockerBased?: boolean;
+    dockerImageRef?: string;
 }
 export interface ConfigPropertyElements {
     [key: string]: ConfigPropertyElement;
@@ -113,6 +115,7 @@ export interface EventWorkflowActionDefinition {
     ownerKey?: string;
     public?: boolean;
     configProperties?: ConfigProperty[];
+    isDockerBased?: boolean;
 }
 export declare class TriggerKeyDefinition {
     name: string;

package/lib/workflows/workflow-template-deployer.js

@@ -56,9 +56,7 @@ export class WorkflowTemplateDeployer {
                 const actionKey = actionConfiguration.action;
                 try {
                     const actionEntity = await getActionByIdentifier(actionKey);
-                    console.log("response for action find:", actionEntity);
                     actionConfiguration.id = actionEntity.id;
-                    console.log("found action id:", actionEntity.id);
                 }
                 catch (e) {
                     console.log(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

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

@@ -65,6 +65,8 @@ export class AppDeployer {
       keywords: appDeclaration.keywords,
       configProperties,
       triggerKeyDefinitions,
+      isDockerBased: appDeclaration.isDockerBased,
+      dockerImageRef: appDeclaration.dockerImageRef,
     };
     const app = await new Entities().create({ entityName: 'app', object: newApp });
     console.log(`%s      Created new app: ${app.name}`, chalk.yellow.bold('APP'));
@@ -93,6 +95,7 @@ export class AppDeployer {
       keywords: appDeclaration.keywords,
       configProperties,
       triggerKeyDefinitions,
+      isDockerBased: appDeclaration.isDockerBased,
     };
     const app = await new Entities().update({ entityName: 'app', id: existingApp.id, object: updates });
     console.log(`%s      Updated app: ${app.name}`, chalk.yellow.bold('APP'));

package/src/interfaces.ts

@@ -14,7 +14,9 @@ export interface AppDeclaration {
   actions?: { [key: string]: AppActionDeclaration };
   appConfiguration: ConfigPropertyElements;
   triggers: { [key: string]: AppTriggerDeclaration };
-  workflows?: { [key: string]: WorkflowDefinition|WorkflowTemplateDeclaration }
+  workflows?: { [key: string]: WorkflowDefinition|WorkflowTemplateDeclaration };
+  isDockerBased?: boolean;
+  dockerImageRef?: string;
 }
 
 export interface ConfigPropertyElements {
@@ -116,6 +118,7 @@ export interface EventWorkflowActionDefinition {
   ownerKey?: string;
   public?: boolean;
   configProperties?: ConfigProperty[];
+  isDockerBased?: boolean;
 }
 
 export class TriggerKeyDefinition {

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

@@ -75,9 +75,7 @@ export class WorkflowTemplateDeployer {
         const actionKey = actionConfiguration.action;
         try {
           const actionEntity: any = await getActionByIdentifier(actionKey);
-          console.log("response for action find:", actionEntity)
           actionConfiguration.id = actionEntity.id;
-          console.log("found action id:", actionEntity.id)
         } catch (e) {
           console.log(e)
         }

package/templates/typescript/app.yml

@@ -4,6 +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
 
 # 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 '.'