update inquirer messages and add deploy command

Mohammad-Khalid · Mohammad-Khalid · commit dca65424acc5 · 2019-10-28T17:45:39.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@
 /tmp
 /yarn.lock
 node_modules
-test
+test
+model
+function
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "pretty-json-stringify": "0.0.2",
     "request-promise": "^4.2.4",
     "simple-git": "^1.124.0",
+    "twilio-run": "^2.1.1",
     "underscore": "^1.9.1"
   },
   "devDependencies": {
diff --git a/src/commands/autopilot/deploy.js b/src/commands/autopilot/deploy.js
@@ -0,0 +1,90 @@
+const { TwilioClientCommand } = require('@twilio/cli-core').baseCommands,
+      path = require('path'),
+      {flags} = require('@oclif/command'),
+      AutopilotCore = require('@dabblelab/autopilot-core'),
+      ora = require('ora');
+
+const {
+  handler,
+  cliInfo,
+  describe,
+} = require('../../lib/serverless/deploy');
+const {
+  convertYargsOptionsToOclifFlags,
+  normalizeFlags,
+  createExternalCliOptions,
+} = require('../../utils');
+
+const updateTaskURL = require('../../lib/serverless/updateTaskURL');
+class AssistantsDeploy extends TwilioClientCommand {
+  constructor(argv, config, secureStorage) {
+    super(argv, config, secureStorage);
+
+    this.showHeaders = true;
+  }
+
+  async runCommand() {
+    let { flags, args } = this.parse(AssistantsDeploy);
+    flags = normalizeFlags(flags);
+    const spinner = ora();
+
+    try{
+
+      const externalOptions = createExternalCliOptions(flags, this.twilioClient);
+      let hanlder_response = {};
+
+      if(flags.target === 'all' || flags.target === 'function'){
+
+        const opts = Object.assign({}, flags, args);
+        hanlder_response = await handler(opts, externalOptions);
+      }
+
+      const fullPath = path.resolve(process.cwd(), 'model', 'model.json');
+      if(flags.target === 'all'){
+        await updateTaskURL(fullPath, hanlder_response.url);
+      }
+
+      if(flags.target === 'all' || flags.target === 'model'){
+
+        spinner.start('deploying model...');
+        if(await AutopilotCore.existAssistant(fullPath, this.twilioClient)){
+
+          await AutopilotCore.updateAssistant(fullPath, this.twilioClient);
+        }else{
+
+          await AutopilotCore.createAssistant(fullPath, this.twilioClient);
+        }
+
+        spinner.text = 'Model successfully deployed.'
+        spinner.succeed();
+      }
+      
+      return;
+    }
+    catch(err){
+
+      spinner.stop()
+    
+      console.error(`ERROR: ${err}`)
+
+    }
+    
+  }
+}
+
+AssistantsDeploy.description = describe;
+
+AssistantsDeploy.flags = Object.assign(
+  convertYargsOptionsToOclifFlags(cliInfo.options),
+  {
+    'target' : flags.string({
+      char : 't',
+      description : `deploy function, model or all of them. Options can only be "all", "function" or "model".`,
+      default : 'all',
+      options : ['all', 'function', 'model']
+    })
+  },
+  { profile: TwilioClientCommand.flags.profile }
+);
+
+module.exports = AssistantsDeploy;
diff --git a/src/commands/autopilot/fields/create.js b/src/commands/autopilot/fields/create.js
@@ -45,7 +45,7 @@ class CreateAssistantTaskField extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'taskUniqueName',
-                                    message: 'Choose your task in which to create: ',
+                                    message: 'Select task in which to create: ',
                                     choices: taskChoice
                                 }
                             ]
@@ -74,7 +74,7 @@ class CreateAssistantTaskField extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'fieldTypeUniqueName',
-                                    message: 'Choose your Field Type to create: ',
+                                    message: 'Select Field Type in which to create: ',
                                     choices: f_choices
                                 }
                             ]
diff --git a/src/commands/autopilot/fields/delete.js b/src/commands/autopilot/fields/delete.js
@@ -36,7 +36,7 @@ class DeleteAssistantTaskField extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'taskUniqueName',
-                                    message: 'Choose your task in which to delete: ',
+                                    message: 'Select task in which to delete: ',
                                     choices: taskChoice
                                 }
                             ]
@@ -61,7 +61,7 @@ class DeleteAssistantTaskField extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'fieldUniqueName',
-                                    message: 'Choose your Field to delete: ',
+                                    message: 'Select Field to delete: ',
                                     choices: fieldChoice
                                 }
                             ]
