From ccaaffa06148c56d63d582352ab944617a5f9334 Mon Sep 17 00:00:00 2001
From: Phil Nash <philnash@gmail.com>
Date: Thu, 10 Sep 2020 11:59:35 +1000
Subject: [PATCH] fix(debugger): fixes debugger redaction in plugin-serverless

Fixes #185.

When using the twilio-run debugger within the serverless plugin, redaction wasn't working. I thought this might be because the debug module was being overwritten. Looking at where the formatters are added, the resultant debug object was never exported and used.

Exporting this debugger and explicitly using it brought the formatter back in the plugin.
---
 packages/twilio-run/src/cli.ts          | 1 -
 packages/twilio-run/src/index.ts        | 2 --
 packages/twilio-run/src/utils/debug.ts  | 2 ++
 packages/twilio-run/src/utils/logger.ts | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/twilio-run/src/cli.ts b/packages/twilio-run/src/cli.ts
index cadc0d22..f43a4ce2 100644
--- a/packages/twilio-run/src/cli.ts
+++ b/packages/twilio-run/src/cli.ts
@@ -6,7 +6,6 @@ import * as NewCommand from './commands/new';
 import * as StartCommand from './commands/start';
 import * as ListTemplatesCommand from './commands/list-templates';
 import * as LogsCommand from './commands/logs';
-import './utils/debug';
 
 export async function run(rawArgs: string[]) {
   yargs
diff --git a/packages/twilio-run/src/index.ts b/packages/twilio-run/src/index.ts
index e76928de..27dd4420 100644
--- a/packages/twilio-run/src/index.ts
+++ b/packages/twilio-run/src/index.ts
@@ -1,4 +1,2 @@
-import './utils/debug';
-
 export { functionToRoute as handlerToExpressRoute } from './runtime/route';
 export { runServer as runDevServer } from './runtime/server';
diff --git a/packages/twilio-run/src/utils/debug.ts b/packages/twilio-run/src/utils/debug.ts
index 66928e71..5b5bc27f 100644
--- a/packages/twilio-run/src/utils/debug.ts
+++ b/packages/twilio-run/src/utils/debug.ts
@@ -77,3 +77,5 @@ debug.formatters.r = function redactedFormatterSameline(v: any): string {
   }
   return debug.formatters.o.bind(debug)(v);
 };
+
+export default debug;
diff --git a/packages/twilio-run/src/utils/logger.ts b/packages/twilio-run/src/utils/logger.ts
index 19f666c8..b0896a90 100644
--- a/packages/twilio-run/src/utils/logger.ts
+++ b/packages/twilio-run/src/utils/logger.ts
@@ -1,5 +1,5 @@
 import { ClientApiError } from '@twilio-labs/serverless-api/dist/utils/error';
-import debug from 'debug';
+import debug from './debug';
 import ora from 'ora';
 import { Writable } from 'stream';
 import terminalLink from 'terminal-link';