override existing function and update options

Author: Mohammad-Khalid

README.md

@@ -88,7 +88,7 @@ OPTIONS
   -s, --schema=schema              (required) [default: templates] schema path
 ```
 
-_See code: [src/commands/autopilot/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/create.js)_
+_See code: [src/commands/autopilot/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/create.js)_
 
 ## `twilio autopilot:delete`
 
@@ -106,7 +106,7 @@ OPTIONS
   --uniqueName=uniqueName          assistant uniqueName
 ```
 
-_See code: [src/commands/autopilot/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/delete.js)_
+_See code: [src/commands/autopilot/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/delete.js)_
 
 ## `twilio autopilot:deploy`
 
@@ -130,9 +130,11 @@ OPTIONS
   -u, --account-sid=account-sid    A specific account SID to be used for deployment. Uses fields in .env otherwise
 
   --auth-token=auth-token          Use a specific auth token for deployment. Uses fields from .env otherwise
+
+  --override-existing-project      Deploys Serverless project to existing service if a naming conflict has been found.
 ```
 
-_See code: [src/commands/autopilot/deploy.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/deploy.js)_
+_See code: [src/commands/autopilot/deploy.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/deploy.js)_
 
 ## `twilio autopilot:export`
 
@@ -150,7 +152,7 @@ OPTIONS
   --uniqueName=uniqueName          assistant uniqueName
 ```
 
-_See code: [src/commands/autopilot/export.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/export.js)_
+_See code: [src/commands/autopilot/export.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/export.js)_
 
 ## `twilio autopilot:fields:create`
 
@@ -175,7 +177,7 @@ OPTIONS
   --uniqueName=uniqueName          (required) field unique name
 ```
 
-_See code: [src/commands/autopilot/fields/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/fields/create.js)_
+_See code: [src/commands/autopilot/fields/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/fields/create.js)_
 
 ## `twilio autopilot:fields:delete`
 
@@ -198,7 +200,7 @@ OPTIONS
   --taskSid=taskSid                task sid
 ```
 
-_See code: [src/commands/autopilot/fields/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/fields/delete.js)_
+_See code: [src/commands/autopilot/fields/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/fields/delete.js)_
 
 ## `twilio autopilot:fields:list`
 
@@ -217,7 +219,7 @@ OPTIONS
   --taskSid=taskSid                task sid
 ```
 
-_See code: [src/commands/autopilot/fields/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/fields/list.js)_
+_See code: [src/commands/autopilot/fields/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/fields/list.js)_
 
 ## `twilio autopilot:fieldtypes:create`
 
@@ -236,7 +238,7 @@ OPTIONS
   --uniqueName=uniqueName          (required) unique name for the field type
 ```
 
-_See code: [src/commands/autopilot/fieldtypes/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/fieldtypes/create.js)_
+_See code: [src/commands/autopilot/fieldtypes/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/fieldtypes/create.js)_
 
 ## `twilio autopilot:fieldtypes:list`
 
@@ -254,7 +256,7 @@ OPTIONS
   --properties=properties          [default: sid, uniqueName] The Autopilot Assistant FieldType List.
 ```
 
-_See code: [src/commands/autopilot/fieldtypes/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/fieldtypes/list.js)_
+_See code: [src/commands/autopilot/fieldtypes/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/fieldtypes/list.js)_
 
 ## `twilio autopilot:fieldtypes:update`
 
@@ -274,7 +276,7 @@ OPTIONS
   --uniqueName=uniqueName          field type unique name to update
 ```
 
-_See code: [src/commands/autopilot/fieldtypes/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/fieldtypes/update.js)_
+_See code: [src/commands/autopilot/fieldtypes/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/fieldtypes/update.js)_
 
 ## `twilio autopilot:fieldvalues:upload`
 
@@ -293,7 +295,7 @@ OPTIONS
   --fileName=fileName              (required) a CSV file of field values (one on each row with synonyms in columns)
 ```
 
-_See code: [src/commands/autopilot/fieldvalues/upload.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/fieldvalues/upload.js)_
+_See code: [src/commands/autopilot/fieldvalues/upload.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/fieldvalues/upload.js)_
 
 ## `twilio autopilot:import [TYPE]`
 
@@ -322,7 +324,7 @@ DESCRIPTION
   -> twilio autopilot:import alexa --model <alexa-interaction-model-file> [--redirectURL <alexa-back-end-hanlder-url>]
 ```
 
