@contrail/cli 1.0.65 → 1.0.66

package/lib/apps/upgrade-app/app-upgrader.js

@@ -66,12 +66,13 @@ export async function upgradeApp() {
             type: 'list',
             name: 'appVersion',
             message: 'Which app version would you like to upgrade to?',
-            choices: versions.reverse().map(x => {
-                const name = x.id === appOrgToUpgrade.appVersionId ? `${x.versionNumber} (${x.createdOn}) (current)` : `${x.versionNumber} (${x.createdOn})`;
+            choices: versions.map(x => {
+                const number = x.versionNumber.toString().padStart(4, '0');
+                const name = x.id === appOrgToUpgrade.appVersionId ? `${number} (${x.createdOn}) (current)` : `${number} (${x.createdOn})`;
                 return {
                     value: x.id, name
                 };
-            })
+            }).sort((x, y) => { return x.name > y.name ? -1 : 1; })
         }]);
     console.log(`%s Upgrading app to version ${answers.appVersion}`, chalk.green.bold('APP INSTALLATION'));
     await upgradeAppVersion(appOrgToUpgrade, answers.appVersion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

package/src/apps/upgrade-app/app-upgrader.ts

@@ -68,12 +68,13 @@ export async function upgradeApp() {
     type: 'list',
     name: 'appVersion',
     message: 'Which app version would you like to upgrade to?',
-    choices: versions.reverse().map(x => {
-      const name = x.id === appOrgToUpgrade.appVersionId? `${x.versionNumber} (${x.createdOn}) (current)`: `${x.versionNumber} (${x.createdOn})`;
+    choices: versions.map(x => {
+      const number = x.versionNumber.toString().padStart(4, '0');
+      const name = x.id === appOrgToUpgrade.appVersionId ? `${number} (${x.createdOn}) (current)` : `${number} (${x.createdOn})`;
       return {
         value: x.id, name
       };
-    })
+    }).sort((x, y) => { return x.name > y.name ? -1 : 1; })
   }]);
 
   console.log(`%s Upgrading app to version ${answers.appVersion}`, chalk.green.bold('APP INSTALLATION'));

package/templates/typescript/actions/handler.ts

@@ -3,13 +3,13 @@ import { Logger } from './utils/logger';
 
 export async function execute(data) {
   const logger = new Logger();
-  logger.log(JSON.stringify(data))
   const event = (typeof data.event === 'string')
     ? JSON.parse(data.event)
     : data.event;
   data = JSON.parse(JSON.stringify(data));
-  const config = data.config;
-  if (!config.apiHost || !config.userName || !config.password) {
+  logger.log(JSON.stringify(data, null, 2));
+  if (!data.apiHost || !data.userName || !data.password) {
+    // not really. This is just to demo how to retrieve an app config
     const message = 'This action requires an api host, a username, and a password to run';
     const body = {
       message,
@@ -22,25 +22,22 @@ export async function execute(data) {
   }
 
   try {
-    login({ apiKey: config.apiKey, orgSlug: config.orgSlug });
+    login({ apiKey: data.apiKey, orgSlug: data.orgSlug });
     const results = {};
 
     logger.log('Sending message: ', event);
-    const response = await fetch(config.url, {
-      method: 'POST',
-      body: event,
+    const response = await fetch(data.apiHost, {
       headers: { 'Content-Type': 'application/json' }
     });
     if (!response.ok) {
       logger.log('Webhook event failed to publish');
-      logger.log('Response: ', JSON.stringify(response));
     }
     else {
       logger.log('Published!');
     }
+    logger.log('Response: ', JSON.stringify(response));
 
     results['logs'] = logger.getEntries();
-    results['config'] = config;
 
     logger.log('returning: ' + JSON.stringify(results));
     return {