@contrail/cli 2.1.27 → 2.1.28

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.1.27 darwin-arm64 node-v18.13.0
+@contrail/cli/2.1.28 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -517,7 +517,7 @@ DESCRIPTION
   Display help for contrail.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.6/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.20/src/commands/help.ts)_
 
 ## `contrail instance export`
 
@@ -696,6 +696,8 @@ EXAMPLES
   $ contrail plugins:inspect myplugin
 ```
 
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.3.2/src/commands/plugins/inspect.ts)_
+
 ## `contrail plugins:install PLUGIN...`
 
 Installs a plugin into the CLI.
@@ -734,6 +736,8 @@ EXAMPLES
   $ contrail plugins:install someuser/someplugin
 ```
 
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.3.2/src/commands/plugins/install.ts)_
+
 ## `contrail plugins:link PLUGIN`
 
 Links a plugin into the CLI for development.
@@ -761,6 +765,8 @@ EXAMPLES
   $ contrail plugins:link myplugin
 ```
 
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.3.2/src/commands/plugins/link.ts)_
+
 ## `contrail plugins:uninstall PLUGIN...`
 
 Removes a plugin from the CLI.
@@ -807,6 +813,8 @@ ALIASES
   $ contrail plugins remove
 ```
 
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.3.2/src/commands/plugins/uninstall.ts)_
+
 ## `contrail plugins:uninstall PLUGIN...`
 
 Removes a plugin from the CLI.
@@ -846,6 +854,8 @@ DESCRIPTION
   Update installed plugins.
 ```
 
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v2.3.2/src/commands/plugins/update.ts)_
+
 ## `contrail projects export PROJECTNAME`
 
 Export a project.

package/dist/api/schedules.d.ts

@@ -0,0 +1,7 @@
+export declare function getExistingSchedules(): Promise<any[]>;
+export declare function createSchedule(object: any): Promise<any>;
+export declare function deleteSchedule(id: string): Promise<void>;
+export declare function updateSchedule(options: {
+    id: string;
+    updates: any;
+}): Promise<any>;

package/dist/api/schedules.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateSchedule = exports.deleteSchedule = exports.createSchedule = exports.getExistingSchedules = void 0;
+const sdk_1 = require("@contrail/sdk");
+async function getExistingSchedules() {
+    return await new sdk_1.Entities().get({
+        entityName: 'scheduler',
+    });
+}
+exports.getExistingSchedules = getExistingSchedules;
+async function createSchedule(object) {
+    return await new sdk_1.Entities().create({
+        entityName: 'scheduler',
+        object,
+    });
+}
+exports.createSchedule = createSchedule;
+async function deleteSchedule(id) {
+    return await new sdk_1.Entities().delete({
+        entityName: 'scheduler',
+        id,
+    });
+}
+exports.deleteSchedule = deleteSchedule;
+async function updateSchedule(options) {
+    return await new sdk_1.Entities().update({
+        entityName: 'scheduler',
+        id: options.id,
+        object: options.updates,
+    });
+}
+exports.updateSchedule = updateSchedule;

package/dist/commands/projects/load.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@contrail/sdk");
+const types_1 = require("@contrail/types");
+const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const login_1 = require("../../auth/login");
-const helpers_1 = require("../../helpers/projects/helpers");
-const core_1 = require("@oclif/core");
 const basecommand_1 = require("../../basecommand");
+const helpers_1 = require("../../helpers/projects/helpers");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const types_1 = require("@contrail/types");
 class LoadProject extends basecommand_1.BaseCommand {
     async run() {
         const { args } = await this.parse(LoadProject);

package/dist/helpers/workflow-templates/helper.d.ts

@@ -1,13 +1,15 @@
 import { EventWorkflowActionDefinition, WorkflowTemplate, WorkflowTemplateDeclaration } from '../../interfaces';
 export declare class LocalWorkflowTemplateDeployer {
     deployWorkflows(wtDeclaration: WorkflowTemplateDeclaration): Promise<void>;
-    deployWorkflowTemplate(workflow: WorkflowTemplate, existingWorkflows: WorkflowTemplate[]): Promise<WorkflowTemplate>;
+    deployWorkflowTemplate(workflow: WorkflowTemplate, existingWorkflows: WorkflowTemplate[], appIdentifier: string): Promise<WorkflowTemplate>;
     private createNewWorkflowTemplate;
     private populateActionIds;
+    createWorkflowSchedule(workflowTemplate: WorkflowTemplate, workflowId: string): Promise<any>;
+    updateWorkflowSchedule(workflowTemplate: WorkflowTemplate, workflowId: string): Promise<any>;
     private updateWorkflowTemplate;
     deleteWorkflowTemplates(wtDeclaration: WorkflowTemplateDeclaration): Promise<void>;
 }
-export declare function getWorkflowTemplateIdentifier(workflowKey: string): string;
+export declare function getWorkflowTemplateIdentifier(workflowTemplate: WorkflowTemplate): string;
 export declare function getActionByIdentifier(identifier: string): Promise<EventWorkflowActionDefinition>;
 export declare class WorkflowTemplateDeployer {
     deleteWorkflowTemplates(): Promise<void>;

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

@@ -2,40 +2,44 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.populateActionIdentifiers = exports.localDeployWorkflowTemplate = exports.deleteWorkflowTemplates = exports.WorkflowTemplateDeployer = exports.getActionByIdentifier = exports.getWorkflowTemplateIdentifier = exports.LocalWorkflowTemplateDeployer = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
+const util_1 = require("@contrail/util");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const path = tslib_1.__importStar(require("path"));
+const apps_1 = require("../../api/apps");
 const event_workflow_action_definition_1 = require("../../api/event-workflow-action-definition");
 const event_workflow_templates_1 = require("../../api/event-workflow-templates");
+const schedules_1 = require("../../api/schedules");
 const login_1 = require("../../auth/login");
 const interface_converters_1 = require("../../interface-converters");
 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
         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);
+        logger_1.default.info(wtDeclaration);
+        for (const workflowKey of Object.keys(wtDeclaration.workflows)) {
+            await this.deployWorkflowTemplate(wtDeclaration.workflows[workflowKey], existingWorkflows, wtDeclaration.appIdentifier);
         }
     }
-    async deployWorkflowTemplate(workflow, existingWorkflows) {
+    async deployWorkflowTemplate(workflow, existingWorkflows, appIdentifier) {
         logger_1.default.info(`%s \tDeploying workflow: ${workflow.triggerKey}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
