@contrail/cli 2.0.1 → 2.0.2

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @contrail/cli
 $ contrail-cli COMMAND
 running command...
 $ contrail-cli (--version)
-@contrail/cli/2.0.1 darwin-arm64 node-v18.13.0
+@contrail/cli/2.0.2 darwin-arm64 node-v18.13.0
 $ contrail-cli --help [COMMAND]
 USAGE
   $ contrail-cli COMMAND
@@ -25,6 +25,7 @@ USAGE
 <!-- commands -->
 * [`contrail-cli app create`](#contrail-cli-app-create)
 * [`contrail-cli app delete`](#contrail-cli-app-delete)
+* [`contrail-cli app getApiKey`](#contrail-cli-app-getapikey)
 * [`contrail-cli app install`](#contrail-cli-app-install)
 * [`contrail-cli app publish`](#contrail-cli-app-publish)
 * [`contrail-cli app uninstall`](#contrail-cli-app-uninstall)
@@ -105,6 +106,24 @@ EXAMPLES
   $ contrail app delete
 ```
 
+## `contrail-cli app getApiKey`
+
+Get an api key for an app
+
+```
+USAGE
+  $ contrail-cli app getApiKey [--appIdentifier <value>]
+
+FLAGS
+  --appIdentifier=<value>  The app identifier
+
+DESCRIPTION
+  Get an api key for an app
+
+EXAMPLES
+  $ contrail app getApiKey
+```
+
 ## `contrail-cli app install`
 
 Install an app from the marketplace
@@ -130,7 +149,10 @@ Publish the app
 
 ```
 USAGE
-  $ contrail-cli app publish
+  $ contrail-cli app publish [-u]
+
+FLAGS
+  -u, --upgrade  In addition to deploying, upgrade the installed version of the app in this org to the latest one.
 
 DESCRIPTION
   Publish the app

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

@@ -0,0 +1,9 @@
+import { Command } from '@oclif/core';
+export default class GetAPIKeyApp extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        appIdentifier: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/app/getApiKey.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const apps_1 = require("../../api/apps");
+const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
+const login_1 = require("../../auth/login");
+class GetAPIKeyApp extends core_1.Command {
+    async run() {
+        const { flags } = await this.parse(GetAPIKeyApp);
+        await (0, login_1.authUser)();
+        const installedApps = await (0, apps_1.getInstalledApps)();
+        if (!flags.appIdentifier) {
+            const questions = [{
+                    type: 'list',
+                    name: 'appApiKey',
+                    message: 'For which app would you like to retrieve the API key?',
+                    choices: installedApps.map(x => {
+                        return {
+                            name: x.app.name, value: x.apiKey.apiKey
+                        };
+                    })
+                }];
+            const answers = await inquirer_1.default.prompt(questions);
+            console.log(`App API key: ${answers.appApiKey}`);
+        }
+        else {
+            const appFound = installedApps.find(x => x.app.identifier === flags.appIdentifier);
+            if (!appFound) {
+                console.log('You do not have such an app installed');
+                return;
+            }
+            console.log(`App API key: ${appFound.apiKey.apiKey}`);
+        }
+    }
+}
+exports.default = GetAPIKeyApp;
+GetAPIKeyApp.description = 'Get an api key for an app';
+GetAPIKeyApp.examples = [
+    `$ contrail app getApiKey
+`,
+];
+GetAPIKeyApp.flags = {
+    appIdentifier: core_1.Flags.string({ description: 'The app identifier', required: false })
+};

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

@@ -3,5 +3,8 @@ export default class PublishApp extends Command {
     static description: string;
     static examples: string[];
     static strict: boolean;
+    static flags: {
+        upgrade: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/app/publish.js

@@ -6,15 +6,11 @@ const login_1 = require("../../auth/login");
 const core_1 = require("@oclif/core");
 const load_app_config_1 = require("../../helpers/app/load-app-config");
 const app_deployer_1 = require("../../helpers/app/app-deployer");
+const apps_1 = require("../../api/apps");
+const upgrade_1 = require("./upgrade");
 class PublishApp extends core_1.Command {
-    // static flags = {
-    //   list: Flags.string({char: 'f', description: 'Who is saying hello', required: true}),
-    // }
-    // static args = {
-    //   AppName: Args.string({description: 'The app name', required: true}),
-    // }
     async run() {
-        // const { args, flags } = await this.parse(DeployApp)
+        const { flags } = await this.parse(PublishApp);
         let appDeclaration;
         try {
             appDeclaration = (0, load_app_config_1.loadAppConfig)();
@@ -26,7 +22,17 @@ class PublishApp extends core_1.Command {
         console.log(`%s Deploying Application. ${appDeclaration.appIdentifier}`, chalk_1.default.blue.bold('START'));
         try {
             await (0, login_1.authUser)();
-            await new app_deployer_1.AppDeployer().deploy(appDeclaration);
+            const app = await new app_deployer_1.AppDeployer().deploy(appDeclaration);
+            if (flags.upgrade) {
+                const installedApps = await (0, apps_1.getInstalledApps)();
+                const installedAppOrg = installedApps.find(x => x.appId === app.id);
+                if (!installedAppOrg) {
+                    console.log('The app you published is not installed in your org');
+                    return;
+                }
+                await (0, upgrade_1.upgradeAndWait)(installedAppOrg, app.latestAppVersionId);
+                console.log('%s App upgraded.', chalk_1.default.green.bold('UPGRADED'));
+            }
         }
         catch (e) {
             console.log(`%s Application Deployment Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
@@ -43,3 +49,6 @@ PublishApp.examples = [
 ];
 // variable argument length
 PublishApp.strict = true;
+PublishApp.flags = {
+    upgrade: core_1.Flags.boolean({ char: 'u', description: 'In addition to deploying, upgrade the installed version of the app in this org to the latest one.', required: false }),
+};

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

@@ -9,3 +9,4 @@ export default class UpgradeApp extends Command {
     };
     run(): Promise<void>;
 }
+export declare function upgradeAndWait(appOrgToUpgrade: any, versionToUpgrade: any): Promise<void>;

package/dist/commands/app/upgrade.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.upgradeAndWait = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const login_1 = require("../../auth/login");
@@ -9,7 +10,7 @@ const sdk_1 = require("@contrail/sdk");
 const apps_1 = require("../../api/apps");
 class UpgradeApp extends core_1.Command {
     async run() {
-        const { args, flags } = await this.parse(UpgradeApp);
+        const { flags } = await this.parse(UpgradeApp);
         await (0, login_1.authUser)();
         const allApps = await (0, apps_1.getAvailableApps)();
         const installedApps = await (0, apps_1.getInstalledApps)();
@@ -45,21 +46,7 @@ class UpgradeApp extends core_1.Command {
             versionToUpgrade = answers.appVersion;
         }
         this.log(`%s Upgrading app to version ${versionToUpgrade}`, chalk_1.default.green.bold('APP UPGRADE'));
-        await (0, apps_1.upgradeAppVersion)(appOrgToUpgrade, versionToUpgrade);
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
-            await delay(1000);
-            const appStillUpgrading = await new sdk_1.Entities().get({ entityName: 'app-org', id: appOrgToUpgrade.id });
-            if (appStillUpgrading.status === 'READY') {
-                this.log('%s App Upgraded', chalk_1.default.green.bold('APP UPGRADE'));
-                return;
-            }
-            if (appStillUpgrading.status === 'FAILED_INSTALLING') {
-                this.log('%s App Upgrade FAILED!', chalk_1.default.red.bold('APP UPGRADE'));
-                return;
-            }
-            this.log('checking app status...');
-        }
+        await upgradeAndWait(appOrgToUpgrade, versionToUpgrade);
     }
 }
 exports.default = UpgradeApp;
@@ -74,6 +61,24 @@ UpgradeApp.flags = {
     appIdentifier: core_1.Flags.string({ char: 'i', description: 'The appIdentifier of the app to install', required: false }),
     latest: core_1.Flags.boolean({ char: 'l', description: 'Upgrade to the latest version of the app', required: false })
 };
+async function upgradeAndWait(appOrgToUpgrade, versionToUpgrade) {
+    await (0, apps_1.upgradeAppVersion)(appOrgToUpgrade, versionToUpgrade);
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        await delay(1000);
+        const appStillUpgrading = await new sdk_1.Entities().get({ entityName: 'app-org', id: appOrgToUpgrade.id });
+        if (appStillUpgrading.status === 'READY') {
+            console.log('%s App Upgraded', chalk_1.default.green.bold('APP UPGRADE'));
+            return;
+        }
+        if (appStillUpgrading.status === 'FAILED_INSTALLING') {
+            console.log('%s App Upgrade FAILED!', chalk_1.default.red.bold('APP UPGRADE'));
+            return;
+        }
+        console.log('checking app status...');
+    }
+}
+exports.upgradeAndWait = upgradeAndWait;
 function delay(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }

package/dist/helpers/app/app-deployer.d.ts

@@ -1,6 +1,6 @@
 import { App, AppDeclaration } from '../../interfaces';
 export declare class AppDeployer {
-    deploy(appDeclaration: AppDeclaration): Promise<void>;
+    deploy(appDeclaration: AppDeclaration): Promise<App>;
     getExistingApp(appDeclaration: AppDeclaration): Promise<App>;
     private createNewApp;
     updateExistingApp(appDeclaration: AppDeclaration, existingApp: any): Promise<any>;

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

@@ -22,6 +22,7 @@ class AppDeployer {
         }
         await new actions_deployer_1.ActionsDeployer().deployActions(appDeclaration, app);
         await new workflow_template_definition_deployer_1.WorkflowTemplateDefinitionDeployer().deployWorkflowTemplateDefinitions(appDeclaration, app);
+        return app;
     }
     async getExistingApp(appDeclaration) {
         const orgId = auth_1.Auth.config.orgId;

package/dist/helpers/app/load-app-config.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadAppConfig = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
 const yaml = require('js-yaml');
 function loadAppConfig() {
     const TARGET_DIR = process.cwd();
     try {
-        const doc = yaml.load(path.join(TARGET_DIR, 'app.yml'), 'utf8');
-        console.log(doc);
+        const doc = yaml.load(fs_1.default.readFileSync(path.resolve(path.join(TARGET_DIR, 'app.yml')), 'utf8'));
         return doc;
     }
     catch (e) {

package/dist/interfaces.d.ts

@@ -102,6 +102,7 @@ export interface App {
     eventWorkflowTriggerKeyMapping: string;
     configProperties?: ConfigProperty[];
     triggerKeyDefinitions?: TriggerKeyDefinition[];
+    latestAppVersionId?: string;
 }
 export interface AppOrg {
     id: string;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1",
+  "version": "2.0.2",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -29,6 +29,28 @@
       "flags": {},
       "args": {}
     },
+    "app:getApiKey": {
+      "id": "app:getApiKey",
+      "description": "Get an api key for an app",
+      "strict": true,
+      "pluginName": "@contrail/cli",
+      "pluginAlias": "@contrail/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "$ contrail app getApiKey\n"
+      ],
+      "flags": {
+        "appIdentifier": {
+          "name": "appIdentifier",
+          "type": "option",
+          "description": "The app identifier",
+          "required": false,
+          "multiple": false
+        }
+      },
+      "args": {}
+    },
     "app:install": {
       "id": "app:install",
       "description": "Install an app from the marketplace",
@@ -71,7 +93,16 @@
       "examples": [
         "$ contrail app publish\n"
       ],
-      "flags": {},
+      "flags": {
+        "upgrade": {
+          "name": "upgrade",
+          "type": "boolean",
+          "char": "u",
+          "description": "In addition to deploying, upgrade the installed version of the app in this org to the latest one.",
+          "required": false,
+          "allowNo": false
+        }
+      },
       "args": {}
     },
     "app:uninstall": {

package/package.json

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