@contrail/cli 2.1.15 → 2.1.16

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.1.15 darwin-arm64 node-v18.13.0
+@contrail/cli/2.1.16 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/api/apps.d.ts

@@ -1,6 +1,6 @@
 import { App, AppOrg, AppVersion, WorkflowDefinition } from '../interfaces';
-export declare function getWorkflowTemplateDefinitionsForApp(options: {
-    appId: string;
+export declare function getWorkflowTemplateDefinitionsForAppVersion(options: {
+    appVersionId: string;
 }): Promise<WorkflowDefinition[]>;
 export declare function getAppVersions(app: any): Promise<AppVersion[]>;
 export declare function upgradeAppVersion(appOrg: any, appVersionId: any): Promise<AppOrg>;

package/dist/api/apps.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAvailableApps = exports.installAppToOrg = exports.getInstalledApps = exports.deleteAppOrg = exports.upgradeAppVersion = exports.getAppVersions = exports.getWorkflowTemplateDefinitionsForApp = void 0;
+exports.getAvailableApps = exports.installAppToOrg = exports.getInstalledApps = exports.deleteAppOrg = exports.upgradeAppVersion = exports.getAppVersions = exports.getWorkflowTemplateDefinitionsForAppVersion = void 0;
 const auth_1 = require("../auth/auth");
 const sdk_1 = require("@contrail/sdk");
-async function getWorkflowTemplateDefinitionsForApp(options) {
+async function getWorkflowTemplateDefinitionsForAppVersion(options) {
     return await new sdk_1.Entities().get({
         entityName: 'event-workflow-template-definition',
         criteria: {
-            ownerKey: `app:${options.appId}`
+            ownerKey: `appVersion:${options.appVersionId}`
         }
     });
 }
-exports.getWorkflowTemplateDefinitionsForApp = getWorkflowTemplateDefinitionsForApp;
+exports.getWorkflowTemplateDefinitionsForAppVersion = getWorkflowTemplateDefinitionsForAppVersion;
 async function getAppVersions(app) {
     return await new sdk_1.Entities().get({
         entityName: 'app-version',

package/dist/commands/app/install.js

@@ -82,7 +82,7 @@ class InstallApp extends core_1.Command {
             }
         }
         if (flags.installWorkflowTemplates) {
-            const workflowTemplateDefinitions = await (0, apps_1.getWorkflowTemplateDefinitionsForApp)({ appId: app.id });
+            const workflowTemplateDefinitions = await (0, apps_1.getWorkflowTemplateDefinitionsForAppVersion)({ appVersionId: appOrg.appVersionId });
             if (!workflowTemplateDefinitions.length) {
                 return;
             }

package/dist/helpers/app/actions-deployer.js

@@ -15,7 +15,7 @@ async function getActionsForAppVersion(app) {
 }
 exports.getActionsForAppVersion = getActionsForAppVersion;
 function getActionDeclarationIdentifier(actionKey, app) {
-    return app.identifier + ':' + actionKey;
+    return `${app.identifier}@${app.latestAppVersionId}:${actionKey}`;
 }
 exports.getActionDeclarationIdentifier = getActionDeclarationIdentifier;
 async function deleteAction(actionId) {
@@ -28,21 +28,14 @@ class ActionsDeployer {
         const existingActions = await getActionsForAppVersion(app);
         // UPSERT / DELETE BASED ON ACTION IDENTIFIER
         console.log('%s \tDeploying actions.', chalk_1.default.yellow.bold('ACTION'));
-        let appActionIdentifiers = [];
         if (appDeclaration.actions) {
             const localActionKeys = Object.keys(appDeclaration.actions);
-            appActionIdentifiers = localActionKeys.map(x => getActionDeclarationIdentifier(x, app));
             if ((localActionKeys === null || localActionKeys === void 0 ? void 0 : 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_1.default.yellow.bold('ACTION'));
-            await deleteAction(action.id);
-        }
     }
     async deployAction(actionKey, actionDeclaration, app, existingActions) {
         console.log(`%s \tDeploying action: ${actionKey}`, chalk_1.default.yellow.bold('ACTION'));

package/dist/helpers/workflow-template-definitions/workflow-template-definition-deployer.js

@@ -11,8 +11,8 @@ const actions_deployer_1 = require("../app/actions-deployer");
 const interface_converters_1 = require("../../interface-converters");
 class WorkflowTemplateDefinitionDeployer {
     async cliInstallWorkflowTemplateDefinitions() {
-        const installedApps = await (0, apps_1.getInstalledApps)();
-        if (!installedApps.length) {
+        const installedAppOrgs = await (0, apps_1.getInstalledApps)();
+        if (!installedAppOrgs.length) {
             console.log('%s \nNo apps are currently installed. You must install an app before installing its associated workflow template definitions.', chalk_1.default.red.bold('WORKFLOW DEFINITION'));
             return;
         }
@@ -20,10 +20,10 @@ class WorkflowTemplateDefinitionDeployer {
                 type: 'list',
                 name: 'appIdentifier',
                 message: 'Which app\'s workflow would you like to install?',
-                choices: installedApps.map(x => x.app.identifier)
+                choices: installedAppOrgs.map(x => x.app.identifier)
             }]);
-        const app = installedApps.find(x => x.app.identifier === answers.appIdentifier).app;
-        const workflowTemplateDefinitions = await (0, apps_1.getWorkflowTemplateDefinitionsForApp)({ appId: app.id });
+        const appOrg = installedAppOrgs.find(x => x.app.identifier === answers.appIdentifier);
+        const workflowTemplateDefinitions = await (0, apps_1.getWorkflowTemplateDefinitionsForAppVersion)({ appVersionId: appOrg.appVersionId });
         for (const definition of workflowTemplateDefinitions) {
             console.log(chalk_1.default.yellow.bold(`- ${definition.name}`));
         }
@@ -58,10 +58,10 @@ class WorkflowTemplateDefinitionDeployer {
         console.log(`%s \n ${workflowTemplateDefinitionsToInstall.length} workflows installed`, chalk_1.default.green.bold('WORKFLOW DEFINITION'));
     }
     async listWorkflowTemplateDefinitions() {
-        const installedApps = await (0, apps_1.getInstalledApps)();
+        const installedAppOrgs = await (0, apps_1.getInstalledApps)();
         const workflowTemplateDefinitions = [];
-        for (const appOrg of installedApps) {
-            workflowTemplateDefinitions.push(...await (await (0, apps_1.getWorkflowTemplateDefinitionsForApp)({ appId: appOrg.appId })).map(x => {
+        for (const appOrg of installedAppOrgs) {
+            workflowTemplateDefinitions.push(...await (await (0, apps_1.getWorkflowTemplateDefinitionsForAppVersion)({ appVersionId: appOrg.appVersionId })).map(x => {
                 return {
                     appName: appOrg.app.name,
                     workflowName: x.name,
@@ -74,7 +74,7 @@ class WorkflowTemplateDefinitionDeployer {
     }
     async deployWorkflowTemplateDefinitions(appDeclaration, app) {
         // FETCH ALL WORKFLOWS FROM THE API.
-        const existingWorkflows = await (0, apps_1.getWorkflowTemplateDefinitionsForApp)({ appId: app.id });
+        const existingWorkflows = await (0, apps_1.getWorkflowTemplateDefinitionsForAppVersion)({ appVersionId: app.latestAppVersionId });
         // UPSERT / DELETE BASED ON WORKFLOW IDENTIFIER
         console.log('%s \tDeploying workflow definitions.', chalk_1.default.yellow.bold('WORKFLOW DEFINITION'));
         if (appDeclaration.workflows) {
@@ -84,12 +84,6 @@ class WorkflowTemplateDefinitionDeployer {
                     await this.deployWorkflow(workflowKey, appDeclaration.workflows[workflowKey], app, existingWorkflows);
                 }
             }
-            // remove old templates that were removed by the app publisher
-            const localIdentifiers = localWorkflows.map(x => this.getWorkflowDeclarationIdentifier(x, app));
-            const workflowTemplateDefinitionsToDelete = existingWorkflows.filter(x => !localIdentifiers.includes(x.identifier));
-            for (const templateToDelete of workflowTemplateDefinitionsToDelete) {
-                await (0, event_workflow_template_definition_1.deleteWorkflowTemplateDefinition)(templateToDelete.id);
-            }
         }
     }
     async deployWorkflow(workflowKey, workflow, app, existingWorkflows) {
@@ -156,7 +150,7 @@ class WorkflowTemplateDefinitionDeployer {
         return updatedWorkflowDefinition;
     }
     getWorkflowDeclarationIdentifier(actionKey, app) {
-        return app.identifier + ':' + actionKey;
+        return `${app.identifier}@${app.latestAppVersionId}:${actionKey}`;
     }
 }
 exports.WorkflowTemplateDefinitionDeployer = WorkflowTemplateDefinitionDeployer;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.15",
+  "version": "2.1.16",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.1.15",
+  "version": "2.1.16",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",