fix: better support for fallback mode (#289)

gcf-owl-bot[bot] · web-flow · commit f168eb38b5fb · 2022-08-23T00:08:11.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-monitoring-dashboard/samples/generated/v1/dashboards_service.create_dashboard.js b/packages/google-monitoring-dashboard/samples/generated/v1/dashboards_service.create_dashboard.js
@@ -23,6 +23,9 @@
 function main(parent, dashboard) {
   // [START monitoring_v1_generated_DashboardsService_CreateDashboard_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-monitoring-dashboard/samples/generated/v1/dashboards_service.delete_dashboard.js b/packages/google-monitoring-dashboard/samples/generated/v1/dashboards_service.delete_dashboard.js
@@ -23,6 +23,9 @@
 function main(name) {
   // [START monitoring_v1_generated_DashboardsService_DeleteDashboard_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-monitoring-dashboard/samples/generated/v1/dashboards_service.get_dashboard.js b/packages/google-monitoring-dashboard/samples/generated/v1/dashboards_service.get_dashboard.js
@@ -23,6 +23,9 @@
 function main(name) {
   // [START monitoring_v1_generated_DashboardsService_GetDashboard_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-monitoring-dashboard/samples/generated/v1/dashboards_service.list_dashboards.js b/packages/google-monitoring-dashboard/samples/generated/v1/dashboards_service.list_dashboards.js
@@ -23,6 +23,9 @@
 function main(parent) {
   // [START monitoring_v1_generated_DashboardsService_ListDashboards_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-monitoring-dashboard/samples/generated/v1/dashboards_service.update_dashboard.js b/packages/google-monitoring-dashboard/samples/generated/v1/dashboards_service.update_dashboard.js
@@ -23,6 +23,9 @@
 function main(dashboard) {
   // [START monitoring_v1_generated_DashboardsService_UpdateDashboard_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-monitoring-dashboard/samples/generated/v1/snippet_metadata.google.monitoring.dashboard.v1.json b/packages/google-monitoring-dashboard/samples/generated/v1/snippet_metadata.google.monitoring.dashboard.v1.json
@@ -22,7 +22,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 62,
+                    "end": 65,
                     "type": "FULL"
                 }
             ],
@@ -70,7 +70,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 64,
+                    "end": 67,
                     "type": "FULL"
                 }
             ],
@@ -118,7 +118,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 53,
+                    "end": 56,
                     "type": "FULL"
                 }
             ],
@@ -158,7 +158,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 51,
+                    "end": 54,
                     "type": "FULL"
                 }
             ],
@@ -198,7 +198,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 55,
+                    "end": 58,
                     "type": "FULL"
                 }
             ],
diff --git a/packages/google-monitoring-dashboard/src/v1/dashboards_service_client.ts b/packages/google-monitoring-dashboard/src/v1/dashboards_service_client.ts
@@ -28,7 +28,6 @@ import {
 } from 'google-gax';
 
 import {Transform} from 'stream';