diff --git a/src/commands/autopilot/fields/list.js b/src/commands/autopilot/fields/list.js
@@ -36,7 +36,7 @@ class ListAssistantTaskFields extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'taskUniqueName',
-                                    message: 'Choose your task in which to list: ',
+                                    message: 'Select task in which to list: ',
                                     choices: taskChoice
                                 }
                             ]
diff --git a/src/commands/autopilot/fieldvalues/upload.js b/src/commands/autopilot/fieldvalues/upload.js
@@ -42,7 +42,7 @@ class FieldValuesUpload extends TwilioClientCommand {
                         {
                           type: 'list',
                           name: 'fieldTypeUniqueName',
-                          message: 'Choose your Field Type in which to upload: ',
+                          message: 'Select Field Type in which to upload: ',
                           choices: fieldTypeChoice
                         }
                     ]
diff --git a/src/commands/autopilot/list.js b/src/commands/autopilot/list.js
@@ -6,6 +6,7 @@ const {flags} = require('@oclif/command'),
 class ListAssistants extends TwilioClientCommand {
   
     async runCommand() {
+      
       const spinner = ora().start('Getting assistants...\n');
       try{
         
@@ -15,7 +16,6 @@ class ListAssistants extends TwilioClientCommand {
       }catch(err){
 
         spinner.stop()
-        
         console.error(`ERROR: ${err}`)
       }
     }
diff --git a/src/commands/autopilot/samples/upload.js b/src/commands/autopilot/samples/upload.js
@@ -42,7 +42,7 @@ class TaskSamplesUpload extends TwilioClientCommand {
                         {
                             type: 'list',
                             name: 'taskUniqueName',
-                            message: 'Choose your task in which to create: ',
+                            message: 'Select task to upload samples: ',
                             choices: taskChoice
                         }
                     ]
diff --git a/src/commands/autopilot/tasks/delete.js b/src/commands/autopilot/tasks/delete.js
@@ -36,7 +36,7 @@ class DeleteAssistantTask extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'taskUniqueName',
-                                    message: 'Choose your task in which to create: ',
+                                    message: 'Select task to delete: ',
                                     choices: taskChoice
                                 }
                             ]
diff --git a/src/commands/autopilot/tasks/update.js b/src/commands/autopilot/tasks/update.js
@@ -36,7 +36,7 @@ class UpdateAssistantTask extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'taskUniqueName',
-                                    message: 'Choose your task in which to create: ',
+                                    message: 'Select task to update: ',
                                     choices: taskChoice
                                 }
                             ]
@@ -59,7 +59,7 @@ class UpdateAssistantTask extends TwilioClientCommand {
                 await AutopilotCore.tasks.update(this.twilioClient, assistantSid, tSid, params);
 
             spinner.stop();
-            console.log(`Task with UniqueName: ${taskSid} was updated.`);
+            console.log(`Task '${tSid}' was updated.`);
         }catch(err){
 
             spinner.stop();
diff --git a/src/commands/autopilot/webhooks/delete.js b/src/commands/autopilot/webhooks/delete.js
@@ -38,7 +38,7 @@ class DeleteAssistantWebhook extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'webhookUniqueName',
-                                    message: 'Choose your webhook in which to create: ',
+                                    message: 'Select the webhook you want to delete: ',
                                     choices: webhookChoice
                                 }
                             ]
diff --git a/src/commands/autopilot/webhooks/update.js b/src/commands/autopilot/webhooks/update.js
@@ -44,7 +44,7 @@ class UpdateAssistantWebhook extends TwilioClientCommand {
                                 {
                                     type: 'list',
                                     name: 'webhookUniqueName',
-                                    message: 'Choose your webhook in which to create: ',
+                                    message: 'Select the webhook you want to update: ',
                                     choices: webhookChoice
                                 }
                             ]
