@contrail/cli 3.5.4-alpha.103cd15 → 3.5.4-alpha.564581c

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

@@ -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"));
@@ -44,8 +44,6 @@ class LocalWorkflowTemplateDeployer {
             isActive: workflowTemplate.isActive,
             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);
@@ -57,11 +55,8 @@ class LocalWorkflowTemplateDeployer {
     }
     async populateActionIds(workflowTemplate, workflowKey, appIdentifier) {
         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;
         }
@@ -91,7 +86,7 @@ class LocalWorkflowTemplateDeployer {
         }
     }
     async createWorkflowSchedule(workflowTemplate, workflowId) {
-        if (!workflowTemplate?.crons?.length) {
+        if (!workflowTemplate?.crons?.length || !workflowTemplate.id) {
             return;
         }
         const crons = [];
@@ -163,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,
         });
@@ -290,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();
-            }
-            delete actionConfig.identifier;
-        }
-    }
-}
-exports.extractShortActionKeys = extractShortActionKeys;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.4-alpha.103cd15",
+  "version": "3.5.4-alpha.564581c",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -1239,6 +1239,116 @@
         }
       }
     },
+    "org-config:export": {
+      "id": "org-config:export",
+      "description": "Export the org config for your Org",
+      "strict": true,
+      "pluginName": "@contrail/cli",
+      "pluginAlias": "@contrail/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "$ contrail org-config export\n"
+      ],
+      "flags": {
+        "logLevel": {
+          "name": "logLevel",
+          "type": "option",
+          "char": "l",
+          "description": "The Log Level",
+          "required": false,
+          "multiple": false,
+          "options": [
+            "error",
+            "warn",
+            "info",
+            "debug"
+          ]
+        },
+        "alwaysConfirmEnv": {
+          "name": "alwaysConfirmEnv",
+          "type": "option",
+          "char": "e",
+          "description": "The Environment variables",
+          "required": false,
+          "multiple": false,
+          "options": [
+            "true",
+            "false"
+          ],
+          "default": "true"
+        },
+        "outDir": {
+          "name": "outDir",
+          "type": "option",
+          "char": "d",
+          "description": "The directory to which to export the org config data. Defaults to the current directory",
+          "required": false,
+          "multiple": false,
+          "default": "."
+        },
+        "overwrite": {
+          "name": "overwrite",
+          "type": "boolean",
+          "char": "f",
+          "description": "Replaces any existing export files in outDir",
+          "required": false,
+          "allowNo": false
+        }
+      },
+      "args": {}
+    },
+    "org-config:import": {
+      "id": "org-config:import",
+      "description": "Upload an extracted org config",
+      "strict": true,
+      "pluginName": "@contrail/cli",
+      "pluginAlias": "@contrail/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "$ contrail org-config import\n"
+      ],
+      "flags": {
+        "logLevel": {
+          "name": "logLevel",
+          "type": "option",
+          "char": "l",
+          "description": "The Log Level",
+          "required": false,
+          "multiple": false,
+          "options": [
+            "error",
+            "warn",
+            "info",
+            "debug"
+          ]
+        },
+        "alwaysConfirmEnv": {
+          "name": "alwaysConfirmEnv",
+          "type": "option",
+          "char": "e",
+          "description": "The Environment variables",
+          "required": false,
+          "multiple": false,
+          "options": [
+            "true",
+            "false"
+          ],
+          "default": "true"
+        },
+        "dir": {
+          "name": "dir",
+          "type": "option",
+          "char": "d",
+          "description": "The directory from which to import the org config data. Defaults to the current directory. The org config data will be loaded from $dir/org-config.yml",
+          "required": false,
+          "multiple": false,
+          "default": "."
+        }
+      },
+      "args": {}
+    },
     "projects:export": {
       "id": "projects:export",
       "description": "Export a project.",
@@ -1593,6 +1703,13 @@
           "required": false,
           "multiple": false,
           "default": "."
+        },
+        "orgConfig": {
+          "name": "orgConfig",
+          "type": "boolean",
+          "description": "Also load org config data from this directory. If not specified, you will be prompted.",
+          "required": false,
+          "allowNo": true
         }
       },
       "args": {}
@@ -2956,16 +3073,14 @@
     },
     "workflow-templates:export": {
       "id": "workflow-templates:export",
-      "description": "Export all workflows in the org. By default exports one file per app to the current directory.",
+      "description": "Export all workflows in the org.",
       "strict": true,
       "pluginName": "@contrail/cli",
       "pluginAlias": "@contrail/cli",
       "pluginType": "core",
       "aliases": [],
       "examples": [
-        "$ contrail workflow-templates export",
-        "$ contrail workflow-templates export --dir ./workflows",
-        "$ contrail workflow-templates export --outFile workflows.yml"
+        "$ contrail workflow-templates export\n"
       ],
       "flags": {
         "logLevel": {
@@ -2999,18 +3114,10 @@
           "name": "outFile",
           "type": "option",
           "char": "f",
-          "description": "Export all workflows to a single file at this path (overrides per-app export)",
-          "required": false,
-          "multiple": false
-        },
-        "dir": {
-          "name": "dir",
-          "type": "option",
-          "char": "d",
-          "description": "Directory to write per-app workflow files",
+          "description": "The location for the file to be saved",
           "required": false,
           "multiple": false,
-          "default": "."
+          "default": "workflows.yml"
         },
         "overwrite": {
           "name": "overwrite",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.4-alpha.103cd15",
+  "version": "3.5.4-alpha.564581c",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -113,6 +113,9 @@
       "groups": {
         "description": "Export and import user groups"
       },
+      "org-config": {
+        "description": "Export and import org-level configuration"
+      },
       "webhooks": {
         "description": "Manage VibeIQ webhooks"
       },