-_See code: [src/commands/autopilot/import.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/import.js)_
+_See code: [src/commands/autopilot/import.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/import.js)_
 
 ## `twilio autopilot:init`
 
@@ -336,11 +338,11 @@ OPTIONS
   -l=(debug|info|warn|error|none)  [default: info] Level of logging messages.
   -o=(columns|json|tsv)            [default: columns] Format of command output.
   -p, --profile=profile            Shorthand identifier for your profile.
-  -u, --accountSid=accountSid      A specific account SID to be used for deployment
-  --authToken=authToken            Use a specific auth token for deployment
+  -u, --account-sid=account-sid    A specific account SID to be used for deployment. Uses fields in .env otherwise
+  --auth-token=auth-token          Use a specific auth token for deployment. Uses fields from .env otherwise
 ```
 
-_See code: [src/commands/autopilot/init.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/init.js)_
+_See code: [src/commands/autopilot/init.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/init.js)_
 
 ## `twilio autopilot:list`
 
@@ -357,7 +359,7 @@ OPTIONS
   --properties=properties          [default: sid, uniqueName, friendlyName] The Autopilot Assistant List.
 ```
 
-_See code: [src/commands/autopilot/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/list.js)_
+_See code: [src/commands/autopilot/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/list.js)_
 
 ## `twilio autopilot:modelbuilds:create`
 
@@ -375,7 +377,7 @@ OPTIONS
   -u, --callbackURL=callbackURL    URL to get notified of model build status
 ```
 
-_See code: [src/commands/autopilot/modelbuilds/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/modelbuilds/create.js)_
+_See code: [src/commands/autopilot/modelbuilds/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/modelbuilds/create.js)_
 
 ## `twilio autopilot:queries:export`
 
@@ -393,7 +395,7 @@ OPTIONS
   -s, --assistantSid=assistantSid  (required) assistant that owns the task
 ```
 
-_See code: [src/commands/autopilot/queries/export.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/queries/export.js)_
+_See code: [src/commands/autopilot/queries/export.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/queries/export.js)_
 
 ## `twilio autopilot:samples:upload`
 
@@ -412,7 +414,7 @@ OPTIONS
   --taskSid=taskSid                task sid
 ```
 
-_See code: [src/commands/autopilot/samples/upload.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/samples/upload.js)_
+_See code: [src/commands/autopilot/samples/upload.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/samples/upload.js)_
 
 ## `twilio autopilot:simulate`
 
@@ -430,7 +432,7 @@ OPTIONS
   -t, --text=text                  (required) User text input
 ```
 
-_See code: [src/commands/autopilot/simulate.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/simulate.js)_
+_See code: [src/commands/autopilot/simulate.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/simulate.js)_
 
 ## `twilio autopilot:tasks:create`
 
@@ -449,7 +451,7 @@ OPTIONS
   --uniqueName=uniqueName          (required) unique name for task
 ```
 
-_See code: [src/commands/autopilot/tasks/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/tasks/create.js)_
+_See code: [src/commands/autopilot/tasks/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/tasks/create.js)_
 
 ## `twilio autopilot:tasks:delete`
 
@@ -467,7 +469,7 @@ OPTIONS
   --taskSid=taskSid                task sid
 ```
 
-_See code: [src/commands/autopilot/tasks/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/tasks/delete.js)_
+_See code: [src/commands/autopilot/tasks/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/tasks/delete.js)_
 
 ## `twilio autopilot:tasks:list`
 
@@ -485,7 +487,7 @@ OPTIONS
   --properties=properties          [default: sid, uniqueName, friendlyName] The Autopilot Assistant Task List.
 ```
 
-_See code: [src/commands/autopilot/tasks/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/tasks/list.js)_
+_See code: [src/commands/autopilot/tasks/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/tasks/list.js)_
 
 ## `twilio autopilot:tasks:update`
 
@@ -505,7 +507,7 @@ OPTIONS
   --uniqueName=uniqueName          task unique name to update
 ```
 
-_See code: [src/commands/autopilot/tasks/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/tasks/update.js)_
+_See code: [src/commands/autopilot/tasks/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/tasks/update.js)_
 
 ## `twilio autopilot:update`
 