diff --git a/src/lib/serverless/deploy.js b/src/lib/serverless/deploy.js
@@ -0,0 +1,162 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const serverless_api_1 = require("@twilio-labs/serverless-api");
+const common_tags_1 = require("common-tags");
+const path_1 = __importDefault(require("path"));
+const check_credentials_1 = require("twilio-run/dist/checks/check-credentials");
+const project_structure_1 = __importDefault(require("twilio-run/dist/checks/project-structure"));
+const deploy_1 = require("twilio-run/dist/config/deploy");
+const deploy_2 = require("twilio-run/dist/printers/deploy");
+const utils_1 = require("twilio-run/dist/serverless-api/utils");
+const logger_1 = require("twilio-run/dist/utils/logger");
+const shared_1 = require("twilio-run/dist/commands/shared");
+const utils_2 = require("twilio-run/dist/commands/utils");
+const debug = logger_1.getDebugFunction('twilio-run:deploy');
+function logError(msg) {
+    logger_1.logger.error(msg);
+}
+function handleError(err, spinner, flags, config) {
+    debug('%O', err);
+    spinner.fail('Failed Deployment');
+    if (err.name === 'conflicting-servicename') {
+        const fullCommand = utils_2.getFullCommand(flags);
+        const messageBody = common_tags_1.stripIndent `
+      Here are a few ways to solve this problem:
+      
+      - Rename your project in the package.json "name" property
+      - Pass an explicit name to your deployment
+        > ${utils_2.constructCommandName(fullCommand, 'deploy', [
+            '-n',
+            'my-new-service-name',
+        ])}
+      - Deploy to the existing service with the name "${err['serviceName'] || config.serviceName}"
+        > ${utils_2.constructCommandName(fullCommand, 'deploy', [
+            '--override-existing-project',
+        ])}
+      - Run deployment in force mode
+        > ${utils_2.constructCommandName(fullCommand, 'deploy', ['--force'])} 
+    `;
+        logger_1.logger.error(messageBody, err.message);
+    }
+    else if (err.name === 'HTTPError') {
+        const responseBody = JSON.parse(err.body);
+        const messageBody = common_tags_1.stripIndent `
+      ${responseBody.message}
+
+      More info: ${responseBody.more_info}
+    `;
+        logger_1.logger.error(messageBody);
+    }
+    else {
+        logger_1.logger.error(err.message);
+    }
+    process.exit(1);
+}
+function handler(flags, externalCliOptions) {
+    return __awaiter(this, void 0, void 0, function* () {
+        logger_1.setLogLevelByName(flags.logLevel);
+        const cwd = path_1.default.resolve(process.cwd(), 'function');
+        flags.cwd = cwd;
+        const command = utils_2.getFullCommand(flags);
+        yield project_structure_1.default(cwd, command, true);
+        let config;
+        try {
+            config = yield deploy_1.getConfigFromFlags(flags, externalCliOptions);
+        }
+        catch (err) {
+            debug(err);
+            logError(err.message);
+            process.exit(1);
+            return;
+        }
+        if (!config) {
+            logError('Internal Error');
+            process.exit(1);
+            return;
+        }
+        debug('Deploy Config %P', config);
+        check_credentials_1.checkConfigForCredentials(config);
+        //deploy_2.printConfigInfo(config);
+        const spinner = logger_1.getOraSpinner('Deploying Function').start();
+        try {
+            const client = new serverless_api_1.TwilioServerlessApiClient(config);
+            client.on('status-update', evt => {
+                spinner.text = evt.message + '\n';
+            });
+            const result = yield client.deployLocalProject(config);
+            spinner.text = 'Serverless function successfully deployed\n';
+            spinner.succeed();
+            //console.log(result);
+            //deploy_2.printDeployedResources(config, result);
+            const { serviceSid, buildSid } = result;
+            yield utils_1.saveLatestDeploymentData(config.cwd, serviceSid, buildSid, config.accountSid.startsWith('AC')
+                ? config.accountSid
+                : externalCliOptions && externalCliOptions.accountSid);
+
+            return {
+                url : `https://${result.domain}${result.functionResources[0].path}`
+            };
+        }
+        catch (err) {
+            handleError(err, spinner, flags, config);
+        }
+    });
+}
+exports.handler = handler;
+exports.cliInfo = {
+    options: Object.assign({}, shared_1.sharedCliOptions, { cwd: {
+            type: 'string',
+            describe: 'Sets the directory from which to deploy',
+            hidden : true
+        }, 'functions-env': {
+            type: 'string',
+            describe: 'DEPRECATED: Use --environment instead',
+            hidden: true,
+        }, environment: {
+            type: 'string',
+            describe: 'The environment name (domain suffix) you want to use for your deployment',
+            default: 'dev',
+            hidden : true
+        }, 'account-sid': {
+            type: 'string',
+            alias: 'u',
+            describe: 'A specific account SID to be used for deployment. Uses fields in .env otherwise',
+        }, 'auth-token': {
+            type: 'string',
+            describe: 'Use a specific auth token for deployment. Uses fields from .env otherwise',
+        }, functions: {
+            type: 'boolean',
+            describe: 'Upload functions. Can be turned off with --no-functions',
+            default: true,
+            hidden : true
+        }, assets: {
+            type: 'boolean',
+            describe: 'Upload assets. Can be turned off with --no-assets',
+            default: true,
+            hidden : true
+        }
+     }),
+};
+function optionBuilder(yargs) {
+    yargs = yargs
+        .example('$0 deploy', 'Deploys all functions and assets in the current working directory')
+        .example('$0 deploy --environment=stage', 'Creates an environment with the domain suffix "stage"');
+    yargs = Object.keys(exports.cliInfo.options).reduce((yargs, name) => {
+        return yargs.option(name, exports.cliInfo.options[name]);
+    }, yargs);
+    return yargs;
+}
+exports.command = ['deploy'];
+exports.describe = 'Deploys existing functions and assets to Twilio';
+exports.builder = optionBuilder;
diff --git a/src/lib/serverless/updateTaskURL.js b/src/lib/serverless/updateTaskURL.js
diff --git a/src/utils.js b/src/utils.js

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class CreateAssistantTaskField extends TwilioClientCommand {`
`45`	`45`	`{`
`46`	`46`	`type: 'list',`
`47`	`47`	`name: 'taskUniqueName',`
`48`		`- message: 'Choose your task in which to create: ',`
	`48`	`+ message: 'Select task in which to create: ',`
`49`	`49`	`choices: taskChoice`
`50`	`50`	`}`
`51`	`51`	`]`
`@@ -74,7 +74,7 @@ class CreateAssistantTaskField extends TwilioClientCommand {`
`74`	`74`	`{`
`75`	`75`	`type: 'list',`
`76`	`76`	`name: 'fieldTypeUniqueName',`
`77`		`- message: 'Choose your Field Type to create: ',`
	`77`	`+ message: 'Select Field Type in which to create: ',`
`78`	`78`	`choices: f_choices`
`79`	`79`	`}`
`80`	`80`	`]`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class DeleteAssistantTaskField extends TwilioClientCommand {`
`36`	`36`	`{`
`37`	`37`	`type: 'list',`
`38`	`38`	`name: 'taskUniqueName',`
`39`		`- message: 'Choose your task in which to delete: ',`
	`39`	`+ message: 'Select task in which to delete: ',`