-        const identifier = getWorkflowTemplateIdentifier(workflow.identifier);
+        const identifier = getWorkflowTemplateIdentifier(workflow);
         const existingTemplate = existingWorkflows.find((ad) => ad.identifier === identifier);
         (0, interface_converters_1.convertWorkflow)(workflow);
         if (existingTemplate) {
-            return await this.updateWorkflowTemplate(identifier, existingTemplate, workflow);
+            return await this.updateWorkflowTemplate(identifier, existingTemplate, workflow, appIdentifier);
         }
-        return await this.createNewWorkflowTemplate(identifier, workflow);
+        return await this.createNewWorkflowTemplate(identifier, workflow, appIdentifier);
     }
-    async createNewWorkflowTemplate(workflowKey, workflowTemplate) {
-        await this.populateActionIds(workflowTemplate, workflowKey);
+    async createNewWorkflowTemplate(workflowKey, workflowTemplate, appIdentifier) {
+        await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const newObject = {
-            identifier: getWorkflowTemplateIdentifier(workflowKey),
+            identifier: getWorkflowTemplateIdentifier(workflowTemplate),
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
             workflowDefinition: workflowTemplate.workflowDefinition,
@@ -45,11 +49,16 @@ class LocalWorkflowTemplateDeployer {
             parallelWorkerCount: workflowTemplate.parallelWorkerCount,
         };
         const newWorkflowTemplate = await (0, event_workflow_templates_1.createWorkflowTemplate)(newObject);
+        if (workflowTemplate.crons) {
+            await this.createWorkflowSchedule(workflowTemplate, newWorkflowTemplate.id);
+        }
         logger_1.default.info(`%s      Created new workflow definition: ${workflowKey}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         return newWorkflowTemplate;
     }
-    async populateActionIds(workflowTemplate, workflowKey) {
+    async populateActionIds(workflowTemplate, workflowKey, appIdentifier) {
         var _a;
+        const installedApps = await (0, apps_1.getInstalledApps)();
+        const appOrg = installedApps.find((x) => x.app.identifier === appIdentifier);
         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;
@@ -61,8 +70,14 @@ class LocalWorkflowTemplateDeployer {
             for (const actionConfiguration of path.actionDefinitionConfigs) {
                 const actionKey = actionConfiguration.action;
                 try {
-                    const actionEntity = await getActionByIdentifier(actionKey);
+                    const actionIdentifier = util_1.AppUtil.createActionIdentifier({
+                        actionNameIdentifier: actionKey,
+                        appIdentifier,
+                        versionId: appOrg.appVersionId,
+                    });
+                    const actionEntity = await getActionByIdentifier(actionIdentifier);
                     actionConfiguration.id = actionEntity.id;
+                    actionConfiguration.identifier = actionEntity.identifier;
                 }
                 catch (e) {
                     logger_1.default.info(e);
@@ -73,9 +88,77 @@ class LocalWorkflowTemplateDeployer {
             }
         }
     }
-    async updateWorkflowTemplate(workflowKey, existingWorkflowTemplate, workflowTemplate) {
+    async createWorkflowSchedule(workflowTemplate, workflowId) {
+        var _a;
+        if (!((_a = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.crons) === null || _a === void 0 ? void 0 : _a.length) || !workflowTemplate.id) {
+            return;
+        }
+        const crons = [];
+        for (const cron of workflowTemplate.crons) {
+            crons.push(await (0, schedules_1.createSchedule)({
+                cron: cron.cron,
+                entityReference: `event-workflow-template:${workflowId}`,
+                name: cron.name,
+                requestMethod: 'POST',
+                entityName: 'event-workflow-request',
+                isActive: true,
+                payload: {
+                    event: {},
+                    triggerKey: workflowTemplate.triggerKey,
+                },
+            }));
+        }
+        return crons;
+    }
+    async updateWorkflowSchedule(workflowTemplate, workflowId) {
+        var _a, _b, _c, _d;
+        const existingSchedules = (_a = (await (0, schedules_1.getExistingSchedules)()).filter((x) => (x === null || x === void 0 ? void 0 : x.ownerReference) === `event-workflow-template:${workflowId}`)) !== null && _a !== void 0 ? _a : [];
+        const newSchedules = (_b = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.crons) !== null && _b !== void 0 ? _b : [];
+        const existingCronNames = (_c = existingSchedules.map((x) => x.name)) !== null && _c !== void 0 ? _c : [];
+        const newCronNames = (_d = newSchedules.map((x) => x.name)) !== null && _d !== void 0 ? _d : [];
+        const cronsToAdd = newSchedules.filter((x) => !existingCronNames.includes(x.name));
+        const cronsToRemove = existingSchedules.filter((x) => !newCronNames.includes(x.name));
+        const cronsToEdit = existingSchedules.filter((x) => newCronNames.includes(x.name));
+        for (const cron of cronsToAdd) {
+            logger_1.default.info(`%s      Adding new schedule: ${cron.name}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+            await (0, schedules_1.createSchedule)({
+                cron: cron.cron,
+                entityReference: `event-workflow-template:${workflowId}`,
+                name: cron.name,
+                requestMethod: 'POST',
+                entityName: 'event-workflow-request',
+                isActive: true,
+                payload: {
+                    event: {},
+                    triggerKey: workflowTemplate.triggerKey,
+                },
+            });
+        }
+        for (const cron of cronsToRemove) {
+            logger_1.default.info(`%s      Removing schedule: ${cron.name}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+            await (0, schedules_1.deleteSchedule)(cron.id);
+        }
+        for (const cron of cronsToEdit) {
+            logger_1.default.info(`%s      Updating schedule: ${cron.name}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
+            const newCron = workflowTemplate.crons.find((x) => x.name === cron.name);
+            await (0, schedules_1.updateSchedule)({
+                id: cron.id,
+                updates: {
+                    cron: newCron.cron,
+                    requestMethod: 'POST',
+                    entityName: 'event-workflow-request',
+                    isActive: true,
+                    payload: {
+                        event: {},
+                        triggerKey: workflowTemplate.triggerKey,
+                    },
+                },
+            });
+        }
+    }
+    async updateWorkflowTemplate(workflowKey, existingWorkflowTemplate, workflowTemplate, appIdentifier) {
         var _a, _b;
-        await this.populateActionIds(workflowTemplate, workflowKey);
+        await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const updates = Object.assign(new Object(), {
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
@@ -88,6 +171,7 @@ class LocalWorkflowTemplateDeployer {
             id: existingWorkflowTemplate.id,
             updates,
         });
+        await this.updateWorkflowSchedule(workflowTemplate, updatedWorkflowTemplate.id);
         logger_1.default.info(`%s      Updated existing workflow template: ${updatedWorkflowTemplate.identifier}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         return updatedWorkflowTemplate;
     }
@@ -97,7 +181,7 @@ class LocalWorkflowTemplateDeployer {
         // UPSERT / DELETE BASED ON WORKFLOW TEMPLATES IDENTIFIER
         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 identifier = getWorkflowTemplateIdentifier(wtDeclaration.workflows[workflowKey]);
             const existingTemplate = existingWorkflows.find((ad) => ad.identifier === identifier);
             if (existingTemplate) {
                 try {
@@ -114,8 +198,8 @@ class LocalWorkflowTemplateDeployer {
     }
 }
 exports.LocalWorkflowTemplateDeployer = LocalWorkflowTemplateDeployer;
-function getWorkflowTemplateIdentifier(workflowKey) {
-    return workflowKey;
+function getWorkflowTemplateIdentifier(workflowTemplate) {
+    return workflowTemplate.identifier;
 }
 exports.getWorkflowTemplateIdentifier = getWorkflowTemplateIdentifier;
 async function getActionByIdentifier(identifier) {

package/dist/interfaces.d.ts

@@ -77,6 +77,7 @@ export interface WorkflowDefinition {
     parallelWorkerCount?: number;
 }
 export interface WorkflowTemplateDeclaration {
+    appIdentifier: string;
     workflows?: WorkflowTemplate[];
 }
 export interface WorkflowTemplate {
@@ -88,6 +89,7 @@ export interface WorkflowTemplate {
     workflowDefinition: WorkflowDefinitionPaths;
     isActive: boolean;
     ownerKey?: string;
+    crons?: CronDeclaration[];
     supportingAppId?: string;
     parallelism?: number;
     groupId?: string;
@@ -368,3 +370,7 @@ export declare enum PropertyType {
     Image = "image",
     Json = "json"
 }
+export interface CronDeclaration {
+    name: string;
+    cron: string;
+}

package/dist/templates/typescript/app.yml

@@ -29,6 +29,7 @@ actions:
 
 workflows:
   logItemUpdate:
+    identifier: "logItemUpdate"
     name: "Item Update -> Log"
     triggerKey: item|update
     isActive: true

package/dist/templates/typescript/package.json

@@ -14,7 +14,8 @@
     "build": "tsc; npx copyfiles  assets/**/* dist/",
     "start": "nodemon --watch \"src/**/*.ts\" --exec ts-node src/main.ts",
     "debug": "nodemon -r ts-node/register --inspect=127.0.0.1:60002 --watch 'actions/**/*.ts' --exec node src/main.ts",
-    "lint": "eslint . --fix",
+    "lint": "eslint --config eslintrc.json .",
+    "lint-fix": "eslint --fix --config eslintrc.json .",
     "test": "jest",
     "test-watch": "jest --watch"
   },

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.27",
+  "version": "2.1.28",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.1.27",
+  "version": "2.1.28",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -61,7 +61,7 @@
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^5.0.0",
     "jest": "^29.5.0",
-    "oclif": "^3",
+    "oclif": "3.16",
     "prettier": "^3.0.0",
     "shx": "^0.3.3",
     "ts-jest": "^29.0.5",