@contrail/cli 1.0.2 → 1.0.3

package/.vscode/settings.json

@@ -1,6 +1,6 @@
-{
-  "editor.tabSize": 2,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.tslint": true
-  }
+{
+  "editor.tabSize": 2,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.tslint": true
+  }
 }

package/bin/init

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
-
-require = require('esm')(module /*, options*/);
+#!/usr/bin/env node
+
+require = require('esm')(module /*, options*/);
 require('../lib/cli').cli(process.argv);

package/lib/auth/auth.d.ts

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

package/lib/auth/auth.js

@@ -1,2 +1,2 @@
-export class Auth {
-}
+export class Auth {
+}

package/lib/auth/login.d.ts

@@ -1 +1 @@
-export declare function authUser(): Promise<unknown>;
+export declare function authUser(): Promise<unknown>;

package/lib/auth/login.js

@@ -1,96 +1,112 @@
-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) => {
-                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/lib/cli.d.ts

@@ -1,5 +1,5 @@
-/**
- *  Built using documentation here:
- *  https://www.twilio.com/blog/how-to-build-a-cli-with-node-js
- */
-export declare function cli(args: any): Promise<void>;
+/**
+ *  Built using documentation here:
+ *  https://www.twilio.com/blog/how-to-build-a-cli-with-node-js
+ */
+export declare function cli(args: any): Promise<void>;

package/lib/cli.js

@@ -1,30 +1,30 @@
-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/lib/create-app/create.d.ts

@@ -1 +1 @@
-export declare function create(args: any): Promise<void>;
+export declare function create(args: any): Promise<void>;

package/lib/create-app/create.js

@@ -1,48 +1,63 @@
-import arg from 'arg';
-import inquirer from 'inquirer';
-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'));
+    }
+}

package/lib/create-app/setup-template.d.ts

@@ -1 +1 @@
-export declare function setUpTemplate(): Promise<void>;
+export declare function setUpTemplate(options: any): Promise<void>;

package/lib/create-app/setup-template.js

@@ -1,48 +1,34 @@
-import ncp from 'ncp';
-import path from 'path';
-import { promisify } from 'util';
-import execa from 'execa';
-const Listr = require('listr');
-import { projectInstall } from 'pkg-install';
-const copy = promisify(ncp);
-const TARGET_DIR = process.cwd();
-const currentFileUrl = import.meta.url;
-const TEMPLATE_DIR = path.resolve(new URL(currentFileUrl).pathname, '../../../templates/javascript').replace(/\\/g, '\\').replace(/(.):\\(.):/g, '');
-// console.log('TEMPLATE_DIR: ', TEMPLATE_DIR);
-// console.log('TARGET_DIR: ', TARGET_DIR);
-function copyTemplate() {
-    return copy(TEMPLATE_DIR, TARGET_DIR, {
-        clobber: false,
-    });
-}
-function npmInstall() {
-    async function initGit(options) {
-        const result = await execa('git', ['init'], {
-            cwd: options.targetDirectory,
-        });
-        if (result.failed) {
-            return Promise.reject(new Error('Failed to initialize git'));
-        }
-        return;
-    }
-}
-export async function setUpTemplate() {
-    try {
-        const tasks = new Listr([
-            {
-                title: 'Copy template files',
-                task: () => copyTemplate(),
-            },
-            {
-                title: 'Install dependencies',
-                task: () => projectInstall({
-                    cwd: TARGET_DIR,
-                }),
-            },
-        ]);
-        await tasks.run();
-    }
-    catch (e) {
-        console.log('Error copying template: ', e);
-    }
-}
+import ncp from 'ncp';
+import path from 'path';
+import { promisify } from 'util';
+const Listr = require('listr');
+import { projectInstall } from 'pkg-install';
+const copy = promisify(ncp);
+const TARGET_DIR = process.cwd();
+const currentFileUrl = import.meta.url;
+function copyTemplate(templateDir) {
+    return copy(templateDir, TARGET_DIR, {
+        clobber: false,
+    });
+}
+export async function setUpTemplate(options) {
+    const templateDir = path.resolve(new URL(currentFileUrl).pathname, `../../../templates/${options.template.toLocaleLowerCase()}`).replace(/\\/g, '\\').replace(/(.):\\(.):/g, '').replace(/%20/g, ' ');
+    try {
+        const tasks = new Listr([
+            {
+                title: 'Copy template files',
+                task: () => copyTemplate(templateDir),
+            },
+            {
+                title: 'Install dependencies',
+                task: () => projectInstall({
+                    cwd: TARGET_DIR,
+                }),
+            },
+        ]);
+        await tasks.run();
+    }
+    catch (e) {
+        throw new Error(`Error copying template: ${e}`);
+    }
+}

package/lib/deploy-app/actions-deployer.d.ts

@@ -1,10 +1,10 @@
-import { App, AppDeclartion, AppActionDeclaration } from './interfaces';
-export declare class ActionsDeployer {
-    deployActions(appDeclaration: AppDeclartion, app: App): Promise<void>;
-    getActionsForApp(app: App): Promise<any>;
-    deployAction(actionKey: string, actionDeclaration: AppActionDeclaration, app: App, existingActions: Array<any>): Promise<void>;
-    private createNewActionDefinition;
-    private updateActionDefinition;
-    getActionDeclarationIdentifier(actionKey: any, app: App): string;
-    getFunction(actionDeclaration: AppActionDeclaration): Promise<string>;
-}
+import { App, AppDeclaration, AppActionDeclaration } from './interfaces';
+export declare class ActionsDeployer {
+    deployActions(appDeclaration: AppDeclaration, app: App): Promise<void>;
+    getActionsForApp(app: App): Promise<any>;
+    deployAction(actionKey: string, actionDeclaration: AppActionDeclaration, app: App, existingActions: Array<any>): Promise<void>;
+    private createNewActionDefinition;
+    private updateActionDefinition;
+    getActionDeclarationIdentifier(actionKey: any, app: App): string;
+    getFunction(actionDeclaration: AppActionDeclaration): Promise<string>;
+}