@contrail/cli 2.3.1 → 2.3.3

package/README.md

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

package/dist/commands/app/create.js

@@ -76,6 +76,7 @@ class CreateApp extends basecommand_1.BaseCommand {
             appName: answers.appName,
             appIdentifier: sanitizedIdentifier,
             appDescription: answers.appDescription,
+            appPublisher: answers.appPublisher,
         });
     }
 }

package/dist/commands/app/init.js

@@ -57,6 +57,7 @@ class CreateApp extends basecommand_1.BaseCommand {
             appName: answers.appName,
             appIdentifier: sanitizedIdentifier,
             appDescription: answers.appDescription,
+            appPublisher: answers.appPublisher,
         });
     }
 }

package/dist/helpers/app/setup-template.d.ts

@@ -2,6 +2,7 @@ interface AppSetUpInputs {
     appName: string;
     appIdentifier: string;
     appDescription: string;
+    appPublisher: string;
 }
 export declare function setUpTemplate(appInput: AppSetUpInputs): Promise<void>;
 export {};

package/dist/helpers/app/setup-template.js

@@ -37,7 +37,8 @@ async function setUpTemplate(appInput) {
         const newAppYml = appYml
             .replace(/APP_IDENTIFIER_STUB/g, appInput.appIdentifier)
             .replace(/APP_NAME_STUB/g, appInput.appName)
-            .replace(/APP_DESCRIPTION_STUB/g, appInput.appDescription);
+            .replace(/APP_DESCRIPTION_STUB/g, appInput.appDescription)
+            .replace(/APP_PUBLISHER_STUB/g, appInput.appPublisher);
         fs_1.default.writeFileSync(appYmlFileLoc, newAppYml);
     }
     catch (e) {

package/dist/helpers/workflow-template-definitions/workflow-template-definition-deployer.d.ts

@@ -4,10 +4,9 @@ export declare class WorkflowTemplateDefinitionDeployer {
     installWorkflowTemplateDefinitions(workflowTemplateDefinitions: WorkflowTemplate[]): Promise<void>;
     listWorkflowTemplateDefinitions(): Promise<void>;
     deployWorkflowTemplateDefinitions(appDeclaration: AppDeclaration, app: App): Promise<void>;
-    deployWorkflow(workflowKey: string, workflow: WorkflowDefinition, app: App, existingWorkflows: Array<any>): Promise<WorkflowDefinition>;
+    deployWorkflowDefinition(workflowKey: string, workflow: WorkflowDefinition, app: App): Promise<WorkflowDefinition>;
     private createNewWorkflowDefinition;
     private populateActionIds;
-    private updateWorkflowTemplateDefinition;
     getActionDeclarationIdentifier(actionKey: any, app: App): string;
     getWorkflowDeclarationIdentifier(workflowKey: any, app: App): string;
 }

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

@@ -8,7 +8,6 @@ const apps_1 = require("../../api/apps");
 const event_workflow_templates_1 = require("../../api/event-workflow-templates");
 const event_workflow_template_definition_1 = require("../../api/event-workflow-template-definition");
 const actions_deployer_1 = require("../app/actions-deployer");
-const interface_converters_1 = require("../../interface-converters");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class WorkflowTemplateDefinitionDeployer {
     async cliInstallWorkflowTemplateDefinitions() {
@@ -62,6 +61,8 @@ class WorkflowTemplateDefinitionDeployer {
                 name: definition.name,
                 identifier: definition.identifier,
                 builtIn: definition.builtIn,
+                messageGroupId: definition.messageGroupId,
+                parallelWorkerCount: definition.parallelWorkerCount,
                 triggerKey: definition.triggerKey,
                 workflowDefinition: definition.workflowDefinition,
                 isActive: makeActive,
@@ -87,29 +88,19 @@ class WorkflowTemplateDefinitionDeployer {
         logger_1.default.info(chalk_1.default.green.bold(workflowTemplateDefinitions.map((x) => `(${x.appName}) ${x.workflowName} `).join('\n')));
     }
     async deployWorkflowTemplateDefinitions(appDeclaration, app) {
-        // FETCH ALL WORKFLOWS FROM THE API.
-        const existingWorkflows = await (0, apps_1.getWorkflowTemplateDefinitionsForAppVersion)({
-            appVersionId: app.latestAppVersionId,
-        });
         // UPSERT / DELETE BASED ON WORKFLOW IDENTIFIER
         logger_1.default.info('WORKFLOW DEFINITION \tDeploying workflow definitions.');
         if (appDeclaration.workflows) {
             const localWorkflows = Object.keys(appDeclaration.workflows);
             if (localWorkflows?.length > 0) {
                 for (const workflowKey of localWorkflows) {
-                    await this.deployWorkflow(workflowKey, appDeclaration.workflows[workflowKey], app, existingWorkflows);
+                    await this.deployWorkflowDefinition(workflowKey, appDeclaration.workflows[workflowKey], app);
                 }
             }
         }
     }
-    async deployWorkflow(workflowKey, workflow, app, existingWorkflows) {
+    async deployWorkflowDefinition(workflowKey, workflow, app) {
         logger_1.default.info(`WORKFLOW DEFINITION \tDeploying workflow definitions: ${workflowKey}`);
-        const identifier = this.getWorkflowDeclarationIdentifier(workflowKey, app);
-        const existingDefinition = existingWorkflows.find((ad) => ad.identifier === identifier);
-        (0, interface_converters_1.convertWorkflow)(workflow);
-        if (existingDefinition) {
-            return await this.updateWorkflowTemplateDefinition(existingDefinition, workflow, app);
-        }
         return await this.createNewWorkflowDefinition(workflowKey, workflow, app);
     }
     async createNewWorkflowDefinition(workflowKey, workflowDeclaration, app) {
@@ -153,24 +144,6 @@ class WorkflowTemplateDefinitionDeployer {
             }
         }
     }
-    async updateWorkflowTemplateDefinition(existingWorkflowDefinition, workflowDefinition, app) {
-        await this.populateActionIds(workflowDefinition, app);
-        const updates = Object.assign(new Object(), {
-            name: workflowDefinition.name,
-            builtIn: workflowDefinition.builtIn,
-            ownerKey: `appVersion:${app.latestAppVersionId}`,
-            triggerKey: workflowDefinition.triggerKey,
-            workflowDefinition: workflowDefinition.workflowDefinition,
-            messageGroupId: workflowDefinition.messageGroupId,
-            parallelWorkerCount: workflowDefinition.parallelWorkerCount,
-        });
-        const updatedWorkflowDefinition = await (0, event_workflow_template_definition_1.updateWorkflowTemplateDefinition)({
-            id: existingWorkflowDefinition.id,
-            updates,
-        });
-        logger_1.default.info(`WORKFLOW DEFINITION \t Updated existing workflow definition: ${updatedWorkflowDefinition.identifier}`);
-        return updatedWorkflowDefinition;
-    }
     getActionDeclarationIdentifier(actionKey, app) {
         return `${app.identifier}@${app.latestAppVersionId}:${actionKey}`;
     }

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

@@ -13,7 +13,6 @@ const event_workflow_action_definition_1 = require("../../api/event-workflow-act
 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"));
 class LocalWorkflowTemplateDeployer {
     async deployWorkflows(wtDeclaration) {
@@ -30,7 +29,6 @@ class LocalWorkflowTemplateDeployer {
         logger_1.default.info(`WORKFLOW TEMPLATES \tDeploying workflow: ${workflow.triggerKey}`);
         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, appIdentifier);
         }

package/dist/interfaces.d.ts

@@ -71,10 +71,8 @@ export interface WorkflowDefinition {
     public: boolean;
     builtIn?: boolean;
     supportingAppId?: string;
-    parallelism?: number;
-    groupId?: string;
-    messageGroupId?: string;
     parallelWorkerCount?: number;
+    messageGroupId?: string;
 }
 export interface WorkflowTemplateDeclaration {
     appIdentifier: string;
@@ -91,10 +89,8 @@ export interface WorkflowTemplate {
     ownerKey?: string;
     crons?: CronDeclaration[];
     supportingAppId?: string;
-    parallelism?: number;
-    groupId?: string;
-    messageGroupId?: string;
     parallelWorkerCount?: number;
+    messageGroupId?: string;
     createdOn?: Date;
     updatedOn?: Date;
     createdById?: string;

package/dist/templates/typescript/app.yml

@@ -3,7 +3,7 @@ appName: "APP_NAME_STUB" # Give your app a name
 appDescription: "APP_DESCRIPTION_STUB" # Give your app a description
 visibility: private  # This should be private unless you want to develop an app for all VibeIQ customers to use
 hidden: false # can be used with a public app to prevent it from showing on the marketplace, but still installable by other orgs
-publisher: "Your company name" # Your company name, used for public apps
+publisher: "APP_PUBLISHER_STUB" # Your company name, used for public apps
 version: "1.0.0"
 
 # Properties you can configure when you install the app.

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.1",
+  "version": "2.3.3",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

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

package/dist/interface-converters.d.ts

@@ -1,3 +0,0 @@
-import { WorkflowDefinition, WorkflowTemplate } from './interfaces';
-export declare const DEFAULT_WORKFLOW_PARALLELISM = 1;
-export declare function convertWorkflow(workflow: WorkflowDefinition | WorkflowTemplate): void;

package/dist/interface-converters.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertWorkflow = exports.DEFAULT_WORKFLOW_PARALLELISM = void 0;
-exports.DEFAULT_WORKFLOW_PARALLELISM = 1;
-// parses the user-facing interface of the workflow and converts it to the cloud-facing format in-place.
-function convertWorkflow(workflow) {
-    workflow.parallelWorkerCount = workflow.parallelism ?? exports.DEFAULT_WORKFLOW_PARALLELISM;
-    workflow.messageGroupId = workflow.groupId;
-}
-exports.convertWorkflow = convertWorkflow;

package/dist/interface-converters.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/interface-converters.spec.js

@@ -1,89 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const interface_converters_1 = require("./interface-converters");
-describe('Workflow Template converter tests', () => {
-    it('should use default parallelism', () => {
-        const workflow = {
-            identifier: 'identifier',
-            name: 'name1',
-            triggerKey: 'foo|bar',
-            workflowDefinition: {
-                paths: [
-                    {
-                        conditional: 'true',
-                        actionDefinitionConfigs: [
-                            {
-                                action: 'logItem',
-                                name: 'Log Item',
-                            },
-                        ],
-                    },
-                ],
-            },
-            ownerKey: 'app:123',
-            isActive: true,
-            public: true,
-            // parallelism: 3,
-        };
-        (0, interface_converters_1.convertWorkflow)(workflow);
-        expect(workflow.parallelWorkerCount).toEqual(interface_converters_1.DEFAULT_WORKFLOW_PARALLELISM);
-        expect(workflow['concurrency']).toBeUndefined();
-        expect(workflow.messageGroupId).toBeUndefined();
-    });
-    it('should pass user concurrency as parallel count', () => {
-        const workflow = {
-            identifier: 'identifier',
-            name: 'name1',
-            triggerKey: 'foo|bar',
-            workflowDefinition: {
-                paths: [
-                    {
-                        conditional: 'true',
-                        actionDefinitionConfigs: [
-                            {
-                                action: 'logItem',
-                                name: 'Log Item',
-                            },
-                        ],
-                    },
-                ],
-            },
-            ownerKey: 'app:123',
-            isActive: true,
-            public: true,
-            parallelism: 3,
-        };
-        (0, interface_converters_1.convertWorkflow)(workflow);
-        expect(workflow.parallelWorkerCount).toEqual(3);
-        expect(workflow['concurrency']).toBeUndefined();
-        expect(workflow.messageGroupId).toBeUndefined();
-    });
-    it('should ignore concurrency if we pass group ID or ', () => {
-        const workflow = {
-            identifier: 'identifier',
-            name: 'name1',
-            triggerKey: 'foo|bar',
-            workflowDefinition: {
-                paths: [
-                    {
-                        conditional: 'true',
-                        actionDefinitionConfigs: [
-                            {
-                                action: 'logItem',
-                                name: 'Log Item',
-                            },
-                        ],
-                    },
-                ],
-            },
-            ownerKey: 'app:123',
-            isActive: true,
-            public: true,
-            parallelism: 3,
-        };
-        (0, interface_converters_1.convertWorkflow)(workflow);
-        expect(workflow.parallelWorkerCount).toEqual(3);
-        expect(workflow['concurrency']).toBeUndefined();
-        expect(workflow.messageGroupId).toBeUndefined();
-    });
-});