@contrail/cli 1.0.2 → 1.0.3

package/package.json

@@ -1,63 +1,63 @@
-{
-  "name": "@contrail/cli",
-  "version": "1.0.2",
-  "description": "VibeIQ's Contrail Platform CLI.",
-  "main": "lib/index.js",
-  "bin": {
-    "@contrail/contrail-cli": "bin/init",
-    "contrail": "bin/init"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "cli",
-    "contrail-cli"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
-    "test": "jest --watch"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@contrail/sdk": "^1.0.91",
-    "amazon-cognito-identity-js": "^5.2.3",
-    "arg": "^4.0.1",
-    "aws-sdk": "^2.1044.0",
-    "chalk": "^4.0.0",
-    "esm": "^3.2.25",
-    "execa": "^5.0.0",
-    "inquirer": "^8.2.0",
-    "js-yaml": "^4.1.0",
-    "listr": "^0.14.3",
-    "ncp": "^2.0.0",
-    "pkg-install": "^1.0.0"
-  },
-  "devDependencies": {
-    "@types/jest": "^23.3.14",
-    "jest": "^23.6.0",
-    "prettier": "^1.19.1",
-    "ts-jest": "^23.10.5",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.0.1",
-    "@types/node": "^14.6.4"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".spec.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
-  }
-}
+{
+  "name": "@contrail/cli",
+  "version": "1.0.3",
+  "description": "VibeIQ's Contrail Platform CLI.",
+  "main": "lib/index.js",
+  "bin": {
+    "@contrail/contrail-cli": "bin/init",
+    "contrail": "bin/init"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "cli",
+    "contrail-cli"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
+    "lint": "tslint -p tsconfig.json",
+    "test": "jest --watch"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@contrail/sdk": "^1.0.91",
+    "amazon-cognito-identity-js": "^5.2.3",
+    "arg": "^4.0.1",
+    "aws-sdk": "^2.1044.0",
+    "chalk": "^4.0.0",
+    "esm": "^3.2.25",
+    "execa": "^5.0.0",
+    "inquirer": "^8.2.0",
+    "js-yaml": "^4.1.0",
+    "listr": "^0.14.3",
+    "ncp": "^2.0.0",
+    "pkg-install": "^1.0.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^23.3.14",
+    "jest": "^23.6.0",
+    "prettier": "^1.19.1",
+    "ts-jest": "^23.10.5",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^3.0.1",
+    "@types/node": "^14.6.4"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".spec.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}

package/publish.sh

@@ -0,0 +1,5 @@
+rm -rf lib;
+npm install;
+npm run build;
+npm version patch;
+npm publish;

package/src/auth/auth.ts

@@ -1,10 +1,10 @@
-export interface AuthContext {
-  apiUserToken: string;
-  apiGateway?: string;
-  orgSlug?: string;
-  orgId?: string;
-}
-
-export class Auth {
-  public static config: AuthContext;
+export interface AuthContext {
+  apiUserToken: string;
+  apiGateway?: string;
+  orgSlug?: string;
+  orgId?: string;
+}
+
+export class Auth {
+  public static config: AuthContext;
 }

package/src/auth/login.ts

@@ -1,108 +1,125 @@
-const AmazonCognitoIdentity = require('amazon-cognito-identity-js');
-import inquirer from 'inquirer';
-import { Entities, Request, setConfig } from '@contrail/sdk';
-import { Auth } from './auth';
-
-const CONFIGURATION = {
-    userPoolId: 'us-east-1_x8hXZUsL6',
-    clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
-};
-
-export async function authUser(){
-    const questions = [];
-    if (!process.env.CONTRAIL_CLI_EMAIL) {
-        questions.push({
-            type: 'input',
-            name: 'email',
-            validate: (val) => !!val,
-            message: 'Email',
-        });
-    }
-    if (!process.env.CONTRAIL_CLI_PASSWORD) {
-        questions.push({
-            type: 'password',
-            name: 'password',
-            validate: (val) => !!val,
-            message: 'Password',
-        });
-    }
-    if (!process.env.CONTRAIL_CLI_ORGSLUG) {
-        questions.push({
-            type: 'input',
-            name: 'orgSlug',
-            validate: (val) => !!val,
-            message: 'Org (slug)',
-        });
-    }
-
-    const answers = await inquirer.prompt(questions);
-    const params = {
-        email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
-        password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
-        orgSlug: process.env.CONTRAIL_CLI_ORGSLUG || answers.orgSlug,
-    };
-    if (!params.email || !params.password){
-        throw new Error('email and password required');
-    }
-
-    const poolData = {
-        UserPoolId: CONFIGURATION.userPoolId,
-        ClientId: CONFIGURATION.clientId,
-    };
-
-    const userPool = new AmazonCognitoIdentity.CognitoUserPool(poolData);
-    const authData = {
-        Username: params.email,
-        Password: params.password,
-    };
-
-    const authDetails = new AmazonCognitoIdentity.AuthenticationDetails(authData);
-    const userData = {
-        Username: params.email,
-        Pool: userPool,
-    };
-
-    const cognitoUser = new AmazonCognitoIdentity.CognitoUser(userData);
-
-    return new Promise( (resolve, reject) => {
-        cognitoUser.authenticateUser(authDetails, {
-            onSuccess: async (result) => {
-                const user = result;
-                await setAuthContext(user, params);
-
-                resolve({success: true, data: result});
-            },
-            onFailure: (err) => {
-                console.log('authUser error: ' + err);
-                reject(err);
-            },
-        });
-    });
-}
-
-async function setAuthContext(user, params){
-
-    // Set Auth Config
-    Auth.config = {
-        apiUserToken: user.idToken.jwtToken,
-        apiGateway: process.env.API_GATEWAY,
-        orgSlug: params.orgSlug,
-    };
-    // SET SDK CONFIG
-    setConfig(Auth.config);
-
-    const currentUser = await Request.request('/users/current', {
-        method: 'GET',
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-        },
-    });
-    if (!currentUser) {
-        throw Error('Could not get current user');
-    }
-    const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
-    if (org) {
-        Auth.config.orgId = org.orgId || org.id;
-    }
+const AmazonCognitoIdentity = require('amazon-cognito-identity-js');
+import inquirer from 'inquirer';
+import { Request, setConfig } from '@contrail/sdk';
+import { Auth } from './auth';
+
+const CONFIGURATION = {
+    userPoolId: 'us-east-1_x8hXZUsL6',
+    clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
+};
+
+export async function authUser(){
+    const questions = [];
+    if (!process.env.CONTRAIL_CLI_EMAIL) {
+        questions.push({
+            type: 'input',
+            name: 'email',
+            validate: (val) => !!val,
+            message: 'Email',
+        });
+    }
+    if (!process.env.CONTRAIL_CLI_PASSWORD) {
+        questions.push({
+            type: 'password',
+            name: 'password',
+            validate: (val) => !!val,
+            message: 'Password',
+        });
+    }
+    if (!process.env.CONTRAIL_CLI_ORGSLUG) {
+        questions.push({
+            type: 'input',
+            name: 'orgSlug',
+            validate: (val) => !!val,
+            message: 'Org (slug)',
+        });
+    }
+
+    const answers = await inquirer.prompt(questions);
+    const params = {
+        email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
+        password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
+        orgSlug: process.env.CONTRAIL_CLI_ORGSLUG || answers.orgSlug,
+    };
+    if (!params.email || !params.password){
+        throw new Error('Email and Password required');
+    }
+
+    const poolData = {
+        UserPoolId: CONFIGURATION.userPoolId,
+        ClientId: CONFIGURATION.clientId,
+    };
+
+    const userPool = new AmazonCognitoIdentity.CognitoUserPool(poolData);
+    const authData = {
+        Username: params.email,
+        Password: params.password,
+    };
+
+    const authDetails = new AmazonCognitoIdentity.AuthenticationDetails(authData);
+    const userData = {
+        Username: params.email,
+        Pool: userPool,
+    };
+
+    const cognitoUser = new AmazonCognitoIdentity.CognitoUser(userData);
+
+    return new Promise( (resolve, reject) => {
+        cognitoUser.authenticateUser(authDetails, {
+            onSuccess: async (result) => {
+                const user = result;
+                await setAuthContext(user, params);
+
+                resolve({success: true, data: result});
+            },
+            onFailure: (err) => {
+                reject(err);
+            },
+        });
+    });
+}
+
+async function setAuthContext(user, params){
+
+    // TODO Dont allow user to set this - they could set dev
+    const questions = [];
+    questions.push({
+        type: 'list',
+        name: 'environment',
+        message: 'Which environment would you like to use?',
+        choices: ['Dev', 'Prod'],
+        default: 'Dev',
+    });
+
+    let apiGateway;
+    const answers = await inquirer.prompt(questions);
+    if (answers.environment === 'Dev') {
+        apiGateway = 'https://api.vibeiq.com/dev/api';
+    } else {
+        apiGateway = 'https://api.vibeiq.com/prod/api';
+    }
+
+    // Set Auth Config
+    Auth.config = {
+        apiUserToken: user.idToken.jwtToken,
+        apiGateway,
+        orgSlug: params.orgSlug,
+    };
+    // SET SDK CONFIG
+    setConfig(Auth.config);
+
+    const currentUser = await Request.request('/users/current', {
+        method: 'GET',
+        headers: {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json',
+        },
+    });
+    if (!currentUser) {
+        throw Error('Could not get current user');
+    }
+    const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
+    if (org) {
+        Auth.config.orgId = org.orgId || org.id;
+    }
 }

package/src/cli.ts

@@ -1,33 +1,32 @@
-
-import { create } from './create-app/create';
-import { deployApp, removeApp } from './deploy-app/deploy';
-/**
- *  Built using documentation here:
- *  https://www.twilio.com/blog/how-to-build-a-cli-with-node-js
- */
-
-export async function cli(args) {
-  const command = args[2];
-  switch (command) {
-    case 'create-app': {
-      create(args);
-      break;
-    }
-    case 'deploy-app': {
-      deployApp(args);
-      break;
-    }
-    case 'remove-app': {
-      removeApp(args);
-      break;
-    }
-    case 'extract-types': {
-      removeApp(args);
-      break;
-    }
-    default: {
-      console.log('Illegal command.');
-    }
-  }
-}
-
+
+import { create } from './create-app/create';
+import { deployApp, removeApp } from './deploy-app/deploy';
+/**
+ *  Built using documentation here:
+ *  https://www.twilio.com/blog/how-to-build-a-cli-with-node-js
+ */
+
+export async function cli(args) {
+  const command = args[2];
+  switch (command) {
+    case 'create-app': {
+      create(args);
+      break;
+    }
+    case 'deploy-app': {
+      deployApp(args);
+      break;
+    }
+    case 'remove-app': {
+      removeApp(args);
+      break;
+    }
+    case 'extract-types': {
+      // TODO
+      break;
+    }
+    default: {
+      console.log('Illegal command.');
+    }
+  }
+}

package/src/create-app/create.ts

@@ -1,58 +1,73 @@
-import arg from 'arg';
-import inquirer from 'inquirer';
-import ncp from 'ncp';
-import chalk from 'chalk'
-import { setUpTemplate } from './setup-template';
-
-function parseArgumentsIntoOptions(rawArgs) {
-  const args = arg(
-    {
-      '--create-app': Boolean,
-      '--app-name': String,
-      '-c': '--create-app',
-      '-n': '--app-name',
-    },
-    {
-      argv: rawArgs.slice(2),
-    }
-  );
-  return {
-    createApp: args['--create-app'] || false,
-    appName:  args['--app-name']
-  };
-}
-async function promptForMissingOptions(options) {
-  const defaultTemplate = 'JavaScript';
-  if (options.skipPrompts) {
-    return {
-       ...options,
-       template: options.template || defaultTemplate,
-     };
-   }
-  
-   const questions = [];
-   if (!options.appName) {
-     questions.push({
-       type: 'input',
-       name: 'appName',
-       validate: (val) => { return !!val },
-       message: 'What is the name of your app?',
-     });
-   }
-
-  const answers = await inquirer.prompt(questions);
-  return {
-    ...options,
-    appName: options.appName || answers.appName,
-  };
-}
-
-
-export async function create(args) {
-
-  let options = parseArgumentsIntoOptions(args);
-  options = await promptForMissingOptions(options);
-  console.log("%s Setting up new new contrail application.", chalk.blue.bold('START'));
-  await setUpTemplate();
-  console.log('%s Application initialized successfully.', chalk.green.bold('COMPLETE'));
-}
+import arg from 'arg';
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+import { setUpTemplate } from './setup-template';
+
+function parseArgumentsIntoOptions(rawArgs) {
+  const args = arg(
+    {
+      '--app-name': String,
+      '--template': String,
+      '-n': '--app-name',
+      '-t': '--template',
+    },
+    {
+      argv: rawArgs.slice(3),
+    },
+  );
+  return {
+    appName: args['--app-name'],
+    template: args['--template'],
+  };
+}
+async function promptForMissingOptions(options) {
+  const defaultTemplate = 'JavaScript';
+
+  const questions = [];
+  if (!options.appName) {
+    questions.push({
+      type: 'input',
+      name: 'appName',
+      validate: (val) => !!val,
+      message: 'What is the name of your app?',
+    });
+  }
+
+  if (!options.template) {
+    questions.push({
+      type: 'list',
+      name: 'template',
+      message: 'Which project template would you like to use?',
+      choices: ['JavaScript', 'TypeScript'],
+      default: defaultTemplate,
+    });
+  }
+
+  const answers = await inquirer.prompt(questions);
+  return {
+    ...options,
+    appName: options.appName || answers.appName,
+    template: options.template || answers.template,
+  };
+}
+
+export async function create(args) {
+
+  let options = parseArgumentsIntoOptions(args);
+  options = await promptForMissingOptions(options);
+  console.log('%s Setting up new new contrail application.', chalk.blue.bold('START'));
+
+  let error;
+  try {
+    await setUpTemplate(options);
+  }
+  catch (e) {
+    error = e;
+  }
+
+  if (error) {
+    console.log('%s Application initialization failed.', chalk.red.bold('FAIL'));
+  } else {
+    console.log('%s Application initialized successfully.', chalk.green.bold('COMPLETE'));
+  }
+}