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

* 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

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: gcf-owl-bot[bot]

packages/google-cloud-pubsub/google/pubsub_v1/services/publisher/transports/base.py

@@ -107,7 +107,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

packages/google-cloud-pubsub/google/pubsub_v1/services/schema_service/transports/base.py

@@ -108,7 +108,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

packages/google-cloud-pubsub/google/pubsub_v1/services/subscriber/transports/base.py

@@ -107,7 +107,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

packages/google-cloud-pubsub/tests/unit/gapic/pubsub_v1/test_publisher.py

@@ -240,20 +240,20 @@ def test_publisher_client_client_options(client_class, transport_class, transpor
     # 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,
@@ -310,7 +310,7 @@ def test_publisher_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
@@ -405,7 +405,7 @@ def test_publisher_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,
@@ -436,7 +436,7 @@ def test_publisher_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",
@@ -467,7 +467,8 @@ def test_publisher_client_client_options_from_dict():
         )
 
 
-def test_create_topic(transport: str = "grpc", request_type=pubsub.Topic):
+@pytest.mark.parametrize("request_type", [pubsub.Topic, dict,])
+def test_create_topic(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -496,10 +497,6 @@ def test_create_topic(transport: str = "grpc", request_type=pubsub.Topic):
     assert response.satisfies_pzs is True
 
 
-def test_create_topic_from_dict():
-    test_create_topic(request_type=dict)
-
-
 def test_create_topic_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.
@@ -671,7 +668,8 @@ async def test_create_topic_flattened_error_async():
         )
 
 
