From 2a4ed1a77ff542cd962ccd4a2fb6a55977cc59b1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 10 Sep 2019 11:00:54 -0700 Subject: [PATCH] Make `threat_types` a required argument to `search_hashes` (via synth). (#9198) --- .../gapic/web_risk_service_v1_beta1_client.py | 12 ++++++++---- packages/google-cloud-webrisk/synth.metadata | 9 ++++----- .../test_web_risk_service_v1_beta1_client_v1beta1.py | 12 +++++++++--- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/google-cloud-webrisk/google/cloud/webrisk_v1beta1/gapic/web_risk_service_v1_beta1_client.py b/packages/google-cloud-webrisk/google/cloud/webrisk_v1beta1/gapic/web_risk_service_v1_beta1_client.py index 93cefba2b5d1..dfe02613188a 100644 --- a/packages/google-cloud-webrisk/google/cloud/webrisk_v1beta1/gapic/web_risk_service_v1_beta1_client.py +++ b/packages/google-cloud-webrisk/google/cloud/webrisk_v1beta1/gapic/web_risk_service_v1_beta1_client.py @@ -323,8 +323,8 @@ def search_uris( def search_hashes( self, + threat_types, hash_prefix=None, - threat_types=None, retry=google.api_core.gapic_v1.method.DEFAULT, timeout=google.api_core.gapic_v1.method.DEFAULT, metadata=None, @@ -338,15 +338,19 @@ def search_hashes( Example: >>> from google.cloud import webrisk_v1beta1 + >>> from google.cloud.webrisk_v1beta1 import enums >>> >>> client = webrisk_v1beta1.WebRiskServiceV1Beta1Client() >>> - >>> response = client.search_hashes() + >>> # TODO: Initialize `threat_types`: + >>> threat_types = [] + >>> + >>> response = client.search_hashes(threat_types) Args: + threat_types (list[~google.cloud.webrisk_v1beta1.types.ThreatType]): Required. The ThreatLists to search in. hash_prefix (bytes): A hash prefix, consisting of the most significant 4-32 bytes of a SHA256 hash. For JSON requests, this field is base64-encoded. - threat_types (list[~google.cloud.webrisk_v1beta1.types.ThreatType]): Required. The ThreatLists to search in. retry (Optional[google.api_core.retry.Retry]): A retry object used to retry requests. If ``None`` is specified, requests will be retried using a default configuration. @@ -378,7 +382,7 @@ def search_hashes( ) request = webrisk_pb2.SearchHashesRequest( - hash_prefix=hash_prefix, threat_types=threat_types + threat_types=threat_types, hash_prefix=hash_prefix ) return self._inner_api_calls["search_hashes"]( request, retry=retry, timeout=timeout, metadata=metadata diff --git a/packages/google-cloud-webrisk/synth.metadata b/packages/google-cloud-webrisk/synth.metadata index c5119433795c..318c21b03427 100644 --- a/packages/google-cloud-webrisk/synth.metadata +++ b/packages/google-cloud-webrisk/synth.metadata @@ -1,19 +1,18 @@ { - "updateTime": "2019-08-06T12:51:28.182890Z", + "updateTime": "2019-09-10T12:41:37.939470Z", "sources": [ { "generator": { "name": "artman", - "version": "0.32.1", - "dockerImage": "googleapis/artman@sha256:a684d40ba9a4e15946f5f2ca6b4bd9fe301192f522e9de4fff622118775f309b" + "version": "0.36.2", + "dockerImage": "googleapis/artman@sha256:0e6f3a668cd68afc768ecbe08817cf6e56a0e64fcbdb1c58c3b97492d12418a1" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e699b0cba64ffddfae39633417180f1f65875896", - "internalRef": "261759677" + "sha": "26e189ad03ba63591fb26eecb6aaade7ad39f57a" } }, { diff --git a/packages/google-cloud-webrisk/tests/unit/gapic/v1beta1/test_web_risk_service_v1_beta1_client_v1beta1.py b/packages/google-cloud-webrisk/tests/unit/gapic/v1beta1/test_web_risk_service_v1_beta1_client_v1beta1.py index c44043698f86..e458f8821f0b 100644 --- a/packages/google-cloud-webrisk/tests/unit/gapic/v1beta1/test_web_risk_service_v1_beta1_client_v1beta1.py +++ b/packages/google-cloud-webrisk/tests/unit/gapic/v1beta1/test_web_risk_service_v1_beta1_client_v1beta1.py @@ -158,11 +158,14 @@ def test_search_hashes(self): create_channel.return_value = channel client = webrisk_v1beta1.WebRiskServiceV1Beta1Client() - response = client.search_hashes() + # Setup Request + threat_types = [] + + response = client.search_hashes(threat_types) assert expected_response == response assert len(channel.requests) == 1 - expected_request = webrisk_pb2.SearchHashesRequest() + expected_request = webrisk_pb2.SearchHashesRequest(threat_types=threat_types) actual_request = channel.requests[0][1] assert expected_request == actual_request @@ -174,5 +177,8 @@ def test_search_hashes_exception(self): create_channel.return_value = channel client = webrisk_v1beta1.WebRiskServiceV1Beta1Client() + # Setup request + threat_types = [] + with pytest.raises(CustomException): - client.search_hashes() + client.search_hashes(threat_types)