refactor: update serverless-api to v4

Author: dkundel

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.8.0-beta.1](https://github.com/twilio-labs/twilio-run/compare/v2.7.0...v2.8.0-beta.1) (2020-07-08)
+
+
+### Features
+
+* add better system env support ([#146](https://github.com/twilio-labs/twilio-run/issues/146)) ([7411e33](https://github.com/twilio-labs/twilio-run/commit/7411e334ad2fa90a0610a7381e5e0b6ee8564f99)), closes [#144](https://github.com/twilio-labs/twilio-run/issues/144)
+* **runtime:** experimental: load functions in a separate process ([#147](https://github.com/twilio-labs/twilio-run/issues/147)) ([0a4f542](https://github.com/twilio-labs/twilio-run/commit/0a4f542a8684606e6e4a739509c09124e91ce005))
+
 ## [2.8.0-beta.0](https://github.com/twilio-labs/twilio-run/compare/v2.7.0...v2.8.0-beta.0) (2020-07-08)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "twilio-run",
-  "version": "2.8.0-beta.0",
+  "version": "2.8.0-beta.1",
   "bin": {
     "twilio-functions": "./bin/twilio-run.js",
     "twilio-run": "./bin/twilio-run.js"
@@ -38,7 +38,7 @@
   "author": "Dominik Kundel <dkundel@twilio.com>",
   "license": "MIT",
   "dependencies": {
-    "@twilio-labs/serverless-api": "^3.1.0",
+    "@twilio-labs/serverless-api": "^4.0.1",
     "@twilio-labs/serverless-runtime-types": "^1.1.7",
     "@types/express": "^4.17.0",
     "@types/inquirer": "^6.0.3",
@@ -96,6 +96,7 @@
     "@types/lodash.kebabcase": "^4.1.6",
     "@types/lodash.startcase": "^4.4.6",
     "@types/mock-fs": "^4.10.0",
+    "@types/node": "^14.0.19",
     "@types/prompts": "^2.0.1",
     "@types/supertest": "^2.0.8",
     "@types/title": "^1.0.5",

src/checks/check-credentials.ts

@@ -2,15 +2,15 @@ import { stripIndent } from 'common-tags';
 import { logger } from '../utils/logger';
 
 type ConfigWithCredentials = {
-  accountSid?: string;
-  authToken?: string;
+  username?: string;
+  password?: string;
 };
 
 export function checkConfigForCredentials(
   config: ConfigWithCredentials,
   shouldExit = true
 ) {
-  if (config.accountSid && config.authToken) {
+  if (config.username && config.password) {
     return;
   }
 

src/commands/activate.ts

@@ -1,11 +1,12 @@
-import {
-  ActivateConfig,
-  TwilioServerlessApiClient,
-} from '@twilio-labs/serverless-api';
+import { TwilioServerlessApiClient } from '@twilio-labs/serverless-api';
 import { Ora } from 'ora';
 import { Argv } from 'yargs';
 import { checkConfigForCredentials } from '../checks/check-credentials';
-import { ActivateCliFlags, getConfigFromFlags } from '../config/activate';
+import {
+  ActivateCliFlags,
+  ActivateConfig,
+  getConfigFromFlags,
+} from '../config/activate';
 import { printActivateConfig, printActivateResult } from '../printers/activate';
 import {
   getDebugFunction,

src/commands/deploy.ts

@@ -1,14 +1,15 @@
-import {
-  DeployLocalProjectConfig,
-  TwilioServerlessApiClient,
-} from '@twilio-labs/serverless-api';
+import { TwilioServerlessApiClient } from '@twilio-labs/serverless-api';
 import { stripIndent } from 'common-tags';
 import { Ora } from 'ora';
 import path from 'path';
 import { Argv } from 'yargs';
 import { checkConfigForCredentials } from '../checks/check-credentials';
 import checkProjectStructure from '../checks/project-structure';
-import { DeployCliFlags, getConfigFromFlags } from '../config/deploy';
+import {
+  DeployCliFlags,
+  DeployLocalProjectConfig,
+  getConfigFromFlags,
+} from '../config/deploy';
 import { printConfigInfo, printDeployedResources } from '../printers/deploy';
 import { HttpError, saveLatestDeploymentData } from '../serverless-api/utils';
 import {
@@ -117,8 +118,8 @@ export async function handler(
       config.cwd,
       serviceSid,
       buildSid,
-      config.accountSid.startsWith('AC')
-        ? config.accountSid
+      config.username.startsWith('AC')
+        ? config.username
         : externalCliOptions && externalCliOptions.accountSid
     );
   } catch (err) {

src/config/activate.ts

@@ -16,10 +16,10 @@ import {
 } from './utils';
 import { mergeFlagsAndConfig } from './utils/mergeFlagsAndConfig';
 
-type ActivateConfig = ApiActivateConfig & {
+export type ActivateConfig = ApiActivateConfig & {
   cwd: string;
-  accountSid?: string;
-  authToken?: string;
+  username: string;
+  password: string;
 };
 
 export type ActivateCliFlags = Arguments<
@@ -76,8 +76,8 @@ export async function getConfigFromFlags(
 
   return {
     cwd,
-    accountSid,
-    authToken,
+    username: accountSid,
+    password: authToken,
     serviceSid,
     force: flags.force,
     createEnvironment: flags.createEnvironment,

src/config/deploy.ts

@@ -1,4 +1,4 @@
-import { DeployLocalProjectConfig } from '@twilio-labs/serverless-api';
+import { DeployLocalProjectConfig as ApiDeployLocalProjectConfig } from '@twilio-labs/serverless-api';
 import path from 'path';
 import { Arguments } from 'yargs';
 import { cliInfo } from '../commands/deploy';
@@ -18,6 +18,11 @@ import {
 } from './utils';
 import { mergeFlagsAndConfig } from './utils/mergeFlagsAndConfig';
 
+export type DeployLocalProjectConfig = ApiDeployLocalProjectConfig & {
+  username: string;
+  password: string;
+};
+
 export type DeployCliFlags = Arguments<
   SharedFlagsWithCredentials & {
     serviceSid?: string;
@@ -101,8 +106,8 @@ export async function getConfigFromFlags(
   return {
     cwd,
     envPath,
-    accountSid,
-    authToken,
+    username: accountSid,
+    password: authToken,
     env,
     serviceSid,
     pkgJson,

src/config/list.ts

@@ -19,6 +19,8 @@ import {
 import { mergeFlagsAndConfig } from './utils/mergeFlagsAndConfig';
 
 export type ListConfig = ApiListConfig & {
+  username: string;
+  password: string;
   cwd: string;
   properties?: string[];
   extendedOutput: boolean;
@@ -78,8 +80,8 @@ export async function getConfigFromFlags(
 
   return {
     cwd,
-    accountSid,
-    authToken,
+    username: accountSid,
+    password: authToken,
     serviceSid,
     serviceName,
     environment: flags.environment,

src/config/logs.ts

@@ -17,9 +17,9 @@ import { mergeFlagsAndConfig } from './utils/mergeFlagsAndConfig';
 
 export type LogsConfig = ClientConfig &
   ApiLogsConfig & {
+    username: string;
+    password: string;
     cwd: string;
-    accountSid: string;
-    authToken: string;
     properties?: string[];
     outputFormat?: string;
   };
@@ -72,8 +72,8 @@ export async function getConfigFromFlags(
 
   return {
     cwd,
-    accountSid,
-    authToken,
+    username: accountSid,
+    password: authToken,
     environment,
     serviceSid,
     outputFormat,

src/printers/activate.ts

@@ -1,5 +1,6 @@
-import { ActivateConfig, ActivateResult } from '@twilio-labs/serverless-api';
+import { ActivateResult } from '@twilio-labs/serverless-api';
 import { stripIndent } from 'common-tags';
+import { ActivateConfig } from '../config/activate';
 import { logger } from '../utils/logger';
 import { writeOutput } from '../utils/output';
 import { getTwilioConsoleDeploymentUrl, redactPartOfString } from './utils';
@@ -8,8 +9,8 @@ import terminalLink = require('terminal-link');
 
 export function printActivateConfig(config: ActivateConfig) {
   const message = chalk`
-    {cyan.bold Account} ${config.accountSid}
-    {cyan.bold Token}   ${redactPartOfString(config.authToken)}
+    {cyan.bold Account} ${config.username}
+    {cyan.bold Token}   ${redactPartOfString(config.password)}
   `;
   logger.info(stripIndent(message) + '\n');
 }