@contrail/cli 2.0.4 → 2.0.6

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.0.4 darwin-arm64 node-v18.13.0
+@contrail/cli/2.0.6 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -40,6 +40,8 @@ To get instructions on how to set up autocomplete for your shell, run `contrail
 * [`contrail config list`](#contrail-config-list)
 * [`contrail config remove`](#contrail-config-remove)
 * [`contrail config set`](#contrail-config-set)
+* [`contrail groups export`](#contrail-groups-export)
+* [`contrail groups upload GROUPSFILE`](#contrail-groups-upload-groupsfile)
 * [`contrail help [COMMANDS]`](#contrail-help-commands)
 * [`contrail instance export`](#contrail-instance-export)
 * [`contrail instance import`](#contrail-instance-import)
@@ -137,9 +139,10 @@ Install an app from the marketplace
 
 ```
 USAGE
-  $ contrail app install [-i <value>] [-w]
+  $ contrail app install [-i <value>] [-w] [-h]
 
 FLAGS
+  -h, --showHidden                Show the option to install public but hidden apps
   -i, --appIdentifier=<value>     The identifier of the app to install
   -w, --installWorkflowTemplates  Install the app's accompanying workflows
 
@@ -322,6 +325,43 @@ EXAMPLES
   $ contrail config set --orgId 1234
 ```
 
+## `contrail groups export`
+
+Export all groups in the org.
+
+```
+USAGE
+  $ contrail groups export [-d <value>] [--overwrite]
+
+FLAGS
+  -d, --outDir=<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.
+
+EXAMPLES
+  $ contrail groups export
+```
+
+## `contrail groups upload GROUPSFILE`
+
+Import all groups in the groups.yml file
+
+```
+USAGE
+  $ contrail groups upload GROUPSFILE
+
+ARGUMENTS
+  GROUPSFILE  The .yml file containing the groups
+
+DESCRIPTION
+  Import all groups in the groups.yml file
+
+EXAMPLES
+  $ contrail groups import <GROUPS_FILE>
+```
+
 ## `contrail help [COMMANDS]`
 
 Display help for contrail.
@@ -720,11 +760,11 @@ Get all Types and associated data for your Org
 
 ```
 USAGE
-  $ contrail types getAll [--outDir <value>] [--overwrite]
+  $ contrail types getAll [-d <value>] [--overwrite]
 
 FLAGS
-  --outDir=<value>  [default: .] The directory to which to export the type 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 type data. Defaults to the current directory
+  --overwrite           Replaces any existing export files in outDir
 
 DESCRIPTION
   Get all Types and associated data for your Org