-import {RequestType} from 'google-gax/build/src/apitypes';
 import * as protos from '../../protos/protos';
 import jsonProtos = require('../../protos/protos.json');
 /**
@@ -262,7 +261,8 @@ export class DashboardsServiceClient {
       const apiCall = this._gaxModule.createApiCall(
         callPromise,
         this._defaults[methodName],
-        descriptor
+        descriptor,
+        this._opts.fallback
       );
 
       this.innerApiCalls[methodName] = apiCall;
@@ -876,7 +876,7 @@ export class DashboardsServiceClient {
     const callSettings = defaultCallSettings.merge(options);
     this.initialize();
     return this.descriptors.page.listDashboards.createStream(
-      this.innerApiCalls.listDashboards as gax.GaxCall,
+      this.innerApiCalls.listDashboards as GaxCall,
       request,
       callSettings
     );
@@ -929,7 +929,7 @@ export class DashboardsServiceClient {
     this.initialize();
     return this.descriptors.page.listDashboards.asyncIterate(
       this.innerApiCalls['listDashboards'] as GaxCall,
-      request as unknown as RequestType,
+      request as {},
       callSettings
     ) as AsyncIterable<protos.google.monitoring.dashboard.v1.IDashboard>;
   }
diff --git a/packages/google-monitoring-dashboard/test/gapic_dashboards_service_v1.ts b/packages/google-monitoring-dashboard/test/gapic_dashboards_service_v1.ts
@@ -113,101 +113,103 @@ function stubAsyncIterationCall<ResponseType>(
 }
 
 describe('v1.DashboardsServiceClient', () => {
-  it('has servicePath', () => {
-    const servicePath =
-      dashboardsserviceModule.v1.DashboardsServiceClient.servicePath;
-    assert(servicePath);
-  });
-
-  it('has apiEndpoint', () => {
-    const apiEndpoint =
-      dashboardsserviceModule.v1.DashboardsServiceClient.apiEndpoint;
-    assert(apiEndpoint);
-  });
-
-  it('has port', () => {
-    const port = dashboardsserviceModule.v1.DashboardsServiceClient.port;
-    assert(port);
-    assert(typeof port === 'number');
-  });
-
-  it('should create a client with no option', () => {
-    const client = new dashboardsserviceModule.v1.DashboardsServiceClient();
-    assert(client);
-  });
+  describe('Common methods', () => {
+    it('has servicePath', () => {
+      const servicePath =
+        dashboardsserviceModule.v1.DashboardsServiceClient.servicePath;
+      assert(servicePath);
+    });
 
-  it('should create a client with gRPC fallback', () => {
-    const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
-      fallback: true,
+    it('has apiEndpoint', () => {
+      const apiEndpoint =
+        dashboardsserviceModule.v1.DashboardsServiceClient.apiEndpoint;
+      assert(apiEndpoint);
     });
-    assert(client);
-  });
 
-  it('has initialize method and supports deferred initialization', async () => {
-    const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has port', () => {
+      const port = dashboardsserviceModule.v1.DashboardsServiceClient.port;
+      assert(port);
+      assert(typeof port === 'number');
     });
-    assert.strictEqual(client.dashboardsServiceStub, undefined);
-    await client.initialize();
-    assert(client.dashboardsServiceStub);
-  });
 
-  it('has close method for the initialized client', done => {
-    const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('should create a client with no option', () => {
+      const client = new dashboardsserviceModule.v1.DashboardsServiceClient();
+      assert(client);
     });
-    client.initialize();
-    assert(client.dashboardsServiceStub);
-    client.close().then(() => {
-      done();
+
+    it('should create a client with gRPC fallback', () => {
+      const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
+        fallback: true,
+      });
+      assert(client);
     });
-  });
 
-  it('has close method for the non-initialized client', done => {
-    const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has initialize method and supports deferred initialization', async () => {
+      const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.dashboardsServiceStub, undefined);
+      await client.initialize();
+      assert(client.dashboardsServiceStub);
     });
-    assert.strictEqual(client.dashboardsServiceStub, undefined);
-    client.close().then(() => {
-      done();
+
+    it('has close method for the initialized client', done => {
+      const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      client.initialize();
+      assert(client.dashboardsServiceStub);
+      client.close().then(() => {
+        done();
+      });
     });
-  });
 
-  it('has getProjectId method', async () => {
-    const fakeProjectId = 'fake-project-id';
-    const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has close method for the non-initialized client', done => {
+      const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.dashboardsServiceStub, 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 dashboardsserviceModule.v1.DashboardsServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has getProjectId method', async () => {
+      const fakeProjectId = 'fake-project-id';
+      const client = new dashboardsserviceModule.v1.DashboardsServiceClient({
+        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 dashboardsserviceModule.v1.DashboardsServiceClient({
+        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('createDashboard', () => {

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": 62,`
	`25`	`+ "end": 65,`
`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": 53,`
	`121`	`+ "end": 56,`
`122`	`122`	`"type": "FULL"`
`123`	`123`	`}`
`124`	`124`	`],`
`@@ -158,7 +158,7 @@`
`158`	`158`	`"segments": [`
`159`	`159`	`{`
`160`	`160`	`"start": 25,`
`161`		`- "end": 51,`
	`161`	`+ "end": 54,`
`162`	`162`	`"type": "FULL"`
`163`	`163`	`}`
`164`	`164`	`],`
`@@ -198,7 +198,7 @@`
`198`	`198`	`"segments": [`
`199`	`199`	`{`
`200`	`200`	`"start": 25,`
`201`		`- "end": 55,`
	`201`	`+ "end": 58,`
`202`	`202`	`"type": "FULL"`
`203`	`203`	`}`
`204`	`204`	`],`