refactor: attempt to remove request (#700)

JustinBeckwith · web-flow · commit 5333a305e2a1 · 2019-05-20T21:56:33.000Z
diff --git a/package.json b/package.json
@@ -42,19 +42,19 @@
     "gts": "^1.0.0",
     "intelli-espower-loader": "^1.0.1",
     "js-green-licenses": "^0.5.0",
+    "linkinator": "^1.1.2",
     "mkdirp": "^0.5.1",
     "mocha": "^6.0.0",
     "ncp": "^2.0.0",
     "nock": "^10.0.0",
     "nyc": "^14.0.0",
     "post-install-check": "0.0.1",
     "proxyquire": "^2.0.0",
-    "request": "^2.88.0",
     "require-inject": "^1.4.3",
     "source-map-support": "^0.5.6",
+    "teeny-request": "^3.11.3",
     "typescript": "~3.4.0",
-    "uuid": "^3.3.2",
-    "linkinator": "^1.1.2"
+    "uuid": "^3.3.2"
   },
   "dependencies": {
     "@google-cloud/common": "^1.0.0",
diff --git a/src/client/stackdriver/debug.ts b/src/client/stackdriver/debug.ts
@@ -15,7 +15,6 @@
  */
 
 import {GoogleAuthOptions, Service} from '@google-cloud/common';
-import * as request from 'request'; //  Only for type declarations.
 
 export interface PackageInfo {
   name: string;
diff --git a/test/auth-request.ts b/test/auth-request.ts
diff --git a/test/test-controller.ts b/test/test-controller.ts
@@ -20,16 +20,22 @@ import * as nock from 'nock';
 import {Debug} from '../src/client/stackdriver/debug';
 import {Debuggee} from '../src/debuggee';
 import * as stackdriver from '../src/types/stackdriver';
-
-import {authRequest as request} from './auth-request';
+import * as r from 'request'; // types only
+import {teenyRequest} from 'teeny-request';
 
 // the tests in this file rely on the GCLOUD_PROJECT environment variable
 // not being set
 delete process.env.GCLOUD_PROJECT;
 
 import {Controller} from '../src/agent/controller';
 // TODO: Fix fakeDebug to actually implement Debug.
-const fakeDebug: Debug = ({request} as {}) as Debug;
+const fakeDebug = ({
+  request: (options: r.Options, cb: r.RequestCallback) => {
+    teenyRequest(options, (err, r) => {
+      cb(err, r ? r.body : undefined, r);
+    });
+  },
+} as {}) as Debug;
 
 const agentVersion = `SomeName/client/SomeVersion`;
 const url = 'https://clouddebugger.googleapis.com';
