@contrail/cli 3.5.3-alpha.d91b702 → 3.5.3-alpha.d978e28

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.3-alpha.d91b702 linux-x64 node-v24.16.0
+@contrail/cli/3.5.3-alpha.d978e28 linux-x64 node-v24.19.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -61,6 +61,8 @@ To get instructions on how to set up autocomplete for your shell, run `contrail
 * [`contrail load custom-entity DATAFILE CONFIGFILE`](#contrail-load-custom-entity-datafile-configfile)
 * [`contrail load line-sheet DATAFILE CONFIGFILE`](#contrail-load-line-sheet-datafile-configfile)
 * [`contrail load upload-and-load INCOMINGFILE CONFIGFILENAME`](#contrail-load-upload-and-load-incomingfile-configfilename)
+* [`contrail org-config export`](#contrail-org-config-export)
+* [`contrail org-config import`](#contrail-org-config-import)
 * [`contrail projects export PROJECTNAME`](#contrail-projects-export-projectname)
 * [`contrail projects list`](#contrail-projects-list)
 * [`contrail projects load TEMPLATEFILELOCATION`](#contrail-projects-load-templatefilelocation)
@@ -777,6 +779,53 @@ EXAMPLES
   $ contrail load-processor upload-and-load  <File Path> <Config Path>
 ```
 
+## `contrail org-config export`
+
+Export the org config for your Org
+
+```
+USAGE
+  $ contrail org-config export [-l error|warn|info|debug] [-e true|false] [-d <value>] [-f]
+
+FLAGS
+  -d, --outDir=<value>             [default: .] The directory to which to export the org config data. Defaults to the
+                                   current directory
+  -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
+                                   <options: true|false>
+  -f, --overwrite                  Replaces any existing export files in outDir
+  -l, --logLevel=<option>          The Log Level
+                                   <options: error|warn|info|debug>
+
+DESCRIPTION
+  Export the org config for your Org
+
+EXAMPLES
+  $ contrail org-config export
+```
+
+## `contrail org-config import`
+
+Upload an extracted org config
+
+```
+USAGE
+  $ contrail org-config import [-l error|warn|info|debug] [-e true|false] [-d <value>]
+
+FLAGS
+  -d, --dir=<value>                [default: .] 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
+  -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
+                                   <options: true|false>
+  -l, --logLevel=<option>          The Log Level
+                                   <options: error|warn|info|debug>
+
+DESCRIPTION
+  Upload an extracted org config
+
+EXAMPLES
+  $ contrail org-config import
+```
+
 ## `contrail projects export PROJECTNAME`
 
 Export a project.
@@ -1611,31 +1660,25 @@ EXAMPLES
 
 ## `contrail workflow-templates export`
 
-Export all workflows in the org. By default exports one file per app to the current directory.
+Export all workflows in the org.
 
 ```
 USAGE
-  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [-d <value>]
-  [--overwrite]
+  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [--overwrite]
 
 FLAGS
-  -d, --dir=<value>                [default: .] Directory to write per-app workflow files
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>
-  -f, --outFile=<value>            Export all workflows to a single file at this path (overrides per-app export)
+  -f, --outFile=<value>            [default: workflows.yml] The location for the file to be saved
   -l, --logLevel=<option>          The Log Level
                                    <options: error|warn|info|debug>
   --overwrite                      Replaces existing files if they exist
 
 DESCRIPTION
-  Export all workflows in the org. By default exports one file per app to the current directory.
+  Export all workflows in the org.
 
 EXAMPLES
   $ contrail workflow-templates export
-
-  $ contrail workflow-templates export --dir ./workflows
-
-  $ contrail workflow-templates export --outFile workflows.yml
 ```
 
 ## `contrail workflow-templates list`

package/dist/api/org-config.d.ts

@@ -0,0 +1,3 @@
+export declare function getOrgConfigs(options?: any): Promise<any[]>;
+export declare function updateOrgConfig(id: string, changes: any): Promise<any>;
+export declare function createOrgConfig(orgConfig: any): Promise<any>;

