fix: better support for fallback mode (#337)

- [ ] Regenerate this pull request now. PiperOrigin-RevId: 468790263 Source-Link: googleapis/googleapis@873ab45 Source-Link: googleapis/googleapis-gen@cb6f37a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2I2ZjM3YWVmZjJhMzQ3MmU0MGE3YmJhY2U4YzY3ZDc1ZTI0YmVlNSJ9
googleapis · Aug 23, 2022 · 00d5d20 · 00d5d20
1 parent 00ef0a8
commit 00d5d20
Show file tree

Hide file tree

Showing 13 changed files with 205 additions and 178 deletions.
diff --git a/...s/google-cloud-webrisk/samples/generated/v1/snippet_metadata.google.cloud.webrisk.v1.json b/...s/google-cloud-webrisk/samples/generated/v1/snippet_metadata.google.cloud.webrisk.v1.json
@@ -22,7 +22,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 63,
+                    "end": 66,
                     "type": "FULL"
                 }
             ],
@@ -70,7 +70,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 55,
+                    "end": 58,
                     "type": "FULL"
                 }
             ],
@@ -114,7 +114,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 55,
+                    "end": 58,
                     "type": "FULL"
                 }
             ],
@@ -158,7 +158,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 56,
+                    "end": 59,
                     "type": "FULL"
                 }
             ],

diff --git a/...es/google-cloud-webrisk/samples/generated/v1/web_risk_service.compute_threat_list_diff.js b/...es/google-cloud-webrisk/samples/generated/v1/web_risk_service.compute_threat_list_diff.js
@@ -23,6 +23,9 @@
 function main(threatType, constraints) {
   // [START webrisk_v1_generated_WebRiskService_ComputeThreatListDiff_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-cloud-webrisk/samples/generated/v1/web_risk_service.create_submission.js b/packages/google-cloud-webrisk/samples/generated/v1/web_risk_service.create_submission.js
@@ -23,6 +23,9 @@
 function main(parent, submission) {
   // [START webrisk_v1_generated_WebRiskService_CreateSubmission_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-cloud-webrisk/samples/generated/v1/web_risk_service.search_hashes.js b/packages/google-cloud-webrisk/samples/generated/v1/web_risk_service.search_hashes.js
@@ -23,6 +23,9 @@
 function main(threatTypes) {
   // [START webrisk_v1_generated_WebRiskService_SearchHashes_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-cloud-webrisk/samples/generated/v1/web_risk_service.search_uris.js b/packages/google-cloud-webrisk/samples/generated/v1/web_risk_service.search_uris.js
@@ -23,6 +23,9 @@
 function main(uri, threatTypes) {
   // [START webrisk_v1_generated_WebRiskService_SearchUris_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/...loud-webrisk/samples/generated/v1beta1/snippet_metadata.google.cloud.webrisk.v1beta1.json b/...loud-webrisk/samples/generated/v1beta1/snippet_metadata.google.cloud.webrisk.v1beta1.json
@@ -22,7 +22,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 60,
+                    "end": 63,
                     "type": "FULL"
                 }
             ],
@@ -70,7 +70,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 55,
+                    "end": 58,
                     "type": "FULL"
                 }
             ],
@@ -114,7 +114,7 @@
             "segments": [
                 {
                     "start": 25,
-                    "end": 55,
+                    "end": 58,
                     "type": "FULL"
                 }
             ],

