@contrail/cli 3.5.4-alpha.f60c4df → 3.5.5-alpha.ae6a66f

package/dist/commands/workflow-templates/load.js

@@ -1,84 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importWorkflowsBySelection = void 0;
-const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const core_1 = require("@oclif/core");
 const login_1 = require("../../auth/login");
 const helper_1 = require("../../helpers/workflow-templates/helper");
 const basecommand_1 = require("../../basecommand");
 class LoadWorkflowTemplates extends basecommand_1.BaseCommand {
-    static description = 'Load workflow templates from a file or scan a directory for per-app workflow files';
+    static description = 'Loads your workflow from a local file';
     static examples = [
-        '$ contrail workflow-templates load <FILE_LOCATION>',
-        '$ contrail workflow-templates load',
-        '$ contrail workflow-templates load --dir ./workflows',
+        `$ contrail workflow-templates load <FILE_LOCATION>
+`,
     ];
     static flags = {
         ...basecommand_1.BaseCommand.baseFlags,
-        dir: core_1.Flags.string({
-            char: 'd',
-            description: 'Directory to scan for workflow files when no file argument is given',
-            required: false,
-            default: '.',
-        }),
     };
     static args = {
         fileLocation: core_1.Args.string({
-            description: 'A specific workflow template file to load',
-            required: false,
+            description: 'The workflow template file to load',
+            required: true,
         }),
     };
     async run() {
         await (0, login_1.authUser)();
-        if (this.args.fileLocation) {
-            await (0, helper_1.localDeployWorkflowTemplate)(this.args.fileLocation);
-        }
-        else {
-            await importWorkflowsBySelection(this.flags.dir ?? '.');
-        }
+        await (0, helper_1.localDeployWorkflowTemplate)(this.args.fileLocation);
     }
 }
 exports.default = LoadWorkflowTemplates;
-async function importWorkflowsBySelection(dir) {
-    const resolvedDir = path.resolve(process.cwd(), dir);
-    const files = fs_1.default
-        .readdirSync(resolvedDir)
-        .filter((f) => f.startsWith('workflows-') && f.endsWith('.yml'))
-        .sort();
-    if (files.length === 0) {
-        console.log(chalk_1.default.yellow(`No workflow files found in ${resolvedDir}`));
-        return;
-    }
-    const choices = files.map((f) => ({
-        name: f,
-        value: f,
-        checked: true,
-    }));
-    const { selectedFiles } = await inquirer_1.default.prompt([
-        {
-            type: 'checkbox',
-            name: 'selectedFiles',
-            message: 'Select workflow files to import (space to toggle, enter to confirm):',
-            choices,
-        },
-    ]);
-    if (selectedFiles.length === 0) {
-        console.log(chalk_1.default.yellow('No files selected — nothing imported.'));
-        return;
-    }
-    //log selected file
-    console.log(chalk_1.default.blue.bold('SELECTED WORKFLOW FILES:'));
-    selectedFiles.forEach((file) => {
-        console.log(` - ${file}`);
-    });
-    for (const file of selectedFiles) {
-        console.log(`\n${chalk_1.default.blue.bold('IMPORTING')} ${file}`);
-        await (0, helper_1.localDeployWorkflowTemplate)(path.join(dir, file));
-        console.log(`${chalk_1.default.green.bold('DONE')} ${file}`);
-    }
-}
-exports.importWorkflowsBySelection = importWorkflowsBySelection;

package/dist/helpers/error-helpers.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Returns a human readable message for an error thrown by the SDK or by the CLI.
+ *
+ * The SDK's ApiError is constructed with an undefined message and keeps the raw
+ * response body in `details` (usually a JSON string such as
+ * `{"message":"policy with identifier X not found","statusCode":400}`), so
+ * `${error}` only prints "Error". This digs the API message out of `details`.
+ */
+export declare function describeError(error: any): string;

package/dist/helpers/error-helpers.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describeError = void 0;
+/**
+ * Returns a human readable message for an error thrown by the SDK or by the CLI.
+ *
+ * The SDK's ApiError is constructed with an undefined message and keeps the raw
+ * response body in `details` (usually a JSON string such as
+ * `{"message":"policy with identifier X not found","statusCode":400}`), so
+ * `${error}` only prints "Error". This digs the API message out of `details`.
+ */
+function describeError(error) {
+    const details = error?.details;
+    if (typeof details === 'string' && details.length) {
+        try {
+            const parsed = JSON.parse(details);
+            const message = parsed?.message;
+            if (Array.isArray(message)) {
+                return message.join(', ');
+            }
+            if (message) {
+                return String(message);
+            }
+        }
+        catch {
+            // not JSON, fall through and use the raw body
+        }
+        return details;
+    }
+    if (details?.message) {
+        return String(details.message);
+    }
+    return error?.message || String(error);
+}
+exports.describeError = describeError;