`40`	`40`	`choices: taskChoice`
`41`	`41`	`}`
`42`	`42`	`]`
`@@ -61,7 +61,7 @@ class DeleteAssistantTaskField extends TwilioClientCommand {`
`61`	`61`	`{`
`62`	`62`	`type: 'list',`
`63`	`63`	`name: 'fieldUniqueName',`
`64`		`- message: 'Choose your Field to delete: ',`
	`64`	`+ message: 'Select Field to delete: ',`
`65`	`65`	`choices: fieldChoice`
`66`	`66`	`}`
`67`	`67`	`]`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ListAssistantTaskFields extends TwilioClientCommand {`
`36`	`36`	`{`
`37`	`37`	`type: 'list',`
`38`	`38`	`name: 'taskUniqueName',`
`39`		`- message: 'Choose your task in which to list: ',`
	`39`	`+ message: 'Select task in which to list: ',`
`40`	`40`	`choices: taskChoice`
`41`	`41`	`}`
`42`	`42`	`]`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class FieldValuesUpload extends TwilioClientCommand {`
`42`	`42`	`{`
`43`	`43`	`type: 'list',`
`44`	`44`	`name: 'fieldTypeUniqueName',`
`45`		`- message: 'Choose your Field Type in which to upload: ',`
	`45`	`+ message: 'Select Field Type in which to upload: ',`
`46`	`46`	`choices: fieldTypeChoice`
`47`	`47`	`}`
`48`	`48`	`]`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ const {flags} = require('@oclif/command'),`
`6`	`6`	`class ListAssistants extends TwilioClientCommand {`
`7`	`7`
`8`	`8`	`async runCommand() {`
	`9`	`+`
`9`	`10`	`const spinner = ora().start('Getting assistants...\n');`
`10`	`11`	`try{`
`11`	`12`
`@@ -15,7 +16,6 @@ class ListAssistants extends TwilioClientCommand {`
`15`	`16`	`}catch(err){`
`16`	`17`
`17`	`18`	`spinner.stop()`
`18`		`-`
`19`	`19`	console.error(`ERROR: ${err}`)
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class TaskSamplesUpload extends TwilioClientCommand {`
`42`	`42`	`{`
`43`	`43`	`type: 'list',`
`44`	`44`	`name: 'taskUniqueName',`
`45`		`- message: 'Choose your task in which to create: ',`
	`45`	`+ message: 'Select task to upload samples: ',`
`46`	`46`	`choices: taskChoice`
`47`	`47`	`}`
`48`	`48`	`]`