@@ -1048,11 +1088,11 @@ Export all users in the org.
 
 ```
 USAGE
-  $ contrail users export [-f <value>] [--overwrite]
+  $ contrail users export [-d <value>] [--overwrite]
 
 FLAGS
-  -f, --fileOut=<value>  The location for the file to be saved
-  --overwrite            Replaces existing files if they exist
+  -d, --outDir=<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.d.ts

@@ -10,4 +10,4 @@ export declare function upgradeAppVersion(appOrg: any, appVersionId: any): Promi
 export declare function deleteAppOrg(appOrgId: string): Promise<AppOrg>;
 export declare function getInstalledApps(): Promise<AppOrg[]>;
 export declare function installAppToOrg(app: any, configProperties: any): Promise<AppOrg>;
-export declare function getAvailableApps(): Promise<App[]>;
+export declare function getAvailableApps(options?: any): Promise<App[]>;

package/dist/api/apps.js

@@ -74,7 +74,7 @@ async function installAppToOrg(app, configProperties) {
     });
 }
 exports.installAppToOrg = installAppToOrg;
-async function getAvailableApps() {
+async function getAvailableApps(options) {
     const orgId = auth_1.Auth.config.orgId;
     const apps = [];
     apps.push(...await new sdk_1.Entities().get({
@@ -89,6 +89,7 @@ async function getAvailableApps() {
         criteria: {
             orgId,
             private: false,
+            ...options
         },
     }));
     return apps;

package/dist/commands/app/install.d.ts

@@ -6,6 +6,7 @@ export default class InstallApp extends Command {
     static flags: {
         appIdentifier: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         installWorkflowTemplates: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        showHidden: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/app/install.js

@@ -10,9 +10,9 @@ const apps_1 = require("../../api/apps");
 const workflow_template_definition_deployer_1 = require("../../helpers/workflow-template-definitions/workflow-template-definition-deployer");
 class InstallApp extends core_1.Command {
     async run() {
-        const { args, flags } = await this.parse(InstallApp);
+        const { flags } = await this.parse(InstallApp);
         await (0, login_1.authUser)();
-        const apps = await (0, apps_1.getAvailableApps)();
+        const apps = await (0, apps_1.getAvailableApps)({ hidden: flags.showHidden });
         if (!apps.length) {
             throw new Error('No apps are available to install...');
         }
@@ -94,6 +94,7 @@ InstallApp.strict = true;
 InstallApp.flags = {
     appIdentifier: core_1.Flags.string({ char: 'i', description: 'The identifier of the app to install', required: false }),
     installWorkflowTemplates: core_1.Flags.boolean({ char: 'w', description: 'Install the app\'s accompanying workflows', required: false }),
+    showHidden: core_1.Flags.boolean({ char: 'h', description: 'Show the option to install public but hidden apps', required: false }),
 };
 async function getConfigProperties(app) {
     const config = {};

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

@@ -0,0 +1,12 @@
+import { Command } from '@oclif/core';
+export declare const DEFAULT_FILE_LOCATION = "groups.yml";
+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>;
+        overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}
+export declare function exportGroups(fileLocation: string, overwrite: boolean): Promise<void>;

package/dist/commands/groups/export.js

@@ -0,0 +1,93 @@
+"use strict";
+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");
+exports.DEFAULT_FILE_LOCATION = 'groups.yml';
+class ExportGroups extends core_1.Command {
+    async run() {
+        var _a;
+        const { flags } = await this.parse(ExportGroups);
+        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);
+            this.log('%s Done', chalk_1.default.yellow.bold('GROUPS'));
+        }
+        catch (e) {
+            this.log(`%s Groups download Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            return;
+        }
+        this.log('%s Groups download Complete.', chalk_1.default.green.bold('COMPLETE'));
+    }
+}
+exports.default = ExportGroups;
+ExportGroups.description = 'Export all groups in the org.';
+ExportGroups.examples = [
+    `$ contrail groups export
+`,
+];
+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 }),
+    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 groups = [];
+    for (const group of allGroups) {
+        const groupPrincipals = getGroupPrincipals(group, allGroups, allUsersInOrg);
+        groups.push({
+            name: group.name,
+            groupPrincipals,
+        });
+    }
+    await saveData(groups, fileLocation, overwrite);
+}
+exports.exportGroups = exportGroups;
+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.writeFileSync(pathToWrite, yamlStr, 'utf8');
+}
+function getGroupPrincipals(group, allGroups, orgUsers) {
+    const principals = [];
+    for (const principal of group.groupPrincipals) {
+        const [type, id] = principal.principalReference.split(':');
+        if (type === 'user') {
+            const user = orgUsers.find(x => x.user.id === id);
+            if (user) {
+                principals.push({
+                    type,
+                    email: user.user.email
+                });
+            }
+            else {
+                console.log('couldn\'t find user', id);
+            }
+        }
+        else if (type === 'group') {
+            const nestedGroup = allGroups.find(x => x.id === id);
+            principals.push({
+                type: 'group',
+                name: nestedGroup.name
+            });
+        }
+    }
+    return principals;
+}

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

