@contrail/cli 2.0.6 → 2.0.8

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.0.6 darwin-arm64 node-v18.13.0
+@contrail/cli/2.0.8 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -331,11 +331,11 @@ Export all groups in the org.
 
 ```
 USAGE
-  $ contrail groups export [-d <value>] [--overwrite]
+  $ contrail groups export [-f <value>] [--overwrite]
 
 FLAGS
-  -d, --outDir=<value>  [default: groups.yml] The location for the file to be saved
-  --overwrite           Replaces existing files if they exist
+  -f, --outFile=<value>  [default: groups.yml] The location for the file to be saved
+  --overwrite            Replaces existing files if they exist
 
 DESCRIPTION
   Export all groups in the org.
@@ -388,11 +388,12 @@ Exports an data of an instance including types and users
 
 ```
 USAGE
-  $ contrail instance export [--outDir <value>] [--overwrite]
+  $ contrail instance export [-d <value>] [-f]
 
 FLAGS
-  --outDir=<value>  [default: .] The directory to which to export the instance data. Defaults to the current directory
-  --overwrite       Replaces any existing export files in outDir
+  -d, --outDir=<value>  [default: .] The directory to which to export the instance data. Defaults to the current
+                        directory
+  -f, --overwrite       Replaces any existing export files in outDir
 
 DESCRIPTION
   Exports an data of an instance including types and users
@@ -407,10 +408,11 @@ Import the data to an instance, including types and users
 
 ```
 USAGE
-  $ contrail instance import [--dir <value>]
+  $ contrail instance import [-d <value>]
 
 FLAGS
-  --dir=<value>  [default: .] The directory from which to export the instance data. Defaults to the current directory
+  -d, --dir=<value>  [default: .] The directory from which to export the instance data. Defaults to the current
+                     directory
 
 DESCRIPTION
   Import the data to an instance, including types and users
@@ -1088,11 +1090,11 @@ Export all users in the org.
 
 ```
 USAGE
-  $ contrail users export [-d <value>] [--overwrite]
+  $ contrail users export [-f <value>] [--overwrite]
 
 FLAGS
-  -d, --outDir=<value>  [default: users.yml] The location for the file to be saved
-  --overwrite           Replaces existing files if they exist
+  -f, --outFile=<value>  [default: users.yml] The location for the file to be saved
+  --overwrite            Replaces existing files if they exist
 
 DESCRIPTION
   Export all users in the org.

package/dist/api/apps.js

@@ -17,6 +17,7 @@ async function getAllAvailableApps(options) {
         criteria: {
             orgId: options.orgId,
             private: false,
+            hidden: true,
         },
     }));
     return apps;

package/dist/api/users.d.ts

@@ -0,0 +1,2 @@
+export declare function getUserOrgs(options?: any): Promise<any[]>;
+export declare function getGroups(options?: any): Promise<any[]>;

package/dist/api/users.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGroups = exports.getUserOrgs = void 0;
+const sdk_1 = require("@contrail/sdk");
+async function getUserOrgs(options) {
+    return new sdk_1.Entities().get({
+        entityName: 'user-org', ...options
+    });
+}
+exports.getUserOrgs = getUserOrgs;
+async function getGroups(options) {
+    return new sdk_1.Entities().get({
+        entityName: 'group', ...options
+    });
+}
+exports.getGroups = getGroups;

package/dist/commands/groups/export.d.ts