diff --git a/...d-webrisk/samples/generated/v1beta1/web_risk_service_v1_beta1.compute_threat_list_diff.js b/...d-webrisk/samples/generated/v1beta1/web_risk_service_v1_beta1.compute_threat_list_diff.js
@@ -23,6 +23,9 @@
 function main(threatType, constraints) {
   // [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_ComputeThreatListDiff_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/...google-cloud-webrisk/samples/generated/v1beta1/web_risk_service_v1_beta1.search_hashes.js b/...google-cloud-webrisk/samples/generated/v1beta1/web_risk_service_v1_beta1.search_hashes.js
@@ -23,6 +23,9 @@
 function main(threatTypes) {
   // [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchHashes_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/...s/google-cloud-webrisk/samples/generated/v1beta1/web_risk_service_v1_beta1.search_uris.js b/...s/google-cloud-webrisk/samples/generated/v1beta1/web_risk_service_v1_beta1.search_uris.js
@@ -23,6 +23,9 @@
 function main(uri, threatTypes) {
   // [START webrisk_v1beta1_generated_WebRiskServiceV1Beta1_SearchUris_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-cloud-webrisk/src/v1/web_risk_service_client.ts b/packages/google-cloud-webrisk/src/v1/web_risk_service_client.ts
@@ -234,7 +234,8 @@ export class WebRiskServiceClient {
       const apiCall = this._gaxModule.createApiCall(
         callPromise,
         this._defaults[methodName],
-        descriptor
+        descriptor,
+        this._opts.fallback
       );
 
       this.innerApiCalls[methodName] = apiCall;

diff --git a/packages/google-cloud-webrisk/src/v1beta1/web_risk_service_v1_beta1_client.ts b/packages/google-cloud-webrisk/src/v1beta1/web_risk_service_v1_beta1_client.ts
@@ -225,7 +225,8 @@ export class WebRiskServiceV1Beta1Client {
       const apiCall = this._gaxModule.createApiCall(
         callPromise,
         this._defaults[methodName],
-        descriptor
+        descriptor,
+        this._opts.fallback
       );
 
       this.innerApiCalls[methodName] = apiCall;

diff --git a/packages/google-cloud-webrisk/test/gapic_web_risk_service_v1.ts b/packages/google-cloud-webrisk/test/gapic_web_risk_service_v1.ts
@@ -50,101 +50,103 @@ function stubSimpleCallWithCallback<ResponseType>(
 }
 
 describe('v1.WebRiskServiceClient', () => {
-  it('has servicePath', () => {
-    const servicePath =
-      webriskserviceModule.v1.WebRiskServiceClient.servicePath;
-    assert(servicePath);
-  });
-
-  it('has apiEndpoint', () => {
-    const apiEndpoint =
-      webriskserviceModule.v1.WebRiskServiceClient.apiEndpoint;
-    assert(apiEndpoint);
-  });
-
-  it('has port', () => {
-    const port = webriskserviceModule.v1.WebRiskServiceClient.port;
-    assert(port);
-    assert(typeof port === 'number');
-  });
-
-  it('should create a client with no option', () => {
-    const client = new webriskserviceModule.v1.WebRiskServiceClient();
-    assert(client);
-  });
+  describe('Common methods', () => {
+    it('has servicePath', () => {
+      const servicePath =
+        webriskserviceModule.v1.WebRiskServiceClient.servicePath;
+      assert(servicePath);
+    });
 
-  it('should create a client with gRPC fallback', () => {
-    const client = new webriskserviceModule.v1.WebRiskServiceClient({
-      fallback: true,
+    it('has apiEndpoint', () => {
+      const apiEndpoint =
+        webriskserviceModule.v1.WebRiskServiceClient.apiEndpoint;
+      assert(apiEndpoint);
     });
-    assert(client);
-  });
 
-  it('has initialize method and supports deferred initialization', async () => {
-    const client = new webriskserviceModule.v1.WebRiskServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has port', () => {
+      const port = webriskserviceModule.v1.WebRiskServiceClient.port;
+      assert(port);
+      assert(typeof port === 'number');
     });
-    assert.strictEqual(client.webRiskServiceStub, undefined);
-    await client.initialize();
-    assert(client.webRiskServiceStub);
-  });
 
-  it('has close method for the initialized client', done => {
-    const client = new webriskserviceModule.v1.WebRiskServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('should create a client with no option', () => {
+      const client = new webriskserviceModule.v1.WebRiskServiceClient();
+      assert(client);
     });
-    client.initialize();
-    assert(client.webRiskServiceStub);
-    client.close().then(() => {
-      done();
+
+    it('should create a client with gRPC fallback', () => {
+      const client = new webriskserviceModule.v1.WebRiskServiceClient({
+        fallback: true,
+      });
+      assert(client);
     });
-  });
 
-  it('has close method for the non-initialized client', done => {
-    const client = new webriskserviceModule.v1.WebRiskServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has initialize method and supports deferred initialization', async () => {
+      const client = new webriskserviceModule.v1.WebRiskServiceClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.webRiskServiceStub, undefined);
+      await client.initialize();
+      assert(client.webRiskServiceStub);
     });
-    assert.strictEqual(client.webRiskServiceStub, undefined);
-    client.close().then(() => {
-      done();
+
+    it('has close method for the initialized client', done => {
+      const client = new webriskserviceModule.v1.WebRiskServiceClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      client.initialize();
+      assert(client.webRiskServiceStub);
+      client.close().then(() => {
+        done();
+      });
     });
-  });
 
-  it('has getProjectId method', async () => {
-    const fakeProjectId = 'fake-project-id';
-    const client = new webriskserviceModule.v1.WebRiskServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has close method for the non-initialized client', done => {
+      const client = new webriskserviceModule.v1.WebRiskServiceClient({
+        credentials: {client_email: 'bogus', private_key: 'bogus'},
+        projectId: 'bogus',
+      });
+      assert.strictEqual(client.webRiskServiceStub, 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 webriskserviceModule.v1.WebRiskServiceClient({
-      credentials: {client_email: 'bogus', private_key: 'bogus'},
-      projectId: 'bogus',
+    it('has getProjectId method', async () => {
+      const fakeProjectId = 'fake-project-id';
+      const client = new webriskserviceModule.v1.WebRiskServiceClient({
+        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 webriskserviceModule.v1.WebRiskServiceClient({
+        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('computeThreatListDiff', () => {