fix: better support for fallback mode (#97)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 468790263

Source-Link: googleapis/googleapis@873ab45

Source-Link: googleapis/googleapis-gen@cb6f37a
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2I2ZjM3YWVmZjJhMzQ3MmU0MGE3YmJhY2U4YzY3ZDc1ZTI0YmVlNSJ9

packages/google-cloud-privatecatalog/samples/generated/v1beta1/private_catalog.search_catalogs.js

@@ -23,6 +23,9 @@
 function main(resource) {
   // [START cloudprivatecatalog_v1beta1_generated_PrivateCatalog_SearchCatalogs_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.
    */
   /**

packages/google-cloud-privatecatalog/samples/generated/v1beta1/private_catalog.search_products.js

@@ -23,6 +23,9 @@
 function main(resource) {
   // [START cloudprivatecatalog_v1beta1_generated_PrivateCatalog_SearchProducts_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.
    */
   /**

packages/google-cloud-privatecatalog/samples/generated/v1beta1/private_catalog.search_versions.js

@@ -23,6 +23,9 @@
 function main(resource, query) {
   // [START cloudprivatecatalog_v1beta1_generated_PrivateCatalog_SearchVersions_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.
    */
   /**

packages/google-cloud-privatecatalog/samples/generated/v1beta1/snippet_metadata.google.cloud.privatecatalog.v1beta1.json

@@ -22,7 +22,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 69,
+                    "end": 72,
                     "type": "FULL"
                 }
             ],
@@ -74,7 +74,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 71,
+                    "end": 74,
                     "type": "FULL"
                 }
             ],
@@ -126,7 +126,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 72,
+                    "end": 75,
                     "type": "FULL"
                 }
             ],

packages/google-cloud-privatecatalog/src/v1beta1/private_catalog_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');
 /**
@@ -289,7 +288,8 @@ export class PrivateCatalogClient {
       const apiCall = this._gaxModule.createApiCall(
         callPromise,
         this._defaults[methodName],
-        descriptor
+        descriptor,
+        this._opts.fallback
       );
 
       this.innerApiCalls[methodName] = apiCall;
@@ -508,7 +508,7 @@ export class PrivateCatalogClient {
     const callSettings = defaultCallSettings.merge(options);
     this.initialize();
     return this.descriptors.page.searchCatalogs.createStream(
-      this.innerApiCalls.searchCatalogs as gax.GaxCall,
+      this.innerApiCalls.searchCatalogs as GaxCall,
       request,
       callSettings
     );
@@ -565,7 +565,7 @@ export class PrivateCatalogClient {
     this.initialize();
     return this.descriptors.page.searchCatalogs.asyncIterate(
       this.innerApiCalls['searchCatalogs'] as GaxCall,
-      request as unknown as RequestType,
+      request as {},
       callSettings
     ) as AsyncIterable<protos.google.cloud.privatecatalog.v1beta1.ICatalog>;
   }
@@ -727,7 +727,7 @@ export class PrivateCatalogClient {
     const callSettings = defaultCallSettings.merge(options);
     this.initialize();
     return this.descriptors.page.searchProducts.createStream(
-      this.innerApiCalls.searchProducts as gax.GaxCall,
+      this.innerApiCalls.searchProducts as GaxCall,
       request,
       callSettings
     );
@@ -785,7 +785,7 @@ export class PrivateCatalogClient {
     this.initialize();
     return this.descriptors.page.searchProducts.asyncIterate(
       this.innerApiCalls['searchProducts'] as GaxCall,
-      request as unknown as RequestType,
+      request as {},
       callSettings
     ) as AsyncIterable<protos.google.cloud.privatecatalog.v1beta1.IProduct>;
   }
@@ -947,7 +947,7 @@ export class PrivateCatalogClient {
     const callSettings = defaultCallSettings.merge(options);
     this.initialize();
     return this.descriptors.page.searchVersions.createStream(
-      this.innerApiCalls.searchVersions as gax.GaxCall,
+      this.innerApiCalls.searchVersions as GaxCall,
       request,
       callSettings
     );
@@ -1005,7 +1005,7 @@ export class PrivateCatalogClient {
     this.initialize();
     return this.descriptors.page.searchVersions.asyncIterate(
       this.innerApiCalls['searchVersions'] as GaxCall,
-      request as unknown as RequestType,
+      request as {},
       callSettings
     ) as AsyncIterable<protos.google.cloud.privatecatalog.v1beta1.IVersion>;
   }

packages/google-cloud-privatecatalog/test/gapic_private_catalog_v1beta1.ts

@@ -113,101 +113,103 @@ function stubAsyncIterationCall<ResponseType>(
 }
 
 describe('v1beta1.PrivateCatalogClient', () => {
-  it('has servicePath', () => {
-    const servicePath =
-      privatecatalogModule.v1beta1.PrivateCatalogClient.servicePath;
-    assert(servicePath);
-  });
-
-  it('has apiEndpoint', () => {
-    const apiEndpoint =
-      privatecatalogModule.v1beta1.PrivateCatalogClient.apiEndpoint;
-    assert(apiEndpoint);
-  });
-
-  it('has port', () => {
-    const port = privatecatalogModule.v1beta1.PrivateCatalogClient.port;
-    assert(port);
-    assert(typeof port === 'number');
-  });
-
-  it('should create a client with no option', () => {
-    const client = new privatecatalogModule.v1beta1.PrivateCatalogClient();
-    assert(client);
-  });
+  describe('Common methods', () => {
+    it('has servicePath', () => {
+      const servicePath =
+        privatecatalogModule.v1beta1.PrivateCatalogClient.servicePath;
+      assert(servicePath);
+    });
 
-  it('should create a client with gRPC fallback', () => {
-    const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
-      fallback: true,
+    it('has apiEndpoint', () => {
+      const apiEndpoint =
+        privatecatalogModule.v1beta1.PrivateCatalogClient.apiEndpoint;
+      assert(apiEndpoint);
     });
-    assert(client);
-  });
 
-  it('has initialize method and supports deferred initialization', async () => {
-    const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has port', () => {
+      const port = privatecatalogModule.v1beta1.PrivateCatalogClient.port;
+      assert(port);
+      assert(typeof port === 'number');
     });
-    assert.strictEqual(client.privateCatalogStub, undefined);
-    await client.initialize();
-    assert(client.privateCatalogStub);
-  });
 
-  it('has close method for the initialized client', done => {
-    const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('should create a client with no option', () => {
+      const client = new privatecatalogModule.v1beta1.PrivateCatalogClient();
+      assert(client);
     });
-    client.initialize();
-    assert(client.privateCatalogStub);
-    client.close().then(() => {
-      done();
+
+    it('should create a client with gRPC fallback', () => {
+      const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
+        fallback: true,
+      });
+      assert(client);
     });
-  });
 
-  it('has close method for the non-initialized client', done => {
-    const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has initialize method and supports deferred initialization', async () => {
+      const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.privateCatalogStub, undefined);
+      await client.initialize();
+      assert(client.privateCatalogStub);
     });
-    assert.strictEqual(client.privateCatalogStub, undefined);
-    client.close().then(() => {
-      done();
+
+    it('has close method for the initialized client', done => {
+      const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      client.initialize();
+      assert(client.privateCatalogStub);
+      client.close().then(() => {
+        done();
+      });
     });
-  });
 
-  it('has getProjectId method', async () => {
-    const fakeProjectId = 'fake-project-id';
-    const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has close method for the non-initialized client', done => {
+      const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.privateCatalogStub, 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 privatecatalogModule.v1beta1.PrivateCatalogClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has getProjectId method', async () => {
+      const fakeProjectId = 'fake-project-id';
+      const client = new privatecatalogModule.v1beta1.PrivateCatalogClient({
+        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 privatecatalogModule.v1beta1.PrivateCatalogClient({
+        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('searchCatalogs', () => {