refactor: remove configurable request (#394)

JustinBeckwith · web-flow · commit eaacf7ac64a7 · 2019-03-27T18:00:26.000-07:00
diff --git a/src/service-object.ts b/src/service-object.ts
@@ -32,7 +32,6 @@ export type RequestResponse = [Metadata, r.Response];
 export interface ServiceObjectParent {
   // tslint:disable-next-line:variable-name
   Promise?: PromiseConstructor;
-  requestModule?: typeof r;
   requestStream(reqOpts: DecorateRequestOptions): r.Request;
   request(reqOpts: DecorateRequestOptions, callback: BodyResponseCallback):
       void;
@@ -82,11 +81,6 @@ export interface ServiceObjectConfig {
    * object is Bucket.
    */
   parent: ServiceObjectParent;
-
-  /**
-   * Dependency for HTTP calls.
-   */
-  requestModule?: typeof r;
 }
 
 export interface Methods {
@@ -148,7 +142,6 @@ class ServiceObject<T = any> extends EventEmitter {
   protected interceptors: Interceptor[];
   // tslint:disable-next-line:variable-name
   Promise?: PromiseConstructor;
-  requestModule: typeof r;
 
   /*
    * @constructor
@@ -178,8 +171,6 @@ class ServiceObject<T = any> extends EventEmitter {
     this.methods = config.methods || {};
     this.interceptors = [];
     this.Promise = this.parent ? this.parent.Promise : undefined;
-    this.requestModule =
-        (config.requestModule || (this.parent && this.parent.requestModule))!;
 
     if (config.methods) {
       Object.getOwnPropertyNames(ServiceObject.prototype)
diff --git a/src/service.ts b/src/service.ts
@@ -45,7 +45,6 @@ export interface ServiceConfig {
 
   projectIdRequired?: boolean;
   packageJson: PackageJson;
-  requestModule: typeof r;
 
   /**
    * Reuse an existing GoogleAuth client instead of creating a new one.
@@ -72,7 +71,6 @@ export class Service {
   makeAuthenticatedRequest: MakeAuthenticatedRequest;
   authClient: GoogleAuth;
   private getCredentials: {};
-  requestModule: typeof r;
 
   /**
    * Service is a base class, meant to be inherited from by a "service," like
@@ -99,16 +97,14 @@ export class Service {
     this.projectId = options.projectId || PROJECT_ID_TOKEN;
     this.projectIdRequired = config.projectIdRequired !== false;
     this.Promise = options.promise || Promise;
-    this.requestModule = config.requestModule;
 
     const reqCfg = extend({}, config, {
       projectIdRequired: this.projectIdRequired,
       projectId: this.projectId,
       credentials: options.credentials,
       keyFile: options.keyFilename,
       email: options.email,
-      token: options.token,
-      request: this.requestModule,
+      token: options.token
     });
 
     this.makeAuthenticatedRequest =
diff --git a/src/util.ts b/src/util.ts
@@ -26,6 +26,7 @@ import {CredentialBody} from 'google-auth-library/build/src/auth/credentials';
 import * as r from 'request';  // types only
 import * as retryRequest from 'retry-request';
 import {Duplex, DuplexOptions, PassThrough, Readable, Writable} from 'stream';
+import {teenyRequest} from 'teeny-request';
 
 import {Interceptor} from './service-object';
 
@@ -121,8 +122,6 @@ export interface MakeAuthenticatedRequestFactoryConfig extends
 
   stream?: Duplexify;
 
-  request: typeof r;
-
   /**
    * A pre-instantiated GoogleAuth client that should be used.
    * A new will be created if this is not set.
@@ -167,11 +166,6 @@ export interface MakeWritableStreamOptions {
    */
   request?: r.Options;
 
-  /**
-   * Dependency for HTTP calls.
-   */
-  requestModule: typeof r;
-
   makeAuthenticatedRequest(reqOpts: r.OptionsWithUri, fnobj: {
     onAuthenticated(err: Error|null, authenticatedReqOpts?: r.Options): void
   }): void;
@@ -304,8 +298,6 @@ export interface MakeRequestConfig {
 
   stream?: Duplexify;
 
-  request?: typeof r;
-
   shouldRetryFn?: (response?: r.Response) => boolean;
 }
 
@@ -460,7 +452,7 @@ export class Util {
           return;
         }
 
-        const request = options.requestModule.defaults(requestDefaults);
+        const request = teenyRequest.defaults(requestDefaults);
         request(authenticatedReqOpts!, (err, resp, body) => {
           util.handleResp(err, resp, body, (err, data) => {
             if (err) {
@@ -672,7 +664,7 @@ export class Util {
       reqOpts: DecorateRequestOptions, config: MakeRequestConfig,
       callback: BodyResponseCallback): void|Abortable {
     const options = {
-      request: (config.request as typeof r).defaults(requestDefaults),
+      request: teenyRequest.defaults(requestDefaults),
       retries: config.autoRetry !== false ? config.maxRetries || 3 : 0,
       shouldRetryFn(httpRespMessage: r.Response) {
         const err = util.parseHttpRespMessage(httpRespMessage).err;
diff --git a/test/operation.ts b/test/operation.ts
@@ -32,11 +32,7 @@ describe('Operation', () => {
   const sandbox = sinon.createSandbox();
   let operation: Operation;
   beforeEach(() => {
-    operation = new Operation({
-      parent: FAKE_SERVICE,
-      id: OPERATION_ID,
-      requestModule: {} as typeof r,
-    });
+    operation = new Operation({parent: FAKE_SERVICE, id: OPERATION_ID});
     operation.Promise = Promise;
   });
 
@@ -45,7 +41,7 @@ describe('Operation', () => {
   });
 
   describe('instantiation', () => {
-    const parent = {requestModule: {}};
+    const parent = {};
 
     it('should extend ServiceObject and EventEmitter', () => {
       const svcObj = ServiceObject;
diff --git a/test/service-object.ts b/test/service-object.ts
@@ -44,9 +44,7 @@ describe('ServiceObject', () => {
 
   const CONFIG = {
     baseUrl: 'base-url',
-    parent: {
-      requestModule: {},
-    } as Service,
+    parent: {} as Service,
     id: 'id',
     createMethod: util.noop
   };
@@ -115,17 +113,11 @@ describe('ServiceObject', () => {
       // tslint:disable-next-line:variable-name
       const FakePromise = () => {};
       const config = extend({}, CONFIG, {
-        parent: {Promise: FakePromise, requestModule: {}},
+        parent: {Promise: FakePromise},
       });
       const serviceObject = new ServiceObject(config) as FakeServiceObject;
       assert.strictEqual(serviceObject.Promise, FakePromise);
     });
-
-    it('should inherit the parents requestModule', () => {
-      const serviceObject = new ServiceObject(CONFIG);
-      assert.strictEqual(
-          serviceObject.requestModule, CONFIG.parent.requestModule);
-    });
   });
 
   describe('create', () => {
diff --git a/test/util.ts b/test/util.ts