-def test_update_topic(transport: str = "grpc", request_type=pubsub.UpdateTopicRequest):
+@pytest.mark.parametrize("request_type", [pubsub.UpdateTopicRequest, dict,])
+def test_update_topic(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -700,10 +698,6 @@ def test_update_topic(transport: str = "grpc", request_type=pubsub.UpdateTopicRe
     assert response.satisfies_pzs is True
 
 
-def test_update_topic_from_dict():
-    test_update_topic(request_type=dict)
-
-
 def test_update_topic_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.
@@ -809,7 +803,8 @@ async def test_update_topic_field_headers_async():
     assert ("x-goog-request-params", "topic.name=topic.name/value",) in kw["metadata"]
 
 
-def test_publish(transport: str = "grpc", request_type=pubsub.PublishRequest):
+@pytest.mark.parametrize("request_type", [pubsub.PublishRequest, dict,])
+def test_publish(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -834,10 +829,6 @@ def test_publish(transport: str = "grpc", request_type=pubsub.PublishRequest):
     assert response.message_ids == ["message_ids_value"]
 
 
-def test_publish_from_dict():
-    test_publish(request_type=dict)
-
-
 def test_publish_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.
@@ -1021,7 +1012,8 @@ async def test_publish_flattened_error_async():
         )
 
 
-def test_get_topic(transport: str = "grpc", request_type=pubsub.GetTopicRequest):
+@pytest.mark.parametrize("request_type", [pubsub.GetTopicRequest, dict,])
+def test_get_topic(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1050,10 +1042,6 @@ def test_get_topic(transport: str = "grpc", request_type=pubsub.GetTopicRequest)
     assert response.satisfies_pzs is True
 
 
-def test_get_topic_from_dict():
-    test_get_topic(request_type=dict)
-
-
 def test_get_topic_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.
@@ -1225,7 +1213,8 @@ async def test_get_topic_flattened_error_async():
         )
 
 
-def test_list_topics(transport: str = "grpc", request_type=pubsub.ListTopicsRequest):
+@pytest.mark.parametrize("request_type", [pubsub.ListTopicsRequest, dict,])
+def test_list_topics(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1252,10 +1241,6 @@ def test_list_topics(transport: str = "grpc", request_type=pubsub.ListTopicsRequ
     assert response.next_page_token == "next_page_token_value"
 
 
-def test_list_topics_from_dict():
-    test_list_topics(request_type=dict)
-
-
 def test_list_topics_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.
@@ -1425,8 +1410,10 @@ async def test_list_topics_flattened_error_async():
         )
 
 
-def test_list_topics_pager():
-    client = PublisherClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_topics_pager(transport_name: str = "grpc"):
+    client = PublisherClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(type(client.transport.list_topics), "__call__") as call:
@@ -1455,8 +1442,10 @@ def test_list_topics_pager():
         assert all(isinstance(i, pubsub.Topic) for i in results)
 
 
-def test_list_topics_pages():
-    client = PublisherClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_topics_pages(transport_name: str = "grpc"):
+    client = PublisherClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(type(client.transport.list_topics), "__call__") as call:
@@ -1531,9 +1520,8 @@ async def test_list_topics_async_pages():
             assert page_.raw_page.next_page_token == token
 
 
-def test_list_topic_subscriptions(
-    transport: str = "grpc", request_type=pubsub.ListTopicSubscriptionsRequest
-):
+@pytest.mark.parametrize("request_type", [pubsub.ListTopicSubscriptionsRequest, dict,])
+def test_list_topic_subscriptions(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1564,10 +1552,6 @@ def test_list_topic_subscriptions(
     assert response.next_page_token == "next_page_token_value"
 
 
-def test_list_topic_subscriptions_from_dict():
-    test_list_topic_subscriptions(request_type=dict)
-
-
 def test_list_topic_subscriptions_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.
@@ -1753,8 +1737,10 @@ async def test_list_topic_subscriptions_flattened_error_async():
         )
 
 
-def test_list_topic_subscriptions_pager():
-    client = PublisherClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_topic_subscriptions_pager(transport_name: str = "grpc"):
+    client = PublisherClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(
@@ -1788,8 +1774,10 @@ def test_list_topic_subscriptions_pager():
         assert all(isinstance(i, str) for i in results)
 
 
-def test_list_topic_subscriptions_pages():
-    client = PublisherClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_topic_subscriptions_pages(transport_name: str = "grpc"):
+    client = PublisherClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(
@@ -1879,9 +1867,8 @@ async def test_list_topic_subscriptions_async_pages():
             assert page_.raw_page.next_page_token == token
 
 
-def test_list_topic_snapshots(
-    transport: str = "grpc", request_type=pubsub.ListTopicSnapshotsRequest
-):
+@pytest.mark.parametrize("request_type", [pubsub.ListTopicSnapshotsRequest, dict,])
+def test_list_topic_snapshots(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1911,10 +1898,6 @@ def test_list_topic_snapshots(
     assert response.next_page_token == "next_page_token_value"
 
 
-def test_list_topic_snapshots_from_dict():
-    test_list_topic_snapshots(request_type=dict)
-
-
 def test_list_topic_snapshots_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.
@@ -2099,8 +2082,10 @@ async def test_list_topic_snapshots_flattened_error_async():
         )
 
 
-def test_list_topic_snapshots_pager():
-    client = PublisherClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_topic_snapshots_pager(transport_name: str = "grpc"):
+    client = PublisherClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(
@@ -2132,8 +2117,10 @@ def test_list_topic_snapshots_pager():
         assert all(isinstance(i, str) for i in results)
 
 
-def test_list_topic_snapshots_pages():
-    client = PublisherClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_topic_snapshots_pages(transport_name: str = "grpc"):
+    client = PublisherClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(
@@ -2217,7 +2204,8 @@ async def test_list_topic_snapshots_async_pages():
             assert page_.raw_page.next_page_token == token
 
 
-def test_delete_topic(transport: str = "grpc", request_type=pubsub.DeleteTopicRequest):
+@pytest.mark.parametrize("request_type", [pubsub.DeleteTopicRequest, dict,])
+def test_delete_topic(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -2241,10 +2229,6 @@ def test_delete_topic(transport: str = "grpc", request_type=pubsub.DeleteTopicRe
     assert response is None
 
 
-def test_delete_topic_from_dict():
-    test_delete_topic(request_type=dict)
-
-
 def test_delete_topic_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.
@@ -2407,9 +2391,8 @@ async def test_delete_topic_flattened_error_async():
         )
 
 
-def test_detach_subscription(
-    transport: str = "grpc", request_type=pubsub.DetachSubscriptionRequest
-):
+@pytest.mark.parametrize("request_type", [pubsub.DetachSubscriptionRequest, dict,])
+def test_detach_subscription(request_type, transport: str = "grpc"):
     client = PublisherClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -2435,10 +2418,6 @@ def test_detach_subscription(
     assert isinstance(response, pubsub.DetachSubscriptionResponse)
 
 
-def test_detach_subscription_from_dict():
-    test_detach_subscription(request_type=dict)
-
-
 def test_detach_subscription_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.
@@ -3115,7 +3094,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(