fix: allow methodConfig to override request method and uri (#451)

* fix: allow methodConfig to override request method and uri

* npm run fix

Author: jkwlui

core/common/src/service-object.ts

@@ -271,11 +271,17 @@ class ServiceObject<T = any> extends EventEmitter {
     const methodConfig =
       (typeof this.methods.delete === 'object' && this.methods.delete) || {};
 
-    const reqOpts = extend(true, {}, methodConfig.reqOpts, {
-      method: 'DELETE',
-      uri: '',
-      qs: options,
-    });
+    const reqOpts = extend(
+      true,
+      {
+        method: 'DELETE',
+        uri: '',
+      },
+      methodConfig.reqOpts,
+      {
+        qs: options,
+      }
+    );
 
     // The `request` method may have been overridden to hold any special
     // behavior. Ensure we call the original `request` method.
@@ -402,10 +408,16 @@ class ServiceObject<T = any> extends EventEmitter {
       (typeof this.methods.getMetadata === 'object' &&
         this.methods.getMetadata) ||
       {};
-    const reqOpts = extend(true, {}, methodConfig.reqOpts, {
-      uri: '',
-      qs: options,
-    });
+    const reqOpts = extend(
+      true,
+      {
+        uri: '',
+      },
+      methodConfig.reqOpts,
+      {
+        qs: options,
+      }
+    );
 
     // The `request` method may have been overridden to hold any special
     // behavior. Ensure we call the original `request` method.
@@ -452,12 +464,19 @@ class ServiceObject<T = any> extends EventEmitter {
         this.methods.setMetadata) ||
       {};
 
-    const reqOpts = extend(true, {}, methodConfig.reqOpts, {
-      method: 'PATCH',
-      uri: '',
-      json: metadata,
-      qs: options,
-    });
+    const reqOpts = extend(
+      true,
+      {},
+      {
+        method: 'PATCH',
+        uri: '',
+      },
+      methodConfig.reqOpts,
+      {
+        json: metadata,
+        qs: options,
+      }
+    );
 
     // The `request` method may have been overridden to hold any special
     // behavior. Ensure we call the original `request` method.

core/common/test/service-object.ts

@@ -267,6 +267,34 @@ describe('ServiceObject', () => {
       serviceObject.delete(options, assert.ifError);
     });
 
+    it('should override method and uri field in request with methodConfig', done => {
+      const methodConfig = {
+        reqOpts: {
+          uri: 'v2',
+          method: 'PATCH',
+        },
+      };
+
+      const cachedMethodConfig = extend(true, {}, methodConfig);
+
+      sandbox
+        .stub(ServiceObject.prototype, 'request')
+        .callsFake((reqOpts_, callback) => {
+          assert.deepStrictEqual(
+            serviceObject.methods.delete,
+            cachedMethodConfig
+          );
+          assert.deepStrictEqual(reqOpts_.uri, 'v2');
+          assert.deepStrictEqual(reqOpts_.method, 'PATCH');
+          done();
+          callback(null, null, null!);
+        });
+
+      const serviceObject = new ServiceObject(CONFIG) as FakeServiceObject;
+      serviceObject.methods.delete = methodConfig;
+      serviceObject.delete();
+    });
+
     it('should extend the defaults with request options', done => {
       const methodConfig = {
         reqOpts: {
@@ -561,6 +589,32 @@ describe('ServiceObject', () => {
       serviceObject.getMetadata(options, assert.ifError);
     });
 
+    it('should override uri field in request with methodConfig', done => {
+      const methodConfig = {
+        reqOpts: {
+          uri: 'v2',
+        },
+      };
+
+      const cachedMethodConfig = extend(true, {}, methodConfig);
+
+      sandbox
+        .stub(ServiceObject.prototype, 'request')
+        .callsFake((reqOpts_, callback) => {
+          assert.deepStrictEqual(
+            serviceObject.methods.getMetadata,
+            cachedMethodConfig
+          );
+          assert.deepStrictEqual(reqOpts_.uri, 'v2');
+          done();
+          callback(null, null, null!);
+        });
+
+      const serviceObject = new ServiceObject(CONFIG) as FakeServiceObject;
+      serviceObject.methods.getMetadata = methodConfig;
+      serviceObject.getMetadata();
+    });
+
     it('should extend the defaults with request options', done => {
       const methodConfig = {
         reqOpts: {
@@ -662,6 +716,33 @@ describe('ServiceObject', () => {
       serviceObject.setMetadata(metadata, options, () => {});
     });
 
+    it('should override uri and method with methodConfig', done => {
+      const methodConfig = {
+        reqOpts: {
+          uri: 'v2',
+          method: 'PUT',
+        },
+      };
+      const cachedMethodConfig = extend(true, {}, methodConfig);
+
+      sandbox
+        .stub(ServiceObject.prototype, 'request')
+        .callsFake((reqOpts_, callback) => {
+          assert.deepStrictEqual(
+            serviceObject.methods.setMetadata,
+            cachedMethodConfig
+          );
+          assert.deepStrictEqual(reqOpts_.uri, 'v2');
+          assert.deepStrictEqual(reqOpts_.method, 'PUT');
+          done();
+          callback(null, null, null!);
+        });
+
+      const serviceObject = new ServiceObject(CONFIG) as FakeServiceObject;
+      serviceObject.methods.setMetadata = methodConfig;
+      serviceObject.setMetadata({});
+    });
+
     it('should extend the defaults with request options', done => {
       const methodConfig = {
         reqOpts: {