@@ -523,7 +525,7 @@ OPTIONS
   --uniqueName=uniqueName          assistant uniqueName
 ```
 
-_See code: [src/commands/autopilot/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/update.js)_
+_See code: [src/commands/autopilot/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/update.js)_
 
 ## `twilio autopilot:webhooks:create`
 
@@ -544,7 +546,7 @@ OPTIONS
   -w, --webhookUniqueName=webhookUniqueName  (required) unique name for webhook
 ```
 
-_See code: [src/commands/autopilot/webhooks/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/webhooks/create.js)_
+_See code: [src/commands/autopilot/webhooks/create.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/webhooks/create.js)_
 
 ## `twilio autopilot:webhooks:delete`
 
@@ -562,7 +564,7 @@ OPTIONS
   --webhookSid=webhookSid          SID of the webhook to delete
 ```
 
-_See code: [src/commands/autopilot/webhooks/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/webhooks/delete.js)_
+_See code: [src/commands/autopilot/webhooks/delete.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/webhooks/delete.js)_
 
 ## `twilio autopilot:webhooks:list`
 
@@ -582,7 +584,7 @@ OPTIONS
                                    webhookMethod] The Autopilot Assistant Webhooks List.
 ```
 
-_See code: [src/commands/autopilot/webhooks/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/webhooks/list.js)_
+_See code: [src/commands/autopilot/webhooks/list.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/webhooks/list.js)_
 
 ## `twilio autopilot:webhooks:update`
 
@@ -604,7 +606,7 @@ OPTIONS
   --webhookSid=webhookSid                    SID of the webhook to update
 ```
 
-_See code: [src/commands/autopilot/webhooks/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.16/src/commands/autopilot/webhooks/update.js)_
+_See code: [src/commands/autopilot/webhooks/update.js](https://github.com/tingiris/twilio-cli-autopilot-plugin/blob/v1.0.0-beta.17/src/commands/autopilot/webhooks/update.js)_
 
 ## `twilio help [COMMAND]`
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dabblelab/plugin-autopilot",
   "description": "Create, Update, Delete, List, Simulate, Import and Export Twilio Autopilot Assistant",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.17",
   "author": "Steve Tingiris",
   "bugs": "https://github.com/tingiris/twilio-cli-autopilot-plugin/issues",
   "dependencies": {

src/commands/autopilot/init.js

@@ -6,6 +6,13 @@ const {flags} = require('@oclif/command'),
       ora = require('ora'),
       path = require('path');
 
+const { initCliInfo } = require('../../lib/serverless/deploy');
+const {
+        convertYargsOptionsToOclifFlags,
+        normalizeFlags,
+        createExternalCliOptions,
+      } = require('../../utils');
+
 class InitAssistant extends TwilioClientCommand {
 
   async runCommand() {
@@ -16,6 +23,7 @@ class InitAssistant extends TwilioClientCommand {
       let { flags, args } = this.parse(InitAssistant),
           clonedAssistant = '';
 
+      flags = normalizeFlags(flags);
 
       let url = 'https://raw.githubusercontent.com/Mohammad-Khalid/autopilot-templates/master/Templates/templates.json';
 
@@ -47,15 +55,7 @@ class InitAssistant extends TwilioClientCommand {
 InitAssistant.description = `Init autopilot bot template`;
 
 InitAssistant.flags = Object.assign(
-  {
-    "accountSid" : flags.string({
-      char : 'u',
-      description : 'A specific account SID to be used for deployment'
-    }),
-    "authToken" : flags.string({
-      description : 'Use a specific auth token for deployment'
-    })
-  },
+  convertYargsOptionsToOclifFlags(initCliInfo.options),
   TwilioClientCommand.flags
 )
 

src/lib/serverless/deploy.js

@@ -32,20 +32,10 @@ function handleError(err, spinner, flags, config) {
     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);
     }
@@ -145,9 +135,30 @@ exports.cliInfo = {
             describe: 'Upload assets. Can be turned off with --no-assets',
             default: true,
             hidden : true
+        },
+        'override-existing-project': {
+            type: 'boolean',
+            describe: 'Deploys Serverless project to existing service if a naming conflict has been found.',
+            default: false,
         }
      }),
 };
+
+exports.initCliInfo = {
+    options: Object.assign({}, 
+        { 
+            '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',
+            }
+        }
+    ),
+};
 function optionBuilder(yargs) {
     yargs = yargs
         .example('$0 deploy', 'Deploys all functions and assets in the current working directory')