@contrail/cli 1.0.65 → 1.0.67

package/lib/apps/create-app/create.js

@@ -17,7 +17,7 @@ function parseArgumentsIntoOptions(rawArgs) {
     };
 }
 async function promptForMissingOptions(options) {
-    const defaultTemplate = 'JavaScript';
+    const defaultTemplate = 'TypeScript';
     const questions = [];
     if (!options.appName) {
         questions.push({
@@ -32,7 +32,7 @@ async function promptForMissingOptions(options) {
             type: 'list',
             name: 'template',
             message: 'Which project template would you like to use?',
-            choices: ['JavaScript', 'TypeScript'],
+            choices: ['TypeScript', 'JavaScript'],
             default: defaultTemplate,
         });
     }

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.67",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

package/src/apps/create-app/create.ts

@@ -21,7 +21,7 @@ function parseArgumentsIntoOptions(rawArgs) {
   };
 }
 async function promptForMissingOptions(options) {
-  const defaultTemplate = 'JavaScript';
+  const defaultTemplate = 'TypeScript';
 
   const questions = [];
   if (!options.appName) {
@@ -38,7 +38,7 @@ async function promptForMissingOptions(options) {
       type: 'list',
       name: 'template',
       message: 'Which project template would you like to use?',
-      choices: ['JavaScript', 'TypeScript'],
+      choices: ['TypeScript', 'JavaScript'],
       default: defaultTemplate,
     });
   }

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 });
+    await 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 {

package/templates/typescript/actions/mock-server.ts

@@ -0,0 +1,24 @@
+import { execute } from './handler';
+const express = require('express');
+const bodyParser = require('body-parser');
+const app = express();
+const port = 5050;
+
+// parse application/x-www-form-urlencoded
+app.use(bodyParser.urlencoded({ extended: false }));
+// parse application/json
+app.use(bodyParser.json());
+
+app.get('/health_check', (req, res) => {
+  res.send('Hello World!');
+});
+
+// DO NOT CHANGE THIS IMPLEMENTATION
+app.post('/', async (req, res) => {
+  const result = await execute(req.body);
+  res.send(result);
+});
+
+app.listen(port, () => {
+  console.log(`Mock server listening on port ${port}`);
+});

package/templates/typescript/actions/utils/logger.ts

@@ -1,15 +1,15 @@
 export class Logger {
   allEntries = [];
   public log(...args){
-    console.log(args);
+    console.log(...args);
     this.allEntries.push(args);
   }
 
   public getEntries(){
-    return this.allEntries;
+    return this.allEntries.join('\n');
   }
 
   public clearEntries(){
     this.allEntries = [];
   }
-}
+}

package/templates/typescript/package.json

@@ -15,6 +15,8 @@
   },
   "scripts": {
     "build": "tsc",
+    "start": "nodemon --watch 'actions/**/*.ts' --exec ts-node actions/mock-server.ts",
+    "debug": "nodemon -r ts-node/register --inspect=127.0.0.1:60002 --watch 'actions/**/*.ts' --exec node actions/mock-server.ts",
     "lint": "eslint . --fix",
     "test": "jest",
     "test-watch": "jest --watch",
@@ -39,8 +41,12 @@
     "chalk": "^4.0.0"
   },
   "devDependencies": {
+    "body-parser": "^1.20.2",
+    "express": "^4.18.2",
+    "nodemon": "^1.19.4",
     "jest": "^29.2.2",
     "ts-jest": "^29.0.3",
+    "ts-node": "^7.0.1",
     "typescript": "^4.7.4"
   }
 }

package/templates/typescript/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2017",
+    "target": "ES2020",
     "module": "commonjs",
     "declaration": true,
     "esModuleInterop": true,
@@ -17,15 +17,11 @@
       "ES2015",
       "ES2016",
       "ES2017",
+      "ES2020",
       "dom",
       "esnext.asynciterable"
-    ],
+    ]
   },
-  "include": [
-    "actions"
-  ],
-  "exclude": [
-    "node_modules",
-    "**/__tests__/*"
-  ]
-}
+  "include": ["actions"],
+  "exclude": ["node_modules", "**/__tests__/*"]
+}