fix: better support for fallback mode (#150)

gcf-owl-bot[bot] · web-flow · commit 45b0e18f53a0 · 2022-08-23T00:12:15.000Z
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 468790263 Source-Link: googleapis/googleapis@873ab45 Source-Link: googleapis/googleapis-gen@cb6f37a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2I2ZjM3YWVmZjJhMzQ3MmU0MGE3YmJhY2U4YzY3ZDc1ZTI0YmVlNSJ9
diff --git a/packages/google-api-servicecontrol/samples/generated/v1/quota_controller.allocate_quota.js b/packages/google-api-servicecontrol/samples/generated/v1/quota_controller.allocate_quota.js
@@ -23,6 +23,9 @@
 function main() {
   // [START servicecontrol_v1_generated_QuotaController_AllocateQuota_async]
   /**
+   * This snippet has been automatically generated and should be regarded as a code template only.
+   * It will require modifications to work.
+   * It may require correct/in-range values for request initialization.
    * TODO(developer): Uncomment these variables before running the sample.
    */
   /**
diff --git a/packages/google-api-servicecontrol/samples/generated/v1/service_controller.check.js b/packages/google-api-servicecontrol/samples/generated/v1/service_controller.check.js
@@ -23,6 +23,9 @@
 function main() {
   // [START servicecontrol_v1_generated_ServiceController_Check_async]
   /**
+   * This snippet has been automatically generated and should be regarded as a code template only.
+   * It will require modifications to work.
+   * It may require correct/in-range values for request initialization.
    * TODO(developer): Uncomment these variables before running the sample.
    */
   /**
diff --git a/packages/google-api-servicecontrol/samples/generated/v1/service_controller.report.js b/packages/google-api-servicecontrol/samples/generated/v1/service_controller.report.js
@@ -23,6 +23,9 @@
 function main() {
   // [START servicecontrol_v1_generated_ServiceController_Report_async]
   /**
+   * This snippet has been automatically generated and should be regarded as a code template only.
+   * It will require modifications to work.
+   * It may require correct/in-range values for request initialization.
    * TODO(developer): Uncomment these variables before running the sample.
    */
   /**
diff --git a/packages/google-api-servicecontrol/samples/generated/v1/snippet_metadata.google.api.servicecontrol.v1.json b/packages/google-api-servicecontrol/samples/generated/v1/snippet_metadata.google.api.servicecontrol.v1.json
@@ -22,7 +22,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 61,
+                    "end": 64,
                     "type": "FULL"
                 }
             ],
@@ -70,7 +70,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 64,
+                    "end": 67,
                     "type": "FULL"
                 }
             ],
@@ -118,7 +118,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 72,
+                    "end": 75,
                     "type": "FULL"
                 }
             ],
diff --git a/packages/google-api-servicecontrol/samples/generated/v2/service_controller.check.js b/packages/google-api-servicecontrol/samples/generated/v2/service_controller.check.js
@@ -23,6 +23,9 @@
 function main() {
   // [START servicecontrol_v2_generated_ServiceController_Check_async]
   /**
+   * This snippet has been automatically generated and should be regarded as a code template only.
+   * It will require modifications to work.
+   * It may require correct/in-range values for request initialization.
    * TODO(developer): Uncomment these variables before running the sample.
    */
   /**
diff --git a/packages/google-api-servicecontrol/samples/generated/v2/service_controller.report.js b/packages/google-api-servicecontrol/samples/generated/v2/service_controller.report.js
@@ -23,6 +23,9 @@
 function main() {
   // [START servicecontrol_v2_generated_ServiceController_Report_async]
   /**
+   * This snippet has been automatically generated and should be regarded as a code template only.
+   * It will require modifications to work.
+   * It may require correct/in-range values for request initialization.
    * TODO(developer): Uncomment these variables before running the sample.
    */
   /**
diff --git a/packages/google-api-servicecontrol/samples/generated/v2/snippet_metadata.google.api.servicecontrol.v2.json b/packages/google-api-servicecontrol/samples/generated/v2/snippet_metadata.google.api.servicecontrol.v2.json
@@ -22,7 +22,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 71,
+                    "end": 74,
                     "type": "FULL"
                 }
             ],
@@ -78,7 +78,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 65,
+                    "end": 68,
                     "type": "FULL"
                 }
             ],
diff --git a/packages/google-api-servicecontrol/src/v1/quota_controller_client.ts b/packages/google-api-servicecontrol/src/v1/quota_controller_client.ts
@@ -221,7 +221,8 @@ export class QuotaControllerClient {
       const apiCall = this._gaxModule.createApiCall(
         callPromise,
         this._defaults[methodName],
-        descriptor
+        descriptor,
+        this._opts.fallback
       );
 
       this.innerApiCalls[methodName] = apiCall;
diff --git a/packages/google-api-servicecontrol/src/v1/service_controller_client.ts b/packages/google-api-servicecontrol/src/v1/service_controller_client.ts
@@ -221,7 +221,8 @@ export class ServiceControllerClient {
       const apiCall = this._gaxModule.createApiCall(
         callPromise,
         this._defaults[methodName],
-        descriptor
+        descriptor,
+        this._opts.fallback
       );
 
       this.innerApiCalls[methodName] = apiCall;
diff --git a/packages/google-api-servicecontrol/src/v2/service_controller_client.ts b/packages/google-api-servicecontrol/src/v2/service_controller_client.ts
@@ -225,7 +225,8 @@ export class ServiceControllerClient {
       const apiCall = this._gaxModule.createApiCall(
         callPromise,
         this._defaults[methodName],
-        descriptor
+        descriptor,
+        this._opts.fallback
       );
 
       this.innerApiCalls[methodName] = apiCall;
diff --git a/packages/google-api-servicecontrol/test/gapic_quota_controller_v1.ts b/packages/google-api-servicecontrol/test/gapic_quota_controller_v1.ts
@@ -50,101 +50,103 @@ function stubSimpleCallWithCallback<ResponseType>(
 }
 
 describe('v1.QuotaControllerClient', () => {
-  it('has servicePath', () => {
-    const servicePath =
-      quotacontrollerModule.v1.QuotaControllerClient.servicePath;
-    assert(servicePath);
-  });
-
-  it('has apiEndpoint', () => {
-    const apiEndpoint =
-      quotacontrollerModule.v1.QuotaControllerClient.apiEndpoint;
-    assert(apiEndpoint);
-  });
-
-  it('has port', () => {
-    const port = quotacontrollerModule.v1.QuotaControllerClient.port;
-    assert(port);
-    assert(typeof port === 'number');
-  });
-
-  it('should create a client with no option', () => {
-    const client = new quotacontrollerModule.v1.QuotaControllerClient();
-    assert(client);
-  });
+  describe('Common methods', () => {
+    it('has servicePath', () => {
+      const servicePath =
+        quotacontrollerModule.v1.QuotaControllerClient.servicePath;
+      assert(servicePath);
+    });
 
-  it('should create a client with gRPC fallback', () => {
-    const client = new quotacontrollerModule.v1.QuotaControllerClient({
-      fallback: true,
+    it('has apiEndpoint', () => {
+      const apiEndpoint =
+        quotacontrollerModule.v1.QuotaControllerClient.apiEndpoint;
+      assert(apiEndpoint);
     });
-    assert(client);
-  });
 
-  it('has initialize method and supports deferred initialization', async () => {
-    const client = new quotacontrollerModule.v1.QuotaControllerClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has port', () => {
+      const port = quotacontrollerModule.v1.QuotaControllerClient.port;
+      assert(port);
+      assert(typeof port === 'number');
     });
-    assert.strictEqual(client.quotaControllerStub, undefined);
-    await client.initialize();
-    assert(client.quotaControllerStub);
-  });
 
-  it('has close method for the initialized client', done => {
-    const client = new quotacontrollerModule.v1.QuotaControllerClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('should create a client with no option', () => {
+      const client = new quotacontrollerModule.v1.QuotaControllerClient();
+      assert(client);
     });
-    client.initialize();
-    assert(client.quotaControllerStub);
-    client.close().then(() => {
-      done();
+
+    it('should create a client with gRPC fallback', () => {
+      const client = new quotacontrollerModule.v1.QuotaControllerClient({
+        fallback: true,
+      });
+      assert(client);
     });
-  });
 
-  it('has close method for the non-initialized client', done => {
-    const client = new quotacontrollerModule.v1.QuotaControllerClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has initialize method and supports deferred initialization', async () => {
+      const client = new quotacontrollerModule.v1.QuotaControllerClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.quotaControllerStub, undefined);
+      await client.initialize();
+      assert(client.quotaControllerStub);
     });
-    assert.strictEqual(client.quotaControllerStub, undefined);
-    client.close().then(() => {
-      done();
+
+    it('has close method for the initialized client', done => {
+      const client = new quotacontrollerModule.v1.QuotaControllerClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      client.initialize();
+      assert(client.quotaControllerStub);
+      client.close().then(() => {
+        done();
+      });
     });
-  });
 
-  it('has getProjectId method', async () => {
-    const fakeProjectId = 'fake-project-id';
-    const client = new quotacontrollerModule.v1.QuotaControllerClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has close method for the non-initialized client', done => {
+      const client = new quotacontrollerModule.v1.QuotaControllerClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.quotaControllerStub, undefined);
+      client.close().then(() => {
+        done();
+      });
     });
-    client.auth.getProjectId = sinon.stub().resolves(fakeProjectId);
-    const result = await client.getProjectId();
-    assert.strictEqual(result, fakeProjectId);
-    assert((client.auth.getProjectId as SinonStub).calledWithExactly());
-  });
 
-  it('has getProjectId method with callback', async () => {
-    const fakeProjectId = 'fake-project-id';
-    const client = new quotacontrollerModule.v1.QuotaControllerClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has getProjectId method', async () => {
+      const fakeProjectId = 'fake-project-id';
+      const client = new quotacontrollerModule.v1.QuotaControllerClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      client.auth.getProjectId = sinon.stub().resolves(fakeProjectId);
+      const result = await client.getProjectId();
+      assert.strictEqual(result, fakeProjectId);
+      assert((client.auth.getProjectId as SinonStub).calledWithExactly());
     });
-    client.auth.getProjectId = sinon
-      .stub()
-      .callsArgWith(0, null, fakeProjectId);
-    const promise = new Promise((resolve, reject) => {
-      client.getProjectId((err?: Error | null, projectId?: string | null) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(projectId);
-        }
+
+    it('has getProjectId method with callback', async () => {
+      const fakeProjectId = 'fake-project-id';
+      const client = new quotacontrollerModule.v1.QuotaControllerClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      client.auth.getProjectId = sinon
+        .stub()
+        .callsArgWith(0, null, fakeProjectId);
+      const promise = new Promise((resolve, reject) => {
+        client.getProjectId((err?: Error | null, projectId?: string | null) => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve(projectId);
+          }
+        });
       });
+      const result = await promise;
+      assert.strictEqual(result, fakeProjectId);
     });
-    const result = await promise;
-    assert.strictEqual(result, fakeProjectId);
   });
 
   describe('allocateQuota', () => {
diff --git a/packages/google-api-servicecontrol/test/gapic_service_controller_v1.ts b/packages/google-api-servicecontrol/test/gapic_service_controller_v1.ts
diff --git a/packages/google-api-servicecontrol/test/gapic_service_controller_v2.ts b/packages/google-api-servicecontrol/test/gapic_service_controller_v2.ts

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"segments": [`
`23`	`23`	`{`
`24`	`24`	`"start": 25,`
`25`		`- "end": 61,`
	`25`	`+ "end": 64,`
`26`	`26`	`"type": "FULL"`
`27`	`27`	`}`
`28`	`28`	`],`
`@@ -70,7 +70,7 @@`
`70`	`70`	`"segments": [`
`71`	`71`	`{`
`72`	`72`	`"start": 25,`
`73`		`- "end": 64,`
	`73`	`+ "end": 67,`
`74`	`74`	`"type": "FULL"`
`75`	`75`	`}`
`76`	`76`	`],`
`@@ -118,7 +118,7 @@`
`118`	`118`	`"segments": [`
`119`	`119`	`{`
`120`	`120`	`"start": 25,`
`121`		`- "end": 72,`
	`121`	`+ "end": 75,`
`122`	`122`	`"type": "FULL"`
`123`	`123`	`}`
`124`	`124`	`],`