@@ -0,0 +1,10 @@
+import { Command } from '@oclif/core';
+export default class ImportGroups extends Command {
+    static description: string;
+    static examples: string[];
+    static args: {
+        groupsFile: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}
+export declare function uploadGroups(fileLocation: string): Promise<void>;

package/dist/commands/groups/upload.js

@@ -0,0 +1,166 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadGroups = 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");
+class ImportGroups extends core_1.Command {
+    async run() {
+        const { args } = await this.parse(ImportGroups);
+        try {
+            await (0, login_1.authUser)();
+            this.log('%s Uploading Groups.', chalk_1.default.blue.bold('START'));
+            this.log('%s Uploading', chalk_1.default.yellow.bold('GROUP'));
+            await uploadGroups(args.groupsFile);
+            this.log('%s Uploaded', chalk_1.default.yellow.bold('GROUP'));
+        }
+        catch (e) {
+            this.log(`%s Group Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            return;
+        }
+        this.log('%s Group Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    }
+}
+exports.default = ImportGroups;
+ImportGroups.description = 'Import all groups in the groups.yml file';
+ImportGroups.examples = [
+    `$ contrail groups import <GROUPS_FILE>
+`,
+];
+ImportGroups.args = {
+    groupsFile: core_1.Args.string({ description: 'The .yml file containing the groups', required: true }),
+};
+function getGroupsFile(fileLocation) {
+    const CURRENT_DIR = process.cwd();
+    try {
+        const fullPath = path.join(CURRENT_DIR, fileLocation);
+        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
+        return doc;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function uploadGroups(fileLocation) {
+    const existingGroups = await new sdk_1.Entities().get({
+        entityName: 'group', relations: ['groupPrincipals']
+    });
+    const groupsToImport = getGroupsFile(fileLocation);
+    const orgUsers = await new sdk_1.Entities().get({
+        entityName: 'user-org',
+    });
+    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 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');
+        }
+        createdGroups.push(await new sdk_1.Entities().create({
+            entityName: 'group', object: { name: group.name }
+        }));
+    }
+    const allGroupsAfterCreate = existingGroups.concat(createdGroups);
+    for (const group of toCreate) {
+        const createdGroup = createdGroups.find(x => x.name === group.name);
+        if (!createdGroup) {
+            continue;
+        }
+        await createGroupPrincipals(createdGroup, group.groupPrincipals, orgUsers, allGroupsAfterCreate);
+    }
+    for (const group of toUpdate) {
+        if (!group.groupPrincipals || !group.name) {
+            console.log('skipping invalid group');
+        }
+        await updateGroup(group.groupPrincipals, orgUsers, group, allGroupsAfterCreate);
+    }
+    for (const group of toDelete) {
+        if (!group.groupPrincipals || !group.name) {
+            console.log('skipping 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
+                }
+            });
+        }
+        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
+                }
+            });
+        }
+    }
+}
+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');
+            }
+        }
+        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');
+            }
+        }
+    }
+}

package/dist/commands/types/getAll.js

@@ -24,7 +24,7 @@ GetAllTypes.examples = [
 `,
 ];
 GetAllTypes.flags = {
-    outDir: core_1.Flags.string({ description: 'The directory to which to export the type data. Defaults to the current directory', required: false, default: '.' }),
+    outDir: core_1.Flags.string({ char: 'd', description: 'The directory to which to export the type 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 })
 };
 async function getAll(outDir, overwrite) {
@@ -182,7 +182,12 @@ function reduceTypes(dataHolder) {
             slug: type.slug,
             label: type.label,
             isArchived: type.isArchived,
-            typeProperties: reducedTypeProperties,
+            typeProperties: reducedTypeProperties.map(x => {
+                delete x['id'];
+                return {
+                    ...x
+                };
+            }),
         };
         reducedTypes.push(reducedType);
     }

package/dist/commands/types/uploadRuleSets.js

@@ -131,8 +131,8 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
         const hash = `${loadedLink.type}|${loadedLink.ruleSet}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
-    console.debug('current rule set links:', currentLinksHashes);
-    console.debug('reduced rule set links:', reducedLinksByHashes);
+    // console.debug('reduced rule set links:', reducedLinksByHashes);
+    // console.debug('current rule set links:', currentLinksHashes);
     for (const loadedRuleSetLink of loadedRuleSetLinks) {
         try {
             const found = currentLinksHashes[`${loadedRuleSetLink.type}|${loadedRuleSetLink.ruleSet}`];

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -69,8 +69,8 @@ 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);
+    // 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];

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

@@ -1,9 +1,10 @@
 import { Command } from '@oclif/core';
+export declare const DEFAULT_FILE_LOCATION = "users.yml";
 export default class ExportUsers extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        fileOut: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        outDir: 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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportUsers = void 0;
+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");
@@ -10,6 +10,7 @@ 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");
+exports.DEFAULT_FILE_LOCATION = 'users.yml';
 class ExportUsers extends core_1.Command {
     async run() {
         var _a;
@@ -17,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.fileOut) !== null && _a !== void 0 ? _a : 'users.yml', flags.overwrite);
+            await exportUsers((_a = flags.outDir) !== null && _a !== void 0 ? _a : exports.DEFAULT_FILE_LOCATION, flags.overwrite);
             this.log('%s Done', chalk_1.default.yellow.bold('USERS'));
         }
         catch (e) {
@@ -34,7 +35,7 @@ ExportUsers.examples = [
 `,
 ];
 ExportUsers.flags = {
-    fileOut: core_1.Flags.string({ char: 'f', description: 'The location for the file to be saved', required: false }),
+    outDir: core_1.Flags.string({ char: 'd', 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) {
@@ -54,15 +55,15 @@ async function exportUsers(fileLocation, overwrite) {
             ...userInOrg.user
         });
     }
-    saveData({ users: users }, fileLocation, overwrite);
+    await saveData(users, fileLocation, overwrite);
 }
 exports.exportUsers = exportUsers;
-function saveData(data, fileLocation, overwrite) {
+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)) {
-        (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
     }
     fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
 }

package/dist/commands/users/upload.js

@@ -11,7 +11,7 @@ const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 class ImportUsers extends core_1.Command {
     async run() {
-        const { args, flags } = await this.parse(ImportUsers);
+        const { args } = await this.parse(ImportUsers);
         try {
             await (0, login_1.authUser)();
             this.log('%s Uploading Users.', chalk_1.default.blue.bold('START'));
@@ -38,10 +38,9 @@ ImportUsers.args = {
 function getUsersFile(fileLocation) {
     const CURRENT_DIR = process.cwd();
     try {
-        const fullPath = path.resolve(path.join(CURRENT_DIR, fileLocation));
-        console.log('Getting file from path: ', fullPath);
+        const fullPath = path.join(CURRENT_DIR, fileLocation);
         const doc = js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
-        return doc.users;
+        return doc;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);

package/dist/helpers/app/app-deployer.js

@@ -42,6 +42,7 @@ class AppDeployer {
             identifier: appDeclaration.appIdentifier,
             name: appDeclaration.appName,
             public: appDeclaration.visibility === 'public',
+            hidden: appDeclaration.hidden,
             description: appDeclaration.appDescription,
             publisher: appDeclaration.publisher,
             thumbnail: appDeclaration.thumbnail,
@@ -67,6 +68,7 @@ class AppDeployer {
         const updates = {
             name: appDeclaration.appName,
             public: appDeclaration.visibility === 'public',
+            hidden: appDeclaration.hidden,
             description: appDeclaration.appDescription,
             publisher: appDeclaration.publisher,
             thumbnail: appDeclaration.thumbnail,

package/dist/interfaces.d.ts

@@ -6,6 +6,7 @@ export interface AppDeclaration {
     appName: string;
     appDescription?: string;
     visibility: 'private' | 'public';
+    hidden: boolean;
     publisher: string;
     version: string;
     eventWorkflowTriggerKeyMapping: string;

package/dist/templates/typescript/app.yml

@@ -2,6 +2,7 @@ appIdentifier: "@your-co/app-name"  # Change to be your company root domain and
 appName: "Your App Name" # Give your app a name
 appDescription: "Your app description." # Give your app a description
 visibility: private  # This should be private unless you want to develop an app for all VibeIQ customers to use
+hidden: false # can be used with a public app to prevent it from showing on the marketplace, but still installable by other orgs
 publisher: "Your company name" # Your company name, used for public apps
 version: 1.0
 dockerImageRef: CHANGE_ME  # For VibeIQ Deployment... for use by VibeIQ employees only

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.4",
+  "version": "2.0.6",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -78,6 +78,14 @@
           "description": "Install the app's accompanying workflows",
           "required": false,
           "allowNo": false
+        },
+        "showHidden": {
+          "name": "showHidden",
+          "type": "boolean",
+          "char": "h",
+          "description": "Show the option to install public but hidden apps",
+          "required": false,
+          "allowNo": false
         }
       },
       "args": {}
@@ -287,6 +295,57 @@
       },
       "args": {}
     },
+    "groups:export": {
+      "id": "groups:export",
+      "description": "Export all groups in the org.",
+      "strict": true,
+      "pluginName": "@contrail/cli",
+      "pluginAlias": "@contrail/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "$ contrail groups export\n"
+      ],
+      "flags": {
+        "outDir": {
+          "name": "outDir",
+          "type": "option",
+          "char": "d",
+          "description": "The location for the file to be saved",
+          "required": false,
+          "multiple": false,
+          "default": "groups.yml"
+        },
+        "overwrite": {
+          "name": "overwrite",
+          "type": "boolean",
+          "description": "Replaces existing files if they exist",
+          "required": false,
+          "allowNo": false
+        }
+      },
+      "args": {}
+    },
+    "groups:upload": {
+      "id": "groups:upload",
+      "description": "Import all groups in the groups.yml file",
+      "strict": true,
+      "pluginName": "@contrail/cli",
+      "pluginAlias": "@contrail/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "$ contrail groups import <GROUPS_FILE>\n"
+      ],
+      "flags": {},
+      "args": {
+        "groupsFile": {
+          "name": "groupsFile",
+          "description": "The .yml file containing the groups",
+          "required": true
+        }
+      }
+    },
     "instance:export": {
       "id": "instance:export",
       "description": "Exports an data of an instance including types and users",
@@ -468,6 +527,7 @@
         "outDir": {
           "name": "outDir",
           "type": "option",
+          "char": "d",
           "description": "The directory to which to export the type data. Defaults to the current directory",
           "required": false,
           "multiple": false,
@@ -870,13 +930,14 @@
         "$ contrail users export\n"
       ],
       "flags": {
-        "fileOut": {
-          "name": "fileOut",
+        "outDir": {
+          "name": "outDir",
           "type": "option",
-          "char": "f",
+          "char": "d",
           "description": "The location for the file to be saved",
           "required": false,
-          "multiple": false
+          "multiple": false,
+          "default": "users.yml"
         },
         "overwrite": {
           "name": "overwrite",

package/package.json

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