package/dist/api/org-config.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOrgConfig = exports.updateOrgConfig = exports.getOrgConfigs = void 0;
+const sdk_1 = require("@contrail/sdk");
+async function getOrgConfigs(options) {
+    return new sdk_1.Entities().get({
+        entityName: 'org-config',
+        ...options,
+    });
+}
+exports.getOrgConfigs = getOrgConfigs;
+async function updateOrgConfig(id, changes) {
+    return new sdk_1.Entities().update({
+        entityName: 'org-config',
+        id,
+        object: changes,
+    });
+}
+exports.updateOrgConfig = updateOrgConfig;
+async function createOrgConfig(orgConfig) {
+    return new sdk_1.Entities().create({
+        entityName: 'org-config',
+        object: orgConfig,
+    });
+}
+exports.createOrgConfig = createOrgConfig;

package/dist/commands/instance/export.js

@@ -6,6 +6,7 @@ const core_1 = require("@oclif/core");
 const getAll_1 = require("../types/getAll");
 const export_1 = require("../users/export");
 const export_2 = require("../groups/export");
+const export_3 = require("../org-config/export");
 const basecommand_1 = require("../../basecommand");
 class ExportInstance extends basecommand_1.BaseCommand {
     static description = 'Exports an data of an instance including types and users';
@@ -32,6 +33,7 @@ class ExportInstance extends basecommand_1.BaseCommand {
         await (0, getAll_1.getAll)(this.flags.outDir, this.flags.overwrite);
         await (0, export_1.exportUsers)(path.join(this.flags.outDir, 'users.yml'), this.flags.overwrite);
         await (0, export_2.exportGroups)(path.join(this.flags.outDir, 'groups.yml'), this.flags.overwrite);
+        await (0, export_3.exportOrgConfig)(this.flags.outDir, this.flags.overwrite);
     }
 }
 exports.default = ExportInstance;

package/dist/commands/instance/import.js

@@ -8,6 +8,7 @@ const import_1 = require("../users/import");
 const import_2 = require("../groups/import");
 const uploadTypePropertyPolicies_1 = require("../types/uploadTypePropertyPolicies");
 const uploadTypePolicies_1 = require("../types/uploadTypePolicies");
+const import_3 = require("../org-config/import");
 const basecommand_1 = require("../../basecommand");
 class ImportInstance extends basecommand_1.BaseCommand {
     static description = 'Import the data to an instance, including types and users';
@@ -30,6 +31,7 @@ class ImportInstance extends basecommand_1.BaseCommand {
         await (0, import_2.uploadGroups)(path.join(this.flags.dir, 'groups.yml'));
         await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(this.flags.dir);
         await (0, uploadTypePolicies_1.uploadTypePolicies)(this.flags.dir);
+        await (0, import_3.uploadOrgConfig)(this.flags.dir);
     }
 }
 exports.default = ImportInstance;

package/dist/commands/org-config/export.d.ts

@@ -0,0 +1,13 @@
+import { BaseCommand } from '../../basecommand';
+export default class ExportOrgConfig extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        outDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+export declare function exportOrgConfig(outDir: string, overwrite: boolean): Promise<void>;

