feat: pass CLI info to twilio-run for cleaner structure

* feat: pass CLI info to twilio-run

* chore(npm): upgrade twilio-run to rc.2

Author: dkundel

packages/plugin-serverless/package.json

@@ -11,7 +11,7 @@
     "create-twilio-function": "^2.0.0-alpha.4",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
-    "twilio-run": "^2.0.0-rc.1"
+    "twilio-run": "^2.0.0-rc.2"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.21.3",

packages/plugin-serverless/src/commands/serverless/activate.js

@@ -8,6 +8,7 @@ const {
 const {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
+  createExternalCliOptions,
 } = require('../../utils');
 
 class FunctionsActivate extends TwilioClientCommand {
@@ -21,18 +22,10 @@ class FunctionsActivate extends TwilioClientCommand {
     let { flags, args } = this.parse(FunctionsActivate);
     flags = normalizeFlags(flags);
 
-    if (flags.project === 'default') {
-      flags._cliDefault = {
-        username: this.twilioClient.username,
-        password: this.twilioClient.password,
-      };
-    } else {
-      flags.accountSid = flags.accountSid || this.twilioClient.username;
-      flags.authToken = flags.authToken || this.twilioClient.password;
-    }
+    const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 
     const opts = Object.assign({}, flags, args);
-    return handler(opts);
+    return handler(opts, externalOptions);
   }
 }
 

packages/plugin-serverless/src/commands/serverless/deploy.js

@@ -8,6 +8,7 @@ const {
 const {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
+  createExternalCliOptions,
 } = require('../../utils');
 
 class FunctionsDeploy extends TwilioClientCommand {
@@ -21,18 +22,10 @@ class FunctionsDeploy extends TwilioClientCommand {
     let { flags, args } = this.parse(FunctionsDeploy);
     flags = normalizeFlags(flags);
 
-    if (flags.project === 'default') {
-      flags._cliDefault = {
-        username: this.twilioClient.username,
-        password: this.twilioClient.password,
-      };
-    } else {
-      flags.accountSid = flags.accountSid || this.twilioClient.username;
-      flags.authToken = flags.authToken || this.twilioClient.password;
-    }
+    const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 
     const opts = Object.assign({}, flags, args);
-    return handler(opts);
+    return handler(opts, externalOptions);
   }
 }
 

packages/plugin-serverless/src/commands/serverless/list.js

@@ -5,6 +5,7 @@ const { handler, cliInfo, describe } = require('twilio-run/dist/commands/list');
 const {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
+  createExternalCliOptions,
 } = require('../../utils');
 
 class FunctionsList extends TwilioClientCommand {
@@ -18,18 +19,10 @@ class FunctionsList extends TwilioClientCommand {
     let { flags, args } = this.parse(FunctionsList);
     flags = normalizeFlags(flags);
 
-    if (flags.project === 'default') {
-      flags._cliDefault = {
-        username: this.twilioClient.username,
-        password: this.twilioClient.password,
-      };
-    } else {
-      flags.accountSid = flags.accountSid || this.twilioClient.username;
-      flags.authToken = flags.authToken || this.twilioClient.password;
-    }
+    const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 
     const opts = Object.assign({}, flags, args);
-    return handler(opts);
+    return handler(opts, externalOptions);
   }
 }
 

packages/plugin-serverless/src/commands/serverless/new.js

@@ -18,7 +18,7 @@ class FunctionsNew extends Command {
     flags = normalizeFlags(flags);
 
     const opts = Object.assign({}, flags, args);
-    return handler(opts);
+    return handler(opts, undefined);
   }
 }
 

packages/plugin-serverless/src/commands/serverless/start.js

@@ -23,7 +23,7 @@ class FunctionsStart extends Command {
     flags = normalizeFlags(flags);
 
     const opts = Object.assign({}, flags, args);
-    return handler(opts);
+    return handler(opts, undefined);
   }
 }
 

packages/plugin-serverless/src/utils.js

@@ -49,4 +49,21 @@ function normalizeFlags(flags) {
   return result;
 }
 
-module.exports = { convertYargsOptionsToOclifFlags, normalizeFlags };
+function createExternalCliOptions(flags, twilioClient) {
+  const project = flags.project;
+
+  return {
+    username: twilioClient.username,
+    password: twilioClient.password,
+    accountSid: twilioClient.accountSid,
+    project,
+    logLevel: undefined,
+    outputFormat: undefined,
+  };
+}
+
+module.exports = {
+  convertYargsOptionsToOclifFlags,
+  normalizeFlags,
+  createExternalCliOptions,
+};