chore: use gapic-generator-python 0.58.4 (#255)

* chore: use gapic-generator-python 0.58.4 fix: provide appropriate mock values for message body fields committer: dovs PiperOrigin-RevId: 419025932 Source-Link: googleapis/googleapis@73da669 Source-Link: googleapis/googleapis-gen@46df624 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDZkZjYyNGE1NGI5ZWQ0N2MxYTdlZWZiN2E0OTQxM2NmN2I4MmY5OCJ9 * chore: use gapic-generator-python 0.58.4 fix: provide appropriate mock values for message body fields committer: dovs PiperOrigin-RevId: 419025932 Source-Link: googleapis/googleapis@73da669 Source-Link: googleapis/googleapis-gen@46df624 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDZkZjYyNGE1NGI5ZWQ0N2MxYTdlZWZiN2E0OTQxM2NmN2I4MmY5OCJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Jan 8, 2022 · f4c9801 · f4c9801
1 parent 4c1747b
commit f4c9801
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 91 deletions.
diff --git a/.../google/cloud/videointelligence_v1/services/video_intelligence_service/transports/base.py b/.../google/cloud/videointelligence_v1/services/video_intelligence_service/transports/base.py
@@ -103,7 +103,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

diff --git a/...le/cloud/videointelligence_v1beta2/services/video_intelligence_service/transports/base.py b/...le/cloud/videointelligence_v1beta2/services/video_intelligence_service/transports/base.py
@@ -103,7 +103,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

diff --git a/.../cloud/videointelligence_v1p1beta1/services/video_intelligence_service/transports/base.py b/.../cloud/videointelligence_v1p1beta1/services/video_intelligence_service/transports/base.py
@@ -103,7 +103,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

diff --git a/.../cloud/videointelligence_v1p2beta1/services/video_intelligence_service/transports/base.py b/.../cloud/videointelligence_v1p2beta1/services/video_intelligence_service/transports/base.py
@@ -103,7 +103,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

diff --git a/...eointelligence_v1p3beta1/services/streaming_video_intelligence_service/transports/base.py b/...eointelligence_v1p3beta1/services/streaming_video_intelligence_service/transports/base.py
@@ -101,7 +101,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

diff --git a/.../cloud/videointelligence_v1p3beta1/services/video_intelligence_service/transports/base.py b/.../cloud/videointelligence_v1p3beta1/services/video_intelligence_service/transports/base.py
@@ -103,7 +103,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id

diff --git a/...ideointelligence/tests/unit/gapic/videointelligence_v1/test_video_intelligence_service.py b/...ideointelligence/tests/unit/gapic/videointelligence_v1/test_video_intelligence_service.py
@@ -267,20 +267,20 @@ def test_video_intelligence_service_client_client_options(
     # unsupported value.
     with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}):
         with pytest.raises(MutualTLSChannelError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value.
     with mock.patch.dict(
         os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"}
     ):
         with pytest.raises(ValueError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case quota_project_id is provided
     options = client_options.ClientOptions(quota_project_id="octopus")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -349,7 +349,7 @@ def test_video_intelligence_service_client_mtls_env_auto(
         )
         with mock.patch.object(transport_class, "__init__") as patched:
             patched.return_value = None
-            client = client_class(transport=transport_name, client_options=options)
+            client = client_class(client_options=options, transport=transport_name)
 
             if use_client_cert_env == "false":
                 expected_client_cert_source = None
@@ -448,7 +448,7 @@ def test_video_intelligence_service_client_client_options_scopes(
     options = client_options.ClientOptions(scopes=["1", "2"],)
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -483,7 +483,7 @@ def test_video_intelligence_service_client_client_options_credentials_file(
     options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file="credentials.json",
@@ -516,9 +516,10 @@ def test_video_intelligence_service_client_client_options_from_dict():
         )
 
 
-def test_annotate_video(
-    transport: str = "grpc", request_type=video_intelligence.AnnotateVideoRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [video_intelligence.AnnotateVideoRequest, dict,]
+)
+def test_annotate_video(request_type, transport: str = "grpc"):
     client = VideoIntelligenceServiceClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -542,10 +543,6 @@ def test_annotate_video(
     assert isinstance(response, future.Future)
 
 
-def test_annotate_video_from_dict():
-    test_annotate_video(request_type=dict)
-
-
 def test_annotate_video_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1215,7 +1212,7 @@ def test_parse_common_location_path():
     assert expected == actual
 
 
-def test_client_withDEFAULT_CLIENT_INFO():
+def test_client_with_default_client_info():
     client_info = gapic_v1.client_info.ClientInfo()
 
     with mock.patch.object(

diff --git a/...ntelligence/tests/unit/gapic/videointelligence_v1beta2/test_video_intelligence_service.py b/...ntelligence/tests/unit/gapic/videointelligence_v1beta2/test_video_intelligence_service.py
@@ -267,20 +267,20 @@ def test_video_intelligence_service_client_client_options(
     # unsupported value.
     with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}):
         with pytest.raises(MutualTLSChannelError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value.
     with mock.patch.dict(
         os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"}
     ):
         with pytest.raises(ValueError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case quota_project_id is provided
     options = client_options.ClientOptions(quota_project_id="octopus")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -349,7 +349,7 @@ def test_video_intelligence_service_client_mtls_env_auto(
         )
         with mock.patch.object(transport_class, "__init__") as patched:
             patched.return_value = None
-            client = client_class(transport=transport_name, client_options=options)
+            client = client_class(client_options=options, transport=transport_name)
 
             if use_client_cert_env == "false":
                 expected_client_cert_source = None
@@ -448,7 +448,7 @@ def test_video_intelligence_service_client_client_options_scopes(
     options = client_options.ClientOptions(scopes=["1", "2"],)
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -483,7 +483,7 @@ def test_video_intelligence_service_client_client_options_credentials_file(
     options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file="credentials.json",
@@ -516,9 +516,10 @@ def test_video_intelligence_service_client_client_options_from_dict():
         )
 
 
-def test_annotate_video(
-    transport: str = "grpc", request_type=video_intelligence.AnnotateVideoRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [video_intelligence.AnnotateVideoRequest, dict,]
+)
+def test_annotate_video(request_type, transport: str = "grpc"):
     client = VideoIntelligenceServiceClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -542,10 +543,6 @@ def test_annotate_video(
     assert isinstance(response, future.Future)
 
 
-def test_annotate_video_from_dict():
-    test_annotate_video(request_type=dict)
-
-
 def test_annotate_video_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1215,7 +1212,7 @@ def test_parse_common_location_path():
     assert expected == actual
 
 
-def test_client_withDEFAULT_CLIENT_INFO():
+def test_client_with_default_client_info():
     client_info = gapic_v1.client_info.ClientInfo()
 
     with mock.patch.object(

diff --git a/...elligence/tests/unit/gapic/videointelligence_v1p1beta1/test_video_intelligence_service.py b/...elligence/tests/unit/gapic/videointelligence_v1p1beta1/test_video_intelligence_service.py
@@ -267,20 +267,20 @@ def test_video_intelligence_service_client_client_options(
     # unsupported value.
     with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}):
         with pytest.raises(MutualTLSChannelError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value.
     with mock.patch.dict(
         os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"}
     ):
         with pytest.raises(ValueError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case quota_project_id is provided
     options = client_options.ClientOptions(quota_project_id="octopus")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -349,7 +349,7 @@ def test_video_intelligence_service_client_mtls_env_auto(
         )
         with mock.patch.object(transport_class, "__init__") as patched:
             patched.return_value = None
-            client = client_class(transport=transport_name, client_options=options)
+            client = client_class(client_options=options, transport=transport_name)
 
             if use_client_cert_env == "false":
                 expected_client_cert_source = None
@@ -448,7 +448,7 @@ def test_video_intelligence_service_client_client_options_scopes(
     options = client_options.ClientOptions(scopes=["1", "2"],)
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -483,7 +483,7 @@ def test_video_intelligence_service_client_client_options_credentials_file(
     options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file="credentials.json",
@@ -516,9 +516,10 @@ def test_video_intelligence_service_client_client_options_from_dict():
         )
 
 
-def test_annotate_video(
-    transport: str = "grpc", request_type=video_intelligence.AnnotateVideoRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [video_intelligence.AnnotateVideoRequest, dict,]
+)
+def test_annotate_video(request_type, transport: str = "grpc"):
     client = VideoIntelligenceServiceClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -542,10 +543,6 @@ def test_annotate_video(
     assert isinstance(response, future.Future)
 
 
-def test_annotate_video_from_dict():
-    test_annotate_video(request_type=dict)
-
-
 def test_annotate_video_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1215,7 +1212,7 @@ def test_parse_common_location_path():
     assert expected == actual
 
 
-def test_client_withDEFAULT_CLIENT_INFO():
+def test_client_with_default_client_info():
     client_info = gapic_v1.client_info.ClientInfo()
 
     with mock.patch.object(

diff --git a/...elligence/tests/unit/gapic/videointelligence_v1p2beta1/test_video_intelligence_service.py b/...elligence/tests/unit/gapic/videointelligence_v1p2beta1/test_video_intelligence_service.py
@@ -267,20 +267,20 @@ def test_video_intelligence_service_client_client_options(
     # unsupported value.
     with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}):
         with pytest.raises(MutualTLSChannelError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value.
     with mock.patch.dict(
         os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"}
     ):
         with pytest.raises(ValueError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case quota_project_id is provided
     options = client_options.ClientOptions(quota_project_id="octopus")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -349,7 +349,7 @@ def test_video_intelligence_service_client_mtls_env_auto(
         )
         with mock.patch.object(transport_class, "__init__") as patched:
             patched.return_value = None
-            client = client_class(transport=transport_name, client_options=options)
+            client = client_class(client_options=options, transport=transport_name)
 
             if use_client_cert_env == "false":
                 expected_client_cert_source = None
@@ -448,7 +448,7 @@ def test_video_intelligence_service_client_client_options_scopes(
     options = client_options.ClientOptions(scopes=["1", "2"],)
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -483,7 +483,7 @@ def test_video_intelligence_service_client_client_options_credentials_file(
     options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file="credentials.json",
@@ -516,9 +516,10 @@ def test_video_intelligence_service_client_client_options_from_dict():
         )
 
 
-def test_annotate_video(
-    transport: str = "grpc", request_type=video_intelligence.AnnotateVideoRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [video_intelligence.AnnotateVideoRequest, dict,]
+)
+def test_annotate_video(request_type, transport: str = "grpc"):
     client = VideoIntelligenceServiceClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -542,10 +543,6 @@ def test_annotate_video(
     assert isinstance(response, future.Future)
 
 
-def test_annotate_video_from_dict():
-    test_annotate_video(request_type=dict)
-
-
 def test_annotate_video_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1215,7 +1212,7 @@ def test_parse_common_location_path():
     assert expected == actual
 
 
-def test_client_withDEFAULT_CLIENT_INFO():
+def test_client_with_default_client_info():
     client_info = gapic_v1.client_info.ClientInfo()
 
     with mock.patch.object(