package/dist/commands/org-config/export.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exportOrgConfig = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const login_1 = require("../../auth/login");
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const core_1 = require("@oclif/core");
+const file_helpers_1 = require("../../helpers/file-helpers");
+const org_config_1 = require("../../api/org-config");
+const basecommand_1 = require("../../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const ORG_SPECIFIC_FIELDS = [
+    'id',
+    'orgId',
+    'createdOn',
+    'updatedOn',
+    'createdById',
+    'updatedById',
+    'createdBy',
+    'updatedBy',
+];
+class ExportOrgConfig extends basecommand_1.BaseCommand {
+    static description = 'Export the org config for your Org';
+    static examples = [
+        `$ contrail org-config export
+`,
+    ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+        outDir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory to which to export the org config data. Defaults to the current directory',
+            required: false,
+            default: '.',
+        }),
+        overwrite: core_1.Flags.boolean({
+            char: 'f',
+            description: 'Replaces any existing export files in outDir',
+            required: false,
+            default: false,
+        }),
+    };
+    async run() {
+        await exportOrgConfig(this.flags.outDir, this.flags.overwrite);
+    }
+}
+exports.default = ExportOrgConfig;
+async function exportOrgConfig(outDir, overwrite) {
+    try {
+        await (0, login_1.authUser)();
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Exporting`);
+        const orgConfigs = await (0, org_config_1.getOrgConfigs)();
+        if (!Array.isArray(orgConfigs) || orgConfigs.length === 0) {
+            logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} No org config found. Skipping.`);
+            return;
+        }
+        const orgConfig = { ...orgConfigs[0] };
+        for (const field of ORG_SPECIFIC_FIELDS) {
+            delete orgConfig[field];
+        }
+        await saveData(orgConfig, outDir, overwrite);
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Exported`);
+    }
+    catch (e) {
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Org Config Export Failed. ${e}`);
+        return;
+    }
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Org Config Export Complete.`);
+}
+exports.exportOrgConfig = exportOrgConfig;
+async function saveData(data, dir, overwrite) {
+    const CURRENT_DIR = process.cwd();
+    const yamlStr = js_yaml_1.default.dump(data);
+    const pathToWrite = path.join(CURRENT_DIR, dir, 'org-config.yml');
+    if (fs_1.default.existsSync(pathToWrite)) {
+        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+    }
+    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
+}

package/dist/commands/org-config/import.d.ts

@@ -0,0 +1,12 @@
+import { BaseCommand } from '../../basecommand';
+export default class ImportOrgConfig extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+export declare function uploadOrgConfig(dir: string): Promise<void>;

package/dist/commands/org-config/import.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadOrgConfig = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const login_1 = require("../../auth/login");
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const core_1 = require("@oclif/core");
+const org_config_1 = require("../../api/org-config");
+const basecommand_1 = require("../../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+class ImportOrgConfig extends basecommand_1.BaseCommand {
+    static description = 'Upload an extracted org config';
+    static examples = [
+        `$ contrail org-config import
+`,
+    ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+        dir: core_1.Flags.string({
+            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,
+            default: '.',
+        }),
+    };
+    async run() {
+        await uploadOrgConfig(this.flags.dir);
+    }
+}
+exports.default = ImportOrgConfig;
+async function uploadOrgConfig(dir) {
+    try {
+        await (0, login_1.authUser)();
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Uploading`);
+        const orgConfig = loadOrgConfig(dir);
+        if (!orgConfig || typeof orgConfig !== 'object') {
+            logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} No org config found in ${dir}. Skipping.`);
+            return;
+        }
+        const existingOrgConfigs = await (0, org_config_1.getOrgConfigs)();
+        if (Array.isArray(existingOrgConfigs) && existingOrgConfigs.length > 0) {
+            await (0, org_config_1.updateOrgConfig)(existingOrgConfigs[0].id, orgConfig);
+        }
+        else {
+            await (0, org_config_1.createOrgConfig)(orgConfig);
+        }
+        logger_1.default.info(`${chalk_1.default.yellow.bold('ORG CONFIG')} Uploaded`);
+    }
+    catch (e) {
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Org Config Upload Failed. ${e}`);
+        return;
+    }
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Org Config Upload Complete.`);
+}
+exports.uploadOrgConfig = uploadOrgConfig;
+function loadOrgConfig(fromDir) {
+    const filePath = path.join(fromDir, 'org-config.yml');
+    if (!fs_1.default.existsSync(filePath)) {
+        return;
+    }
+    try {
+        return js_yaml_1.default.load(fs_1.default.readFileSync(filePath, 'utf8'));
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}

package/dist/commands/workflow-templates/export.d.ts

@@ -1,15 +1,14 @@
 import { BaseCommand } from '../../basecommand';
+export declare const DEFAULT_FILE_LOCATION = "workflows.yml";
 export default class ExportWorkflows extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
         outFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }
-export declare function exportWorkflowsByApp(outputDir: string, overwrite: boolean): Promise<void>;
-export declare function exportWorkflowsToFile(fileLocation: string, overwrite: boolean): Promise<void>;
+export declare function exportWorkflows(fileLocation: string, overwrite: boolean): Promise<void>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportWorkflowsToFile = exports.exportWorkflowsByApp = void 0;
+exports.exportWorkflows = exports.DEFAULT_FILE_LOCATION = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -11,29 +11,22 @@ const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const event_workflow_templates_1 = require("../../api/event-workflow-templates");
-const schedules_1 = require("../../api/schedules");
-const apps_1 = require("../../api/apps");
 const helper_1 = require("../../helpers/workflow-templates/helper");
 const basecommand_1 = require("../../basecommand");
+exports.DEFAULT_FILE_LOCATION = 'workflows.yml';
 class ExportWorkflows extends basecommand_1.BaseCommand {
-    static description = 'Export all workflows in the org. By default exports one file per app to the current directory.';
+    static description = 'Export all workflows in the org.';
     static examples = [
-        '$ contrail workflow-templates export',
-        '$ contrail workflow-templates export --dir ./workflows',
-        '$ contrail workflow-templates export --outFile workflows.yml',
+        `$ contrail workflow-templates export
+`,
     ];
     static flags = {
         ...basecommand_1.BaseCommand.baseFlags,
         outFile: core_1.Flags.string({
             char: 'f',
-            description: 'Export all workflows to a single file at this path (overrides per-app export)',
+            description: 'The location for the file to be saved',
             required: false,
-        }),
-        dir: core_1.Flags.string({
-            char: 'd',
-            description: 'Directory to write per-app workflow files',
-            required: false,
-            default: '.',
+            default: exports.DEFAULT_FILE_LOCATION,
         }),
         overwrite: core_1.Flags.boolean({
             description: 'Replaces existing files if they exist',
@@ -45,12 +38,7 @@ class ExportWorkflows extends basecommand_1.BaseCommand {
         try {
             await (0, login_1.authUser)();
             this.log(`${chalk_1.default.blue.bold('START')} Getting Workflows.`);
-            if (this.flags.outFile) {
-                await exportWorkflowsToFile(this.flags.outFile, this.flags.overwrite);
-            }
-            else {
-                await exportWorkflowsByApp(this.flags.dir ?? '.', this.flags.overwrite);
-            }
+            await exportWorkflows(this.flags.outFile ?? exports.DEFAULT_FILE_LOCATION, this.flags.overwrite);
             this.log(`${chalk_1.default.yellow.bold('WORKFLOWS')} Done`);
         }
         catch (e) {
@@ -61,101 +49,31 @@ class ExportWorkflows extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ExportWorkflows;
-async function exportWorkflowsByApp(outputDir, overwrite) {
-    const [allWorkflowsInOrg, allSchedules, installedApps] = await Promise.all([
-        (0, event_workflow_templates_1.getExistingWorkflowTemplates)(),
-        (0, schedules_1.getExistingSchedules)(),
-        (0, apps_1.getInstalledApps)(),
-    ]);
-    const appIdToIdentifier = new Map(installedApps
-        .filter((appOrg) => appOrg.appId && appOrg.app?.identifier)
-        .map((appOrg) => [appOrg.appId, appOrg.app.identifier]));
-    const workflowsByApp = new Map();
-    const unassigned = [];
-    for (const workflow of allWorkflowsInOrg) {
-        let appIdentifier = workflow.supportingAppId
-            ? appIdToIdentifier.get(workflow.supportingAppId)
-            : undefined;
-        // If no supportingAppId, try to extract app identifier from workflow identifier
-        // Format: @{appIdentifier}@{randomId}:{workflowName}
-        if (!appIdentifier && workflow.identifier) {
-            const match = workflow.identifier.match(/^@([^@]+)@/);
-            if (match) {
-                // Keep the @ prefix in the appIdentifier
-                appIdentifier = `@${match[1]}`;
-            }
-        }
-        if (appIdentifier) {
-            if (!workflowsByApp.has(appIdentifier)) {
-                workflowsByApp.set(appIdentifier, []);
-            }
-            const workflows = workflowsByApp.get(appIdentifier);
-            if (workflows) {
-                workflows.push(workflow);
-            }
-        }
-        else {
-            unassigned.push(workflow);
-        }
-    }
-    const resolvedDir = path.resolve(process.cwd(), outputDir);
-    for (const [appIdentifier, workflows] of workflowsByApp.entries()) {
-        const exportObj = { appIdentifier, workflows: [] };
-        for (const workflow of workflows) {
-            exportObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
-        }
-        const safeAppIdentifier = appIdentifier.replace(/[\\/]/g, '-');
-        const filePath = path.join(resolvedDir, `workflows-${safeAppIdentifier}.yml`);
-        await writeYamlFile(exportObj, filePath, overwrite);
-        console.log(`${chalk_1.default.green('EXPORTED')} ${filePath}`);
-    }
-    if (unassigned.length > 0) {
-        const unassignedObj = { workflows: [] };
-        for (const workflow of unassigned) {
-            unassignedObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
-        }
-        const unassignedFilePath = path.join(resolvedDir, 'workflows-unassigned.yml');
-        await writeYamlFile(unassignedObj, unassignedFilePath, overwrite);
-        console.log(`${chalk_1.default.yellow('EXPORTED')} ${unassignedFilePath} (unassigned workflows)`);
-    }
-}
-exports.exportWorkflowsByApp = exportWorkflowsByApp;
-async function exportWorkflowsToFile(fileLocation, overwrite) {
-    const [allWorkflowsInOrg, allSchedules] = await Promise.all([
-        (0, event_workflow_templates_1.getExistingWorkflowTemplates)(),
-        (0, schedules_1.getExistingSchedules)(),
-    ]);
+async function exportWorkflows(fileLocation, overwrite) {
+    const allWorkflowsInOrg = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
     const workflowsObj = { workflows: [] };
     for (const workflow of allWorkflowsInOrg) {
-        workflowsObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
-    }
-    const pathToWrite = path.resolve(process.cwd(), fileLocation);
-    await writeYamlFile(workflowsObj, pathToWrite, overwrite);
-}
-exports.exportWorkflowsToFile = exportWorkflowsToFile;
-async function buildExportWorkflow(workflow, allSchedules) {
-    const exportWorkflow = lodash_1.default.pick(workflow, [
-        'identifier',
-        'name',
-        'triggerKey',
-        'isActive',
-        'messageGroup',
-        'dynamicMessageGroupId',
-        'parallelWorkerCount',
-        'workflowDefinition',
-    ]);
-    const schedules = allSchedules.filter((s) => s.ownerReference === `event-workflow-template:${workflow.id}`);
-    if (schedules.length > 0) {
-        exportWorkflow.crons = schedules.map((s) => ({ name: s.name, cron: s.cron }));
+        const exportWorkflow = lodash_1.default.pick(workflow, [
+            'triggerKey',
+            'workflowDefinition',
+            'name',
+            'isActive',
+            'identifier',
+            'messageGroup',
+            'dynamicMessageGroupId',
+        ]);
+        await (0, helper_1.populateActionIdentifiers)(exportWorkflow);
+        workflowsObj.workflows.push(exportWorkflow);
     }
-    await (0, helper_1.populateActionIdentifiers)(exportWorkflow);
-    (0, helper_1.extractShortActionKeys)(exportWorkflow);
-    return exportWorkflow;
+    await saveData(workflowsObj, fileLocation, overwrite);
 }
-async function writeYamlFile(data, absolutePath, overwrite) {
-    if (fs_1.default.existsSync(absolutePath)) {
-        await (0, file_helpers_1.safeFileOverwrite)(absolutePath, overwrite);
+exports.exportWorkflows = exportWorkflows;
+async function saveData(data, fileLocation, overwrite) {
+    const yamlStr = js_yaml_1.default.dump(data);
+    const CURRENT_DIR = process.cwd();
+    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
+    if (fs_1.default.existsSync(pathToWrite)) {
+        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
     }
-    fs_1.default.mkdirSync(path.dirname(absolutePath), { recursive: true });
-    fs_1.default.writeFileSync(absolutePath, js_yaml_1.default.dump(data), 'utf8');
+    fs_1.default.writeFileSync(pathToWrite, 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 = [];
@@ -288,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.3-alpha.d91b702",
+  "version": "3.5.3-alpha.d978e28",
   "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.",
@@ -2956,16 +3066,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 +3107,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.3-alpha.d91b702",
+  "version": "3.5.3-alpha.d978e28",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",