package/dist/helpers/file-helpers.d.ts

@@ -1,2 +1,4 @@
 export declare function safeFileOverwrite(fileLocation: string, overwrite: boolean): Promise<boolean>;
 export declare function parseCSVData(data: string): any;
+export declare function saveData(data: any, fileLocation: string, overwrite: boolean): Promise<void>;
+export declare function loadData(fileLocation: string): any;

package/dist/helpers/file-helpers.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCSVData = exports.safeFileOverwrite = void 0;
+exports.loadData = exports.saveData = exports.parseCSVData = exports.safeFileOverwrite = void 0;
 const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+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 logger_1 = tslib_1.__importDefault(require("../logger"));
 const sync_1 = require("csv-parse/sync");
 const PASS_FORCE_TO_OVERWRITE = 'Pass --overwrite to overwrite without prompting';
@@ -34,3 +37,24 @@ function parseCSVData(data) {
     });
 }
 exports.parseCSVData = parseCSVData;
+//saves data as yaml to fileLocation (resolved against the current directory), prompting before overwriting unless overwrite is passed
+async function saveData(data, fileLocation, overwrite) {
+    const yamlStr = js_yaml_1.default.dump(data);
+    const pathToWrite = path.resolve(fileLocation);
+    if (fs_1.default.existsSync(pathToWrite)) {
+        await safeFileOverwrite(pathToWrite, overwrite);
+    }
+    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
+}
+exports.saveData = saveData;
+//loads yaml data from fileLocation (resolved against the current directory)
+function loadData(fileLocation) {
+    const pathToRead = path.resolve(fileLocation);
+    try {
+        return js_yaml_1.default.load(fs_1.default.readFileSync(pathToRead, 'utf8'));
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+exports.loadData = loadData;

package/dist/helpers/projects/helpers.js

@@ -8,6 +8,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const sdk_1 = require("@contrail/sdk");
 const util_1 = require("@contrail/util");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const file_helpers_1 = require("../file-helpers");
 function getProjectFile(fileName) {
     const CURRENT_DIR = process.cwd();
     try {
@@ -42,7 +43,7 @@ async function exportProject(name) {
     const allAssortments = [];
     await getAssortmentsAndSubFolders(workspace.id, projectConfiguration.assortments, projectConfiguration.subFolders, allAssortments);
     await convertRelationshipsInFolders(projectConfiguration, allAssortments);
-    saveData({ projectConfiguration: projectConfiguration }, name);
+    await (0, file_helpers_1.saveData)({ projectConfiguration: projectConfiguration }, `${name}-export.yml`, true);
 }
 exports.exportProject = exportProject;
 async function getAssortmentsAndSubFolders(parentId, assortments, subFolders, allAssortments) {
@@ -160,8 +161,3 @@ function deleteNonUserKeys(assortment) {
     delete assortment.updatedOn;
     delete assortment.workspaceId;
 }
-function saveData(data, name) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.join(CURRENT_DIR, `${name}-export.yml`), yamlStr, 'utf8');
-}

package/dist/helpers/types/type-parser.js

@@ -4,12 +4,11 @@ exports.parseTypesFromFiles = exports.parseTypesFromTemplateAndDataFromLocalFile
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const types_1 = require("@contrail/types");
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const csvToJson = tslib_1.__importStar(require("csvtojson"));
 const login_1 = require("../../auth/login");
 const csv_parser_1 = require("../../helpers/types/csv-parser");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const file_helpers_1 = require("../file-helpers");
 async function loadDataFromLocalCSV(fileName) {
     const CURRENT_DIR = process.cwd();
     try {
@@ -37,8 +36,8 @@ async function parseTypesFromLocalFiles(fileLocations) {
     }
     logger_1.default.info(`CSV imports were successful. ${csvJSONData?.length} total rows found.`);
     const suggestions = (0, types_1.GetSuggestedTypes)(csvJSONData);
-    saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
-    saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
+    await (0, file_helpers_1.saveData)(suggestions.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml', true);
 }
 exports.parseTypesFromLocalFiles = parseTypesFromLocalFiles;
 async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFileLocation) {
@@ -57,8 +56,8 @@ async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFi
         throw e;
     }
     const types = (0, types_1.GetTypesFromTemplate)(templateCSVData, dataCSVData);
-    saveData(types.OptionSets, 'parsed_optionSets.yml');
-    saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
+    await (0, file_helpers_1.saveData)(types.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml', true);
 }
 exports.parseTypesFromTemplateFromLocalFiles = parseTypesFromTemplateFromLocalFiles;
 async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation, dataFileLocations) {
@@ -86,8 +85,8 @@ async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation,
         }
     }
     const types = (0, types_1.GetTypesFromTemplateWithOptionSetsFromData)(templateCSVData, dataCSVData);
-    saveData(types.OptionSets, 'parsed_optionSets.yml');
-    saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
+    await (0, file_helpers_1.saveData)(types.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml', true);
 }
 exports.parseTypesFromTemplateAndDataFromLocalFiles = parseTypesFromTemplateAndDataFromLocalFiles;
 async function parseTypesFromFiles(fileIds) {
@@ -108,12 +107,7 @@ async function parseTypesFromFiles(fileIds) {
     }
     logger_1.default.info(`CSV downloads were successful. ${csvJSONData?.length} total rows found.`);
     const suggestions = (0, types_1.GetSuggestedTypes)(csvJSONData);
-    saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
-    saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
+    await (0, file_helpers_1.saveData)(suggestions.OptionSets, 'parsed_optionSets.yml', true);
+    await (0, file_helpers_1.saveData)({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml', true);
 }
 exports.parseTypesFromFiles = parseTypesFromFiles;
-function saveData(data, name) {
-    const yamlStr = js_yaml_1.default.dump(data);
-    const CURRENT_DIR = process.cwd();
-    fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, name, yamlStr)), 'utf8');
-}

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

@@ -1,7 +1,7 @@
 import { EventWorkflowActionDefinition, WorkflowTemplate, WorkflowTemplateDeclaration } from '../../interfaces';
 export declare class LocalWorkflowTemplateDeployer {
     deployWorkflows(wtDeclaration: WorkflowTemplateDeclaration): Promise<void>;
-    deployWorkflowTemplate(workflow: WorkflowTemplate, existingWorkflows: WorkflowTemplate[], appIdentifier: string | undefined): Promise<WorkflowTemplate>;
+    deployWorkflowTemplate(workflow: WorkflowTemplate, existingWorkflows: WorkflowTemplate[], appIdentifier: string): Promise<WorkflowTemplate>;
     private createNewWorkflowTemplate;
     private populateActionIds;
     createWorkflowSchedule(workflowTemplate: WorkflowTemplate, workflowId: string): Promise<any>;
@@ -18,4 +18,3 @@ export declare class WorkflowTemplateDeployer {
 export declare function deleteWorkflowTemplates(): Promise<void>;
 export declare function localDeployWorkflowTemplate(saveFileLocation: string): Promise<void>;
 export declare function populateActionIdentifiers(workflowTemplate: WorkflowTemplate): Promise<void>;
-export declare function extractShortActionKeys(workflowTemplate: WorkflowTemplate): void;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractShortActionKeys = exports.populateActionIdentifiers = exports.localDeployWorkflowTemplate = exports.deleteWorkflowTemplates = exports.WorkflowTemplateDeployer = exports.getActionByIdentifier = exports.getWorkflowTemplateIdentifier = exports.LocalWorkflowTemplateDeployer = void 0;
+exports.populateActionIdentifiers = exports.localDeployWorkflowTemplate = exports.deleteWorkflowTemplates = exports.WorkflowTemplateDeployer = exports.getActionByIdentifier = exports.getWorkflowTemplateIdentifier = exports.LocalWorkflowTemplateDeployer = void 0;
 const tslib_1 = require("tslib");
 const util_1 = require("@contrail/util");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -35,17 +35,15 @@ class LocalWorkflowTemplateDeployer {
         return await this.createNewWorkflowTemplate(identifier, workflow, appIdentifier);
     }
     async createNewWorkflowTemplate(workflowKey, workflowTemplate, appIdentifier) {
-        const appId = await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
+        await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const newObject = {
             identifier: getWorkflowTemplateIdentifier(workflowTemplate),
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
             workflowDefinition: workflowTemplate.workflowDefinition,
             isActive: workflowTemplate.isActive,
-            supportingAppId: appId,
+            supportingAppId: workflowTemplate.supportingAppId,
             messageGroupId: workflowTemplate.messageGroupId,
-            messageGroup: workflowTemplate.messageGroup,
-            dynamicMessageGroupId: workflowTemplate.dynamicMessageGroupId,
             parallelWorkerCount: workflowTemplate.parallelWorkerCount,
         };
         const newWorkflowTemplate = await (0, event_workflow_templates_1.createWorkflowTemplate)(newObject);
@@ -56,18 +54,11 @@ class LocalWorkflowTemplateDeployer {
         return newWorkflowTemplate;
     }
     async populateActionIds(workflowTemplate, workflowKey, appIdentifier) {
-        if (!appIdentifier) {
-            logger_1.default.info(`WORKFLOW TEMPLATES  No appIdentifier for "${workflowKey}" — skipping action ID resolution.`);
-            return undefined;
-        }
         const installedApps = await (0, apps_1.getInstalledApps)();
-        const appOrg = installedApps.find((x) => x.app?.identifier === appIdentifier);
+        const appOrg = installedApps.find((x) => x.app.identifier === appIdentifier);
         logger_1.default.info('workflow template:', JSON.stringify(workflowTemplate, null, 2));
-        if (!appOrg) {
-            throw new Error(`Could not find installed app with identifier "${appIdentifier}". Make sure the app is installed in this org before importing workflows.`);
-        }
         if (!workflowTemplate?.workflowDefinition?.paths) {
-            return appOrg.appId;
+            return;
         }
         for (const path of workflowTemplate.workflowDefinition.paths) {
             if (!path?.actionDefinitionConfigs) {
@@ -93,10 +84,9 @@ class LocalWorkflowTemplateDeployer {
                 }
             }
         }
-        return appOrg.appId;
     }
     async createWorkflowSchedule(workflowTemplate, workflowId) {
-        if (!workflowTemplate?.crons?.length) {
+        if (!workflowTemplate?.crons?.length || !workflowTemplate.id) {
             return;
         }
         const crons = [];
@@ -168,8 +158,6 @@ class LocalWorkflowTemplateDeployer {
             triggerKey: workflowTemplate.triggerKey,
             builtIn: workflowTemplate.builtIn,
             workflowDefinition: workflowTemplate.workflowDefinition,
-            messageGroupId: workflowTemplate.messageGroupId ?? existingWorkflowTemplate.messageGroupId,
-            messageGroup: workflowTemplate.messageGroup ?? existingWorkflowTemplate.messageGroup,
             dynamicMessageGroupId: workflowTemplate.dynamicMessageGroupId ?? existingWorkflowTemplate.dynamicMessageGroupId,
             parallelWorkerCount: workflowTemplate.parallelWorkerCount ?? existingWorkflowTemplate.parallelWorkerCount,
         });
@@ -295,21 +283,3 @@ async function populateActionIdentifiers(workflowTemplate) {
     }
 }
 exports.populateActionIdentifiers = populateActionIdentifiers;
-function extractShortActionKeys(workflowTemplate) {
-    if (!workflowTemplate?.workflowDefinition?.paths) {
-        return;
-    }
-    for (const wfPath of workflowTemplate.workflowDefinition.paths) {
-        if (!wfPath?.actionDefinitionConfigs) {
-            continue;
-        }
-        for (const actionConfig of wfPath.actionDefinitionConfigs) {
-            if (actionConfig.action?.includes(':')) {
-                // Full identifier format: "app-id@version:action-name" -> "action-name"
-                actionConfig.action = actionConfig.action.split(':').pop() ?? actionConfig.action;
-            }
-            delete actionConfig.identifier;
-        }
-    }
-}
-exports.extractShortActionKeys = extractShortActionKeys;

package/dist/interfaces.d.ts

@@ -98,7 +98,7 @@ export interface WorkflowDefinition {
     dynamicMessageGroupId?: string;
 }
 export interface WorkflowTemplateDeclaration {
-    appIdentifier?: string;
+    appIdentifier: string;
     workflows?: WorkflowTemplate[];
 }
 export interface WorkflowTemplate {