feat: add region/edge support

Author: dkundel

Diff for: packages/plugin-serverless/src/commands/serverless/deploy.js

@@ -1,15 +1,16 @@
-const { TwilioClientCommand } = require('@twilio/cli-core').baseCommands;
+const { TwilioClientCommand } = require("@twilio/cli-core").baseCommands;
 
 const {
   handler,
   cliInfo,
   describe,
-} = require('twilio-run/dist/commands/deploy');
+} = require("twilio-run/dist/commands/deploy");
 const {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
   createExternalCliOptions,
-} = require('../../utils');
+  getRegionAndEdge,
+} = require("../../utils");
 
 class FunctionsDeploy extends TwilioClientCommand {
   async run() {
@@ -20,6 +21,10 @@ class FunctionsDeploy extends TwilioClientCommand {
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 
+    const { edge, region } = getRegionAndEdge(flags, this);
+    flags.region = region;
+    flags.edge = edge;
+
     const opts = Object.assign({}, flags, args);
     return handler(opts, externalOptions);
   }

Diff for: packages/plugin-serverless/src/commands/serverless/list.js

@@ -1,11 +1,11 @@
-const { TwilioClientCommand } = require('@twilio/cli-core').baseCommands;
+const { TwilioClientCommand } = require("@twilio/cli-core").baseCommands;
 
-const { handler, cliInfo, describe } = require('twilio-run/dist/commands/list');
+const { handler, cliInfo, describe } = require("twilio-run/dist/commands/list");
 const {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
   createExternalCliOptions,
-} = require('../../utils');
+} = require("../../utils");
 
 class FunctionsList extends TwilioClientCommand {
   async run() {
@@ -16,6 +16,10 @@ class FunctionsList extends TwilioClientCommand {
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 
+    const { edge, region } = getRegionAndEdge(flags, this);
+    flags.region = region;
+    flags.edge = edge;
+
     const opts = Object.assign({}, flags, args);
     return handler(opts, externalOptions);
   }
@@ -25,11 +29,11 @@ FunctionsList.description = describe;
 
 FunctionsList.args = [
   {
-    name: 'types',
+    name: "types",
     required: false,
     default: cliInfo.argsDefaults.types,
     description:
-      'Comma separated list of things to list (services,environments,functions,assets,variables)',
+      "Comma separated list of things to list (services,environments,functions,assets,variables)",
   },
 ];
 

Diff for: packages/plugin-serverless/src/commands/serverless/logs.js

@@ -1,12 +1,12 @@
-const { TwilioClientCommand } = require('@twilio/cli-core').baseCommands;
+const { TwilioClientCommand } = require("@twilio/cli-core").baseCommands;
 
-const { handler, cliInfo, describe } = require('twilio-run/dist/commands/logs');
+const { handler, cliInfo, describe } = require("twilio-run/dist/commands/logs");
 
 const {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
   createExternalCliOptions,
-} = require('../../utils');
+} = require("../../utils");
 
 class LogsList extends TwilioClientCommand {
   async run() {
@@ -17,6 +17,10 @@ class LogsList extends TwilioClientCommand {
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 
+    const { edge, region } = getRegionAndEdge(flags, this);
+    flags.region = region;
+    flags.edge = edge;
+
     const opts = Object.assign({}, flags, args);
     return handler(opts, externalOptions);
   }

Diff for: packages/plugin-serverless/src/commands/serverless/promote.js

@@ -3,12 +3,12 @@ const { TwilioClientCommand } = require("@twilio/cli-core").baseCommands;
 const {
   handler,
   cliInfo,
-  describe
+  describe,
 } = require("twilio-run/dist/commands/activate");
 const {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
-  createExternalCliOptions
+  createExternalCliOptions,
 } = require("../../utils");
 
 class FunctionsPromote extends TwilioClientCommand {
@@ -20,6 +20,10 @@ class FunctionsPromote extends TwilioClientCommand {
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 
+    const { edge, region } = getRegionAndEdge(flags, this);
+    flags.region = region;
+    flags.edge = edge;
+
     const opts = Object.assign({}, flags, args);
     return handler(opts, externalOptions);
   }

Diff for: packages/plugin-serverless/src/utils.js

@@ -1,6 +1,6 @@
-const path = require('path');
-const camelCase = require('lodash.camelcase');
-const { flags } = require('@oclif/command');
+const path = require("path");
+const camelCase = require("lodash.camelcase");
+const { flags } = require("@oclif/command");
 
 function convertYargsOptionsToOclifFlags(options) {
   const flagsResult = Object.keys(options).reduce((result, name) => {
@@ -11,10 +11,10 @@ function convertYargsOptionsToOclifFlags(options) {
       hidden: opt.hidden,
     };
 
-    if (typeof opt.default !== 'undefined') {
+    if (typeof opt.default !== "undefined") {
       flag.default = opt.default;
 
-      if (opt.type === 'boolean') {
+      if (opt.type === "boolean") {
         if (flag.default === true) {
           flag.allowNo = true;
         }
@@ -37,7 +37,7 @@ function convertYargsOptionsToOclifFlags(options) {
 
 function normalizeFlags(flags) {
   const result = Object.keys(flags).reduce((current, name) => {
-    if (name.includes('-')) {
+    if (name.includes("-")) {
       const normalizedName = camelCase(name);
       current[normalizedName] = flags[name];
     }
@@ -62,8 +62,17 @@ function createExternalCliOptions(flags, twilioClient) {
   };
 }
 
+function getRegionAndEdge(flags, clientCommand) {
+  const edge =
+    flags.edge || process.env.TWILIO_EDGE || clientCommand.userConfig.edge;
+  const region = flags.region || clientCommand.currentProfile.region;
+
+  return { edge, region };
+}
+
 module.exports = {
   convertYargsOptionsToOclifFlags,
   normalizeFlags,
   createExternalCliOptions,
+  getRegionAndEdge,
 };