@@ -4,7 +4,7 @@ export default class ExportGroups extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        outDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        outFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/groups/export.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportGroups = exports.DEFAULT_FILE_LOCATION = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
-const sdk_1 = require("@contrail/sdk");
 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 users_1 = require("../../api/users");
 exports.DEFAULT_FILE_LOCATION = 'groups.yml';
 class ExportGroups extends core_1.Command {
     async run() {
@@ -18,7 +18,7 @@ class ExportGroups extends core_1.Command {
         try {
             await (0, login_1.authUser)();
             this.log('%s Getting Groups.', chalk_1.default.blue.bold('START'));
-            await exportGroups((_a = flags.outDir) !== null && _a !== void 0 ? _a : exports.DEFAULT_FILE_LOCATION, flags.overwrite);
+            await exportGroups((_a = flags.outFile) !== null && _a !== void 0 ? _a : exports.DEFAULT_FILE_LOCATION, flags.overwrite);
             this.log('%s Done', chalk_1.default.yellow.bold('GROUPS'));
         }
         catch (e) {
@@ -35,16 +35,12 @@ ExportGroups.examples = [
 `,
 ];
 ExportGroups.flags = {
-    outDir: core_1.Flags.string({ char: 'd', description: 'The location for the file to be saved', required: false, default: exports.DEFAULT_FILE_LOCATION }),
+    outFile: core_1.Flags.string({ char: 'f', description: 'The location for the file to be saved', required: false, default: exports.DEFAULT_FILE_LOCATION }),
     overwrite: core_1.Flags.boolean({ description: 'Replaces existing files if they exist', required: false, default: false })
 };
 async function exportGroups(fileLocation, overwrite) {
-    const allGroups = await new sdk_1.Entities().get({
-        entityName: 'group', relations: ['groupPrincipals']
-    });
-    const allUsersInOrg = await new sdk_1.Entities().get({
-        entityName: 'user-org',
-    });
+    const allGroups = await (0, users_1.getGroups)({ relations: ['groupPrincipals'] });
+    const allUsersInOrg = await (0, users_1.getUserOrgs)();
     const groups = [];
     for (const group of allGroups) {
         const groupPrincipals = getGroupPrincipals(group, allGroups, allUsersInOrg);
@@ -53,19 +49,26 @@ async function exportGroups(fileLocation, overwrite) {
             groupPrincipals,
         });
     }
+    console.log("saving groups:", JSON.stringify(groups));
     await saveData(groups, fileLocation, overwrite);
 }
 exports.exportGroups = exportGroups;
 async function saveData(data, fileLocation, overwrite) {
     const yamlStr = js_yaml_1.default.dump(data);
+    console.log("file location:", fileLocation);
+    console.log("final yml string:", yamlStr);
     const CURRENT_DIR = process.cwd();
-    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
+    const pathToWrite = path.join(CURRENT_DIR, fileLocation);
     if (fs_1.default.existsSync(pathToWrite)) {
         await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
     }
     fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
 }
 function getGroupPrincipals(group, allGroups, orgUsers) {
+    if (!(group === null || group === void 0 ? void 0 : group.groupPrincipals)) {
+        return [];
+    }
+    console.log("all groups:", allGroups.map(x => x.id));
     const principals = [];
     for (const principal of group.groupPrincipals) {
         const [type, id] = principal.principalReference.split(':');
@@ -83,6 +86,7 @@ function getGroupPrincipals(group, allGroups, orgUsers) {
         }
         else if (type === 'group') {
             const nestedGroup = allGroups.find(x => x.id === id);
+            console.log("looking for group", id);
             principals.push({
                 type: 'group',
                 name: nestedGroup.name

package/dist/commands/groups/upload.js

@@ -56,12 +56,12 @@ async function uploadGroups(fileLocation) {
     });
     const toDelete = existingGroups.filter(x => !groupsToImport.map(y => y.name).includes(x.name));
     const toCreate = groupsToImport.filter(x => !existingGroups.map(y => y.name).includes(x.name));
-    const toUpdate = existingGroups.filter(x => groupsToImport.map(y => y.name).includes(x.name));
+    const toUpdate = groupsToImport.filter(x => existingGroups.map(y => y.name).includes(x.name));
     const createdGroups = [];
     // it's important to create all the groups first, to resolve any downstream principal dependencies
     for (const group of toCreate) {
         if (!group.groupPrincipals || !group.name) {
-            console.log('skipping invalid group');
+            console.log('skipping create of invalid group');
         }
         createdGroups.push(await new sdk_1.Entities().create({
             entityName: 'group', object: { name: group.name }
@@ -77,90 +77,67 @@ async function uploadGroups(fileLocation) {
     }
     for (const group of toUpdate) {
         if (!group.groupPrincipals || !group.name) {
-            console.log('skipping invalid group');
+            console.log('skipping update invalid group');
         }
-        await updateGroup(group.groupPrincipals, orgUsers, group, allGroupsAfterCreate);
+        const existingGroup = existingGroups.find(x => x.name === group.name);
+        await updateGroup(group.groupPrincipals, orgUsers, existingGroup, allGroupsAfterCreate);
     }
     for (const group of toDelete) {
         if (!group.groupPrincipals || !group.name) {
-            console.log('skipping invalid group');
+            console.log('skipping delete of invalid group');
         }
         await new sdk_1.Entities().delete({ entityName: 'group', id: group.id });
     }
 }
 exports.uploadGroups = uploadGroups;
 async function updateGroup(principals, orgUsers, existingGroup, allGroupsAfterCreate) {
-    const existingPrincipals = existingGroup.groupPrincipals;
-    for (const principal of principals) {
-        if (principal.type === 'user') {
-            const user = orgUsers.map(x => x.user).find(x => x.email === (principal === null || principal === void 0 ? void 0 : principal.email));
-            if (!user) {
-                console.log(`user ${principal.email} is not in this org's user list`);
-            }
-            const principalId = `user:${user.id}`;
-            if (existingPrincipals.map(x => x.principalReference).includes(principalId)) {
-                continue;
-            }
-            await new sdk_1.Entities().update({
-                entityName: 'group-principal', object: {
-                    principalReference: `user:${user.id}`,
-                    groupId: existingGroup.id
-                }
-            });
+    var _a;
+    const principalsToUpdate = principals
+        .map(x => groupPrincipalNameToId(x, allGroupsAfterCreate, orgUsers))
+        .filter(x => !!x)
+        .map(x => { return { principalReference: `${x.type}:${x.identifier}`, groupId: existingGroup.id }; });
+    await new sdk_1.Entities().batchCreate({
+        entityName: 'group-principal', objects: {
+            principalReferences: principalsToUpdate.map(x => x.principalReference),
+            groupIds: [existingGroup.id]
         }
-        else if (principal.type === 'group') {
-            const group = allGroupsAfterCreate.find(x => x.name === principal.name);
-            if (!group) {
-                console.log(`group ${principal.name} is not in this org's group list`);
-            }
-            const principalId = `group:${principal.name}`;
-            if (existingPrincipals.map(x => x.principalReference).includes(principalId)) {
-                continue;
-            }
-            await new sdk_1.Entities().update({
-                entityName: 'group-principal', object: {
-                    principalReference: `group:${group.id}`,
-                    groupId: existingGroup.id
-                }
-            });
-        }
-    }
+    });
+    // remove principals
+    const principalsToKeep = principalsToUpdate.map(principal => `${principal.type}:${principal.identifier}`);
+    const principalsToDelete = ((_a = existingGroup === null || existingGroup === void 0 ? void 0 : existingGroup.groupPrincipals) !== null && _a !== void 0 ? _a : [])
+        .map(x => groupPrincipalNameToId(x, allGroupsAfterCreate, orgUsers))
+        .filter(x => !!x)
+        .filter(x => !principalsToKeep.includes(`${x.type}:${x.identifier}`));
+    await principalsToDelete.forEach(async (principal) => {
+        await new sdk_1.Entities().delete({
+            entityName: 'group-principal', id: principal.cloudId
+        });
+    });
 }
 async function createGroupPrincipals(group, principals, orgUsers, allGroupsAfterCreate) {
-    for (const principal of principals) {
-        if (principal.type === 'user') {
-            try {
-                const user = orgUsers.map(x => x.user).find(x => x.email === (principal === null || principal === void 0 ? void 0 : principal.email));
-                if (!user) {
-                    console.log(`user ${principal.email} is not in this org's user list`);
-                }
-                await new sdk_1.Entities().create({
-                    entityName: 'group-principal', object: {
-                        principalReference: `user:${user.id}`,
-                        groupId: group.id
-                    }
-                });
-            }
-            catch (e) {
-                console.log('could not create group principal');
-            }
+    const principalsToCreate = principals
+        .map(x => groupPrincipalNameToId(x, allGroupsAfterCreate, orgUsers))
+        .filter(x => !!x)
+        .map(x => { return { principalReference: `${x.type}:${x.identifier}`, groupId: group.id }; });
+    await new sdk_1.Entities().batchCreate({
+        entityName: 'group-principal', objects: principalsToCreate
+    });
+}
+function groupPrincipalNameToId(principal, groups, orgUsers) {
+    if (principal.type === 'user') {
+        const user = orgUsers.map(x => x.user).find(x => x.email === (principal === null || principal === void 0 ? void 0 : principal.email));
+        if (!user) {
+            console.log(`user ${principal.email} is not in this org's user list`);
+            return undefined;
         }
-        else if (principal.type === 'group') {
-            try {
-                const nestedGroup = allGroupsAfterCreate.find(x => x.name === principal.name);
-                if (!nestedGroup) {
-                    console.log(`group ${principal.name} is not in this org's group list`);
-                }
-                await new sdk_1.Entities().create({
-                    entityName: 'group-principal', object: {
-                        principalReference: `group:${nestedGroup.id}`,
-                        groupId: group.id
-                    }
-                });
-            }
-            catch (e) {
-                console.log('could not create nested group');
-            }
+        return { type: 'user', identifier: user.id, cloudId: principal.id };
+    }
+    else if (principal.type === 'group') {
+        const group = groups.find(x => x.name === principal.name);
+        if (!group) {
+            console.log(`group ${principal.name} is not in this org's group list`);
+            return undefined;
         }
+        return { type: 'group', identifier: group.id, cloudId: principal.id };
     }
 }

package/dist/commands/instance/export.js

@@ -5,11 +5,13 @@ const path = tslib_1.__importStar(require("path"));
 const core_1 = require("@oclif/core");
 const getAll_1 = require("../types/getAll");
 const export_1 = require("../users/export");
+const export_2 = require("../groups/export");
 class ExportInstance extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ExportInstance);
         await (0, getAll_1.getAll)(flags.outDir, flags.overwrite);
         await (0, export_1.exportUsers)(path.join(flags.outDir, 'users.yml'), flags.overwrite);
+        await (0, export_2.exportGroups)(path.join(flags.outDir, 'groups.yml'), flags.overwrite);
     }
 }
 exports.default = ExportInstance;
@@ -19,6 +21,6 @@ ExportInstance.examples = [
 `,
 ];
 ExportInstance.flags = {
-    outDir: core_1.Flags.string({ description: 'The directory to which to export the instance data. Defaults to the current directory', required: false, default: '.' }),
-    overwrite: core_1.Flags.boolean({ description: 'Replaces any existing export files in outDir', required: false, default: false })
+    outDir: core_1.Flags.string({ char: 'd', description: 'The directory to which to export the instance 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 })
 };

package/dist/commands/instance/import.js

@@ -5,11 +5,15 @@ const path = tslib_1.__importStar(require("path"));
 const core_1 = require("@oclif/core");
 const loadAll_1 = require("../types/loadAll");
 const upload_1 = require("../users/upload");
+const upload_2 = require("../groups/upload");
+const uploadTypePropertyPolicies_1 = require("../types/uploadTypePropertyPolicies");
 class ImportInstance extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ImportInstance);
-        await (0, loadAll_1.loadAll)(flags.dir);
+        await (0, loadAll_1.loadAll)(flags.dir, true);
         await (0, upload_1.uploadUsers)(path.join(flags.dir, 'users.yml'));
+        await (0, upload_2.uploadGroups)(path.join(flags.dir, 'groups.yml'));
+        await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(flags.dir);
     }
 }
 exports.default = ImportInstance;
@@ -19,5 +23,5 @@ ImportInstance.examples = [
 `,
 ];
 ImportInstance.flags = {
-    dir: core_1.Flags.string({ description: 'The directory from which to export the instance data. Defaults to the current directory', required: false, default: '.' }),
+    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the instance data. Defaults to the current directory', required: false, default: '.' }),
 };

package/dist/commands/types/getAll.d.ts

@@ -30,4 +30,4 @@ export default class GetAllTypes extends Command {
 }
 export declare function getAll(outDir: string, overwrite: boolean): Promise<void>;
 export declare function reduceTypes(dataHolder: DataHolder): any[];
-export declare function reduceData(data: DataHolder): ReducedDataHolder;
+export declare function reduceData(data: DataHolder): Promise<ReducedDataHolder>;

package/dist/commands/types/getAll.js

@@ -10,6 +10,7 @@ const path = tslib_1.__importStar(require("path"));
 const type_extractor_1 = require("../../helpers/types/type-extractor");
 const types_1 = require("../../api/types");
 const file_helpers_1 = require("../../helpers/file-helpers");
+const users_1 = require("../../api/users");
 const yaml = require('js-yaml');
 class GetAllTypes extends core_1.Command {
     async run() {
@@ -45,7 +46,7 @@ async function getAll(outDir, overwrite) {
             typePropertyPolicies: await (0, types_1.getTypePropertyPolicies)(),
             typePropertyPolicyLinks: await (0, types_1.getTypePropertyPolicyLinks)(),
         };
-        const reducedData = reduceData(data);
+        const reducedData = await reduceData(data);
         await saveData(reducedData, outDir, overwrite);
         console.log('%s Retrieved', chalk_1.default.yellow.bold('TYPES'));
     }
@@ -56,14 +57,43 @@ async function getAll(outDir, overwrite) {
     console.log('%s Types Retrieval Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.getAll = getAll;
-function reduceTypePropertyPolicies(data) {
+async function reduceTypePropertyPolicies(data) {
     var _a;
+    const orgUsers = await (0, users_1.getUserOrgs)();
+    const groups = await (0, users_1.getGroups)();
+    function reducePrincipal(statement) {
+        var _a, _b;
+        if (!(statement === null || statement === void 0 ? void 0 : statement.principal)) {
+            return statement;
+        }
+        const [type, id] = statement.principal.split(':');
+        if (!type || !id) {
+            return statement;
+        }
+        if (type === 'group') {
+            const groupName = (_a = groups.find(x => x.id === id)) === null || _a === void 0 ? void 0 : _a.name;
+            if (!groupName) {
+                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
+                return statement;
+            }
+            statement.principal = `group:${groupName}`;
+        }
+        else if (type === 'user') {
+            const userEmail = (_b = orgUsers.find(x => x.user.id === id)) === null || _b === void 0 ? void 0 : _b.email;
+            if (!userEmail) {
+                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
+                return statement;
+            }
+            statement.principal = `user:${userEmail}`;
+        }
+        return statement;
+    }
     return (_a = data === null || data === void 0 ? void 0 : data.typePropertyPolicies) === null || _a === void 0 ? void 0 : _a.map(x => {
         return {
             label: x.label,
             policy: {
                 version: x.policy.version,
-                statements: x.policy.statements,
+                statements: x.policy.statements.map(x => reducePrincipal(x)),
             }
         };
     });
@@ -195,7 +225,7 @@ function reduceTypes(dataHolder) {
     return reducedTypes;
 }
 exports.reduceTypes = reduceTypes;
-function reduceData(data) {
+async function reduceData(data) {
     return {
         reducedTypes: reduceTypes(data),
         reducedOptionSets: reduceOptionSets(data),
@@ -203,7 +233,7 @@ function reduceData(data) {
         reducedRuleSets: reduceRuleSets(data),
         reducedRuleSetLinks: reduceRuleSetLinks(data),
         reducedUsageInfo: reduceUsageInfo(data),
-        reducedTypePropertyPolicies: reduceTypePropertyPolicies(data),
+        reducedTypePropertyPolicies: await reduceTypePropertyPolicies(data),
         reducedTypePropertyPolicyLinks: reduceTypePropertyPolicyLinks(data),
     };
 }

package/dist/commands/types/loadAll.d.ts

@@ -7,4 +7,4 @@ export default class LoadAllTypes extends Command {
     };
     run(): Promise<void>;
 }
-export declare function loadAll(dir: string): Promise<void>;
+export declare function loadAll(dir: string, skipPolicies?: boolean): Promise<void>;

package/dist/commands/types/loadAll.js

@@ -26,7 +26,7 @@ LoadAllTypes.examples = [
 LoadAllTypes.flags = {
     dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to load the types data. Defaults to the current directory.', required: false, default: '.' }),
 };
-async function loadAll(dir) {
+async function loadAll(dir, skipPolicies = false) {
     try {
         await (0, login_1.authUser)();
         await (0, uploadOptionSets_1.uploadOptionSets)(dir);
@@ -34,7 +34,9 @@ async function loadAll(dir) {
         await (0, type_uploader_1.uploadTypes)(dir);
         await (0, uploadUsageInfo_1.uploadUsageInfo)(dir);
         await (0, uploadRuleSets_1.uploadRuleSets)(dir);
-        await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(dir);
+        if (!skipPolicies) {
+            await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(dir);
+        }
     }
     catch (e) {
         console.log(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -9,6 +9,7 @@ const login_1 = require("../../auth/login");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
 const type_extractor_1 = require("../../helpers/types/type-extractor");
+const users_1 = require("../../api/users");
 const yaml = require('js-yaml');
 class UploadTypePropertyPolicies extends core_1.Command {
     async run() {
@@ -58,6 +59,42 @@ function loadTPPolicies(fromDir) {
     }
 }
 async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
+    const orgUsers = await (0, users_1.getUserOrgs)();
+    const groups = await (0, users_1.getGroups)();
+    function fillPrincipal(statement) {
+        const principal = statement === null || statement === void 0 ? void 0 : statement.principal;
+        if (!principal) {
+            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            return statement;
+        }
+        const [type, identifier] = principal.split(':');
+        if (!type || !identifier) {
+            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            return statement;
+        }
+        if (type === 'group') {
+            const group = groups.find(x => x.name === identifier);
+            if (!group) {
+                console.log(`Could not find group ${identifier}`);
+            }
+            else {
+                statement.principal = `group:${group.id}`;
+            }
+        }
+        else if (type === 'user') {
+            const orgUser = orgUsers.find(x => x.user.email === identifier);
+            if (!orgUser) {
+                console.log(`Could not find user ${identifier}`);
+            }
+            else {
+                statement.principal = `user:${orgUser.user.id}`;
+            }
+        }
+        return statement;
+    }
+    reducedTypePropertyPolicies.forEach(policy => {
+        policy.policy.statements = policy.policy.statements.map(x => fillPrincipal(x));
+    });
     const currentTPPolicies = await new sdk_1.Entities().get({
         entityName: 'type-property-policy',
     });
@@ -69,8 +106,6 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
     for (const loadedTPP of reducedTypePropertyPolicies) {
         loadedTPPByName[loadedTPP.label] = loadedTPP;
     }
-    // console.debug('current tp policy:', currentTPPolicies);
-    // console.debug('reduced tp policy:', reducedTypePropertyPolicies);
     for (const [label, loadedTPP] of Object.entries(loadedTPPByName)) {
         try {
             const found = currentTPPByLabel[label];
@@ -137,8 +172,6 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
         const hash = `${loadedLink.typePropertySlug}|${loadedLink.typePropertyPolicyLabel}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
-    console.debug('current type property policy links:', currentLinksHashes);
-    console.debug('reduced type property policy links:', reducedLinksByHashes);
     for (const loadedTPPLink of reducedTypePropertyPolicyLinks) {
         try {
             const found = currentLinksHashes[`${loadedTPPLink.typePropertySlug}|${loadedTPPLink.typePropertyPolicyLabel}`];
@@ -146,7 +179,6 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
                 if (!transformReducedLink(loadedTPPLink, typeProperties, currentTPPs)) {
                     continue;
                 }
-                console.log('Creating: ', loadedTPPLink);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-policy-link',
                     object: {
@@ -159,7 +191,6 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
                 if (!transformReducedLink(loadedTPPLink, typeProperties, currentTPPs)) {
                     continue;
                 }
-                console.log('skipping existing link: ', loadedTPPLink);
             }
         }
         catch (err) {

package/dist/commands/users/export.d.ts

@@ -4,7 +4,7 @@ export default class ExportUsers extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        outDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        outFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/users/export.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportUsers = exports.DEFAULT_FILE_LOCATION = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
-const sdk_1 = require("@contrail/sdk");
 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 users_1 = require("../../api/users");
 exports.DEFAULT_FILE_LOCATION = 'users.yml';
 class ExportUsers extends core_1.Command {
     async run() {
@@ -18,7 +18,7 @@ class ExportUsers extends core_1.Command {
         try {
             await (0, login_1.authUser)();
             this.log('%s Getting Users.', chalk_1.default.blue.bold('START'));
-            await exportUsers((_a = flags.outDir) !== null && _a !== void 0 ? _a : exports.DEFAULT_FILE_LOCATION, flags.overwrite);
+            await exportUsers((_a = flags.outFile) !== null && _a !== void 0 ? _a : exports.DEFAULT_FILE_LOCATION, flags.overwrite);
             this.log('%s Done', chalk_1.default.yellow.bold('USERS'));
         }
         catch (e) {
@@ -35,13 +35,11 @@ ExportUsers.examples = [
 `,
 ];
 ExportUsers.flags = {
-    outDir: core_1.Flags.string({ char: 'd', description: 'The location for the file to be saved', required: false, default: exports.DEFAULT_FILE_LOCATION }),
+    outFile: core_1.Flags.string({ char: 'f', description: 'The location for the file to be saved', required: false, default: exports.DEFAULT_FILE_LOCATION }),
     overwrite: core_1.Flags.boolean({ description: 'Replaces existing files if they exist', required: false, default: false })
 };
 async function exportUsers(fileLocation, overwrite) {
-    const allUsersInOrg = await new sdk_1.Entities().get({
-        entityName: 'user-org',
-    });
+    const allUsersInOrg = await (0, users_1.getUserOrgs)();
     const users = [];
     for (const userInOrg of allUsersInOrg) {
         delete userInOrg.user.id;

package/dist/helpers/file-helpers.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.safeFileOverwrite = void 0;
 const tslib_1 = require("tslib");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
-const PASS_FORCE_TO_OVERWRITE = 'Pass --force to overwrite without prompting';
+const PASS_FORCE_TO_OVERWRITE = 'Pass --overwrite to overwrite without prompting';
 //throws an error if the user declines to overwrite the file
 async function safeFileOverwrite(fileLocation, overwrite) {
     if (overwrite) {

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

@@ -8,6 +8,7 @@ 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");
 class WorkflowTemplateDefinitionDeployer {
     async cliInstallWorkflowTemplateDefinitions() {
         const installedApps = await (0, apps_1.getInstalledApps)();
@@ -94,6 +95,7 @@ class WorkflowTemplateDefinitionDeployer {
         console.log(`%s \tDeploying workflow definitions: ${workflowKey}`, chalk_1.default.yellow.bold('WORKFLOW DEFINITION'));
         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);
         }

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

@@ -9,6 +9,7 @@ const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const event_workflow_action_definition_1 = require("../../api/event-workflow-action-definition");
 const event_workflow_templates_1 = require("../../api/event-workflow-templates");
 const login_1 = require("../../auth/login");
+const interface_converters_1 = require("../../interface-converters");
 const yaml = require('js-yaml');
 class LocalWorkflowTemplateDeployer {
     async deployWorkflows(wtDeclaration) {
@@ -24,6 +25,7 @@ class LocalWorkflowTemplateDeployer {
         console.log(`%s \tDeploying workflow: ${workflowKey}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
         const identifier = getWorkflowTemplateIdentifier(workflowKey);
         const existingTemplate = existingWorkflows.find(ad => ad.identifier === identifier);
+        (0, interface_converters_1.convertWorkflow)(workflow);
         if (existingTemplate) {
             return await this.updateWorkflowTemplate(workflowKey, existingTemplate, workflow);
         }
@@ -47,6 +49,7 @@ class LocalWorkflowTemplateDeployer {
     }
     async populateActionIds(workflowTemplate, workflowKey) {
         var _a;
+        console.log('workflow tempalate:', JSON.stringify(workflowTemplate, null, 2));
         if (!((_a = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.workflowDefinition) === null || _a === void 0 ? void 0 : _a.paths)) {
             return;
         }
@@ -70,11 +73,14 @@ class LocalWorkflowTemplateDeployer {
         }
     }
     async updateWorkflowTemplate(workflowKey, existingWorkflowTemplate, workflowTemplate) {
+        var _a, _b;
         await this.populateActionIds(workflowTemplate, workflowKey);
         const updates = Object.assign(new Object(), {
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
-            workflowDefinition: workflowTemplate.workflowDefinition
+            workflowDefinition: workflowTemplate.workflowDefinition,
+            messageGroupId: (_a = workflowTemplate.messageGroupId) !== null && _a !== void 0 ? _a : existingWorkflowTemplate.messageGroupId,
+            parallelWorkerCount: (_b = workflowTemplate.parallelWorkerCount) !== null && _b !== void 0 ? _b : existingWorkflowTemplate.parallelWorkerCount,
         });
         const updatedWorkflowTemplate = await (0, event_workflow_templates_1.updateWorkflowTemplate)({ id: existingWorkflowTemplate.id, updates });
         console.log(`%s      Updated existing workflow template: ${updatedWorkflowTemplate.identifier}`, chalk_1.default.yellow.bold('WORKFLOW TEMPLATES'));
@@ -157,7 +163,6 @@ function loadTemplateConfig(saveFile) {
     const TARGET_DIR = process.cwd();
     try {
         const doc = yaml.load(fs_1.default.readFileSync(path.resolve(path.join(TARGET_DIR, saveFile)), 'utf8'));
-        console.log(doc);
         return doc;
     }
     catch (e) {

package/dist/interface-converters.d.ts

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,11 @@
+"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) {
+    var _a;
+    workflow.parallelWorkerCount = (_a = workflow.parallelism) !== null && _a !== void 0 ? _a : exports.DEFAULT_WORKFLOW_PARALLELISM;
+    workflow.messageGroupId = workflow.groupId;
+}
+exports.convertWorkflow = convertWorkflow;

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

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

package/dist/interface-converters.spec.js

@@ -0,0 +1,89 @@
+"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();
+    });
+});

package/dist/interfaces.d.ts

@@ -57,6 +57,8 @@ export interface WorkflowDefinition {
     isActive: boolean;
     public: boolean;
     supportingAppId?: string;
+    parallelism?: number;
+    groupId?: string;
     messageGroupId?: string;
     parallelWorkerCount?: number;
 }
@@ -74,6 +76,8 @@ export interface WorkflowTemplate {
     isActive: boolean;
     ownerKey?: string;
     supportingAppId?: string;
+    parallelism?: number;
+    groupId?: string;
     messageGroupId?: string;
     parallelWorkerCount?: number;
 }

package/dist/templates/typescript/app.yml

@@ -34,6 +34,7 @@ workflows:
     triggerKey: item|update
     isActive: true
     public: true
+    concurrency: 3  # The maximum number of concurrent jobs to run for this workflow. Defaults to 5
     workflowDefinition:
       paths:
         - conditional: "true"

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.6",
+  "version": "2.0.8",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -307,10 +307,10 @@
         "$ contrail groups export\n"
       ],
       "flags": {
-        "outDir": {
-          "name": "outDir",
+        "outFile": {
+          "name": "outFile",
           "type": "option",
-          "char": "d",
+          "char": "f",
           "description": "The location for the file to be saved",
           "required": false,
           "multiple": false,
@@ -361,6 +361,7 @@
         "outDir": {
           "name": "outDir",
           "type": "option",
+          "char": "d",
           "description": "The directory to which to export the instance data. Defaults to the current directory",
           "required": false,
           "multiple": false,
@@ -369,6 +370,7 @@
         "overwrite": {
           "name": "overwrite",
           "type": "boolean",
+          "char": "f",
           "description": "Replaces any existing export files in outDir",
           "required": false,
           "allowNo": false
@@ -391,6 +393,7 @@
         "dir": {
           "name": "dir",
           "type": "option",
+          "char": "d",
           "description": "The directory from which to export the instance data. Defaults to the current directory",
           "required": false,
           "multiple": false,
@@ -930,10 +933,10 @@
         "$ contrail users export\n"
       ],
       "flags": {
-        "outDir": {
-          "name": "outDir",
+        "outFile": {
+          "name": "outFile",
           "type": "option",
-          "char": "d",
+          "char": "f",
           "description": "The location for the file to be saved",
           "required": false,
           "multiple": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -50,16 +50,17 @@
   "devDependencies": {
     "@oclif/test": "^2.3.8",
     "@types/chai": "^4",
-    "@types/mocha": "^9.0.0",
+    "@types/jest": "^29.5.0",
     "@types/node": "^16.18.14",
     "chai": "^4",
     "eslint": "^8.35.0",
     "eslint-config-oclif": "^4",
     "eslint-config-oclif-typescript": "^1.0.3",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "mocha": "^9",
+    "jest": "^29.5.0",
     "oclif": "^3",
     "shx": "^0.3.3",
+    "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
     "typescript": "^4.9.5"
@@ -106,16 +107,29 @@
   },
   "scripts": {
     "build": "shx rm -rf dist && tsc -b && npm run copy-templates",
-    "lint": "eslint . --ext .ts --config .eslintrc",
+    "lint": "eslint . --ext .ts --config .eslintrc.js",
     "copy-templates": "cp -r templates/ dist/templates",
     "postpack": "shx rm -f oclif.manifest.json",
-    "posttest": "yarn lint",
     "prepack": "yarn build && oclif manifest && oclif readme",
-    "test": "mocha --forbid-only \"test/**/*.test.ts\"",
+    "test": "jest",
     "version": "oclif readme && git add README.md"
   },
   "engines": {
     "node": ">=12.0.0"
   },
-  "types": "dist/index.d.ts"
+  "types": "dist/index.d.ts",
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".spec.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
 }