@contrail/cli 2.1.20 → 2.1.22

package/dist/helpers/workflow-templates/helper.js

@@ -10,21 +10,22 @@ const event_workflow_action_definition_1 = require("../../api/event-workflow-act
 const event_workflow_templates_1 = require("../../api/event-workflow-templates");
 const login_1 = require("../../auth/login");
 const interface_converters_1 = require("../../interface-converters");
-const yaml = require('js-yaml');
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 class LocalWorkflowTemplateDeployer {
     async deployWorkflows(wtDeclaration) {
         // FETCH ALL WORKFLOWS FROM THE API.
         const existingWorkflows = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
         // UPSERT / DELETE BASED ON WORKFLOW TEMPLATES IDENTIFIER
-        console.log('%s \tDeploying workflow templates.', chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+        logger_1.default.info('%s \tDeploying workflow templates.', chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         for (const workflow of wtDeclaration.workflows) {
             await this.deployWorkflowTemplate(workflow, existingWorkflows);
         }
     }
     async deployWorkflowTemplate(workflow, existingWorkflows) {
-        console.log(`%s \tDeploying workflow: ${workflow.triggerKey}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+        logger_1.default.info(`%s \tDeploying workflow: ${workflow.triggerKey}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         const identifier = getWorkflowTemplateIdentifier(workflow.identifier);
-        const existingTemplate = existingWorkflows.find(ad => ad.identifier === identifier);
+        const existingTemplate = existingWorkflows.find((ad) => ad.identifier === identifier);
         (0, interface_converters_1.convertWorkflow)(workflow);
         if (existingTemplate) {
             return await this.updateWorkflowTemplate(identifier, existingTemplate, workflow);
@@ -44,12 +45,12 @@ class LocalWorkflowTemplateDeployer {
             parallelWorkerCount: workflowTemplate.parallelWorkerCount,
         };
         const newWorkflowTemplate = await (0, event_workflow_templates_1.createWorkflowTemplate)(newObject);
-        console.log(`%s      Created new workflow definition: ${workflowKey}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+        logger_1.default.info(`%s      Created new workflow definition: ${workflowKey}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         return newWorkflowTemplate;
     }
     async populateActionIds(workflowTemplate, workflowKey) {
         var _a;
-        console.log('workflow template:', JSON.stringify(workflowTemplate, null, 2));
+        logger_1.default.info('workflow template:', JSON.stringify(workflowTemplate, null, 2));
         if (!((_a = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.workflowDefinition) === null || _a === void 0 ? void 0 : _a.paths)) {
             return;
         }
@@ -64,7 +65,7 @@ class LocalWorkflowTemplateDeployer {
                     actionConfiguration.id = actionEntity.id;
                 }
                 catch (e) {
-                    console.log(e);
+                    logger_1.default.info(e);
                 }
                 if (!actionConfiguration.id) {
                     throw new Error(`Could not find action ${actionKey} declared in ${workflowKey}`);
@@ -83,28 +84,31 @@ class LocalWorkflowTemplateDeployer {
             messageGroupId: (_a = workflowTemplate.messageGroupId) !== null && _a !== void 0 ? _a : existingWorkflowTemplate.messageGroupId,
             parallelWorkerCount: (_b = workflowTemplate.parallelWorkerCount) !== null && _b !== void 0 ? _b : existingWorkflowTemplate.parallelWorkerCount,
         });
-        const updatedWorkflowTemplate = await (0, event_workflow_templates_1.updateWorkflowTemplate)({ id: existingWorkflowTemplate.id, updates });
-        console.log(`%s      Updated existing workflow template: ${updatedWorkflowTemplate.identifier}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+        const updatedWorkflowTemplate = await (0, event_workflow_templates_1.updateWorkflowTemplate)({
+            id: existingWorkflowTemplate.id,
+            updates,
+        });
+        logger_1.default.info(`%s      Updated existing workflow template: ${updatedWorkflowTemplate.identifier}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         return updatedWorkflowTemplate;
     }
     async deleteWorkflowTemplates(wtDeclaration) {
         // FETCH ALL WORKFLOWS FROM THE API.
         const existingWorkflows = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
         // UPSERT / DELETE BASED ON WORKFLOW TEMPLATES IDENTIFIER
-        console.log('%s \tDELETING workflow templates.', chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+        logger_1.default.info('%s \tDELETING workflow templates.', chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         for (const workflowKey of Object.keys(wtDeclaration.workflows)) {
             const identifier = getWorkflowTemplateIdentifier(workflowKey);
-            const existingTemplate = existingWorkflows.find(ad => ad.identifier === identifier);
+            const existingTemplate = existingWorkflows.find((ad) => ad.identifier === identifier);
             if (existingTemplate) {
                 try {
                     await (0, event_workflow_templates_1.deleteWorkflowTemplate)(identifier);
                 }
                 catch (e) {
-                    console.log('%s \tFAILED to delete workflow template %s.', chalk_1.default.red.bold('WORKFLOW TEMPLATES'), identifier);
+                    logger_1.default.info('%s \tFAILED to delete workflow template %s.', chalk_1.default.red.bold('WORKFLOW TEMPLATES'), identifier);
                 }
             }
             else {
-                console.log('%s \tUnable to locate workflow template %s.', chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'), identifier);
+                logger_1.default.info('%s \tUnable to locate workflow template %s.', chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'), identifier);
             }
         }
     }
@@ -123,22 +127,28 @@ class WorkflowTemplateDeployer {
     async deleteWorkflowTemplates() {
         // FETCH ALL WORKFLOWS FROM THE API.
         const existingWorkflows = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
-        const answers = await inquirer_1.default.prompt([{
+        const answers = await inquirer_1.default.prompt([
+            {
                 type: 'checkbox',
                 name: 'wfTemplatesToDelete',
                 message: 'Which templates would you like to delete (one or more)?',
-                choices: existingWorkflows.map(x => { return { value: x.id, name: `(${x.createdOn}) ${x.name}` }; })
-            }]);
+                choices: existingWorkflows.map((x) => {
+                    return { value: x.id, name: `(${x.createdOn}) ${x.name}` };
+                }),
+            },
+        ]);
         for (const idToDelete of answers.wfTemplatesToDelete) {
             await (0, event_workflow_templates_1.deleteWorkflowTemplate)(idToDelete);
         }
-        console.log('%s \tDeleted workflow templates!', chalk_1.default.green.bold('WORKFLOW TEMPLATES'));
+        logger_1.default.info('%s \tDeleted workflow templates!', chalk_1.default.green.bold('WORKFLOW TEMPLATES'));
     }
     async listExistingWorkflowTemplates() {
         const templates = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
-        console.log('(Date Created) (active) workflow name');
-        console.log('------------------------');
-        console.log(chalk_1.default.green.bold(templates.map(x => `(${x.createdOn}) (${x.isActive ? 'active' : 'inactive'}) ${x.name} `).join('\n')));
+        logger_1.default.info('(Date Created) (active) workflow name');
+        logger_1.default.info('------------------------');
+        logger_1.default.info(chalk_1.default.green.bold(templates
+            .map((x) => `(${x.createdOn}) (${x.isActive ? 'active' : 'inactive'}) ${x.name} `)
+            .join('\n')));
     }
 }
 exports.WorkflowTemplateDeployer = WorkflowTemplateDeployer;
@@ -153,7 +163,7 @@ async function localDeployWorkflowTemplate(saveFileLocation) {
         wtDeclaration = loadTemplateConfig(saveFileLocation);
     }
     catch (e) {
-        console.log(`%s Workflow Deletion Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Workflow Deletion Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
     await (0, login_1.authUser)();
@@ -163,7 +173,7 @@ exports.localDeployWorkflowTemplate = localDeployWorkflowTemplate;
 function loadTemplateConfig(saveFile) {
     const TARGET_DIR = process.cwd();
     try {
-        const doc = yaml.load(fs_1.default.readFileSync(path.resolve(path.join(TARGET_DIR, saveFile)), 'utf8'));
+        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(path.resolve(path.join(TARGET_DIR, saveFile)), 'utf8'));
         return doc;
     }
     catch (e) {
@@ -187,7 +197,7 @@ async function populateActionIdentifiers(workflowTemplate) {
                 delete actionConfiguration.id;
             }
             catch (e) {
-                console.log(e);
+                logger_1.default.info(e);
             }
             if (!actionConfiguration.action) {
                 throw new Error(`Could not find action ${actionId}`);

package/dist/interface-converters.spec.js

@@ -14,11 +14,11 @@ describe('Workflow Template converter tests', () => {
                         actionDefinitionConfigs: [
                             {
                                 action: 'logItem',
-                                name: 'Log Item'
-                            }
-                        ]
-                    }
-                ]
+                                name: 'Log Item',
+                            },
+                        ],
+                    },
+                ],
             },
             ownerKey: 'app:123',
             isActive: true,
@@ -42,11 +42,11 @@ describe('Workflow Template converter tests', () => {
                         actionDefinitionConfigs: [
                             {
                                 action: 'logItem',
-                                name: 'Log Item'
-                            }
-                        ]
-                    }
-                ]
+                                name: 'Log Item',
+                            },
+                        ],
+                    },
+                ],
             },
             ownerKey: 'app:123',
             isActive: true,
@@ -70,11 +70,11 @@ describe('Workflow Template converter tests', () => {
                         actionDefinitionConfigs: [
                             {
                                 action: 'logItem',
-                                name: 'Log Item'
-                            }
-                        ]
-                    }
-                ]
+                                name: 'Log Item',
+                            },
+                        ],
+                    },
+                ],
             },
             ownerKey: 'app:123',
             isActive: true,

package/dist/interfaces.d.ts

@@ -83,6 +83,12 @@ export interface WorkflowTemplate {
     groupId?: string;
     messageGroupId?: string;
     parallelWorkerCount?: number;
+    createdOn?: Date;
+    updatedOn?: Date;
+    createdById?: string;
+    updatedById?: string;
+    createdBy?: any;
+    updatedBy?: any;
 }
 export interface WorkflowDefinitionPaths {
     paths: WorkflowConditional[];

package/dist/logger.d.ts

@@ -0,0 +1,3 @@
+import winston from 'winston';
+declare const logger: winston.Logger;
+export default logger;

package/dist/logger.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const winston_1 = tslib_1.__importStar(require("winston"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+class Logger {
+    constructor() {
+        this.colors = {
+            error: 'red',
+            warn: 'yellow',
+            info: 'green',
+            debug: 'blue',
+        };
+        const transport = new winston_1.transports.Console();
+        winston_1.default.addColors(this.colors);
+        this.logger = (0, winston_1.createLogger)({
+            level: 'info',
+            format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.timestamp(), winston_1.default.format.printf(({ timestamp, level, message }) => {
+                if (lodash_1.default.isObject(message)) {
+                    return `${timestamp} ${level}: ${JSON.stringify(message, null, 2)}`;
+                }
+                return `${timestamp} ${level}: ${message}`;
+            })),
+            transports: [transport],
+        });
+    }
+    static getInstance() {
+        return new Logger().logger;
+    }
+}
+const logger = Logger.getInstance();
+exports.default = logger;

package/dist/templates/typescript/src/actions/logItem.ts

@@ -1,8 +1,13 @@
 import { Entities } from '@contrail/sdk';
-import { Action, AppAction, AppActionCallBack, AppActionCallbackStatus, Logger } from '@contrail/app-framework';
+import {
+  Action,
+  AppAction,
+  AppActionCallBack,
+  AppActionCallbackStatus,
+  Logger,
+} from '@contrail/app-framework';
 
 export class LogItemAction implements AppAction {
-
   @Action('logItem')
   public async execute(event, config: any): Promise<AppActionCallBack> {
     console.log('Starting Example Action');
@@ -18,7 +23,7 @@ export class LogItemAction implements AppAction {
       output: {
         item,
       },
-      status: AppActionCallbackStatus.SUCCESS
+      status: AppActionCallbackStatus.SUCCESS,
     };
   }
-}
+}

package/dist/templates/typescript/src/main.ts

@@ -1,4 +1,13 @@
-import { ContrailAppModule, loadAppConfig, registerAppInfo, runMockServer, AppActionRequest, AppActionResponse, ActionDispatcher, GLOBAL_ACTION_REGISTRY } from '@contrail/app-framework';
+import {
+  ContrailAppModule,
+  loadAppConfig,
+  registerAppInfo,
+  runMockServer,
+  AppActionRequest,
+  AppActionResponse,
+  ActionDispatcher,
+  GLOBAL_ACTION_REGISTRY,
+} from '@contrail/app-framework';
 
 // we can't use static import here. Require only
 import fs from 'fs';
@@ -7,28 +16,24 @@ const pJson = require('../package.json');
 
 const APP_YML_LOCATION = path.resolve(path.join(__dirname, '..', 'app.yml'));
 export class AppModule extends ContrailAppModule {
-
   initModule() {
     // register the app info
     const appConfig = loadAppConfig(APP_YML_LOCATION);
     registerAppInfo({
       appName: appConfig.appIdentifier, //appName is required
-      packageVersion: pJson.version
+      packageVersion: pJson.version,
     });
 
     // register app's actions
     for (const file of fs.readdirSync(path.join(__dirname, 'actions'))) {
       // only parse js and ts file, avoid property files
-      if (
-        file.endsWith('.js') ||
-        (file.endsWith('.ts') && !file.endsWith('.d.ts'))
-      ) {
+      if (file.endsWith('.js') || (file.endsWith('.ts') && !file.endsWith('.d.ts'))) {
         require(path.join(__dirname, 'actions', file));
       }
     }
 
     console.log(`Registered ${Object.keys(GLOBAL_ACTION_REGISTRY).length} action(s):`);
-    for(const key of Object.keys(GLOBAL_ACTION_REGISTRY)) {
+    for (const key of Object.keys(GLOBAL_ACTION_REGISTRY)) {
       console.log(`\t- ${appConfig.appIdentifier}:${key}`);
     }
   }