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

* 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: https://github.com/googleapis/googleapis-gen/commit/46df624a54b9ed47c1a7eefb7a49413cf7b82f98
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]

google/cloud/redis_v1/services/cloud_redis/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

google/cloud/redis_v1beta1/services/cloud_redis/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

tests/unit/gapic/redis_v1/test_cloud_redis.py

@@ -243,20 +243,20 @@ def test_cloud_redis_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,
@@ -313,7 +313,7 @@ def test_cloud_redis_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
@@ -408,7 +408,7 @@ def test_cloud_redis_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,
@@ -439,7 +439,7 @@ def test_cloud_redis_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",
@@ -470,9 +470,8 @@ def test_cloud_redis_client_client_options_from_dict():
         )
 
 
-def test_list_instances(
-    transport: str = "grpc", request_type=cloud_redis.ListInstancesRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.ListInstancesRequest, dict,])
+def test_list_instances(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -500,10 +499,6 @@ def test_list_instances(
     assert response.unreachable == ["unreachable_value"]
 
 
-def test_list_instances_from_dict():
-    test_list_instances(request_type=dict)
-
-
 def test_list_instances_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.
@@ -677,8 +672,10 @@ async def test_list_instances_flattened_error_async():
         )
 
 
-def test_list_instances_pager():
-    client = CloudRedisClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_instances_pager(transport_name: str = "grpc"):
+    client = CloudRedisClient(
+        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_instances), "__call__") as call:
@@ -715,8 +712,10 @@ def test_list_instances_pager():
         assert all(isinstance(i, cloud_redis.Instance) for i in results)
 
 
-def test_list_instances_pages():
-    client = CloudRedisClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_instances_pages(transport_name: str = "grpc"):
+    client = CloudRedisClient(
+        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_instances), "__call__") as call:
@@ -815,9 +814,8 @@ async def test_list_instances_async_pages():
             assert page_.raw_page.next_page_token == token
 
 
-def test_get_instance(
-    transport: str = "grpc", request_type=cloud_redis.GetInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.GetInstanceRequest, dict,])
+def test_get_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -885,10 +883,6 @@ def test_get_instance(
     )
 
 
-def test_get_instance_from_dict():
-    test_get_instance(request_type=dict)
-
-
 def test_get_instance_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.
@@ -1101,9 +1095,8 @@ async def test_get_instance_flattened_error_async():
         )
 
 
-def test_create_instance(
-    transport: str = "grpc", request_type=cloud_redis.CreateInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.CreateInstanceRequest, dict,])
+def test_create_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1127,10 +1120,6 @@ def test_create_instance(
     assert isinstance(response, future.Future)
 
 
-def test_create_instance_from_dict():
-    test_create_instance(request_type=dict)
-
-
 def test_create_instance_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.
@@ -1325,9 +1314,8 @@ async def test_create_instance_flattened_error_async():
         )
 
 
-def test_update_instance(
-    transport: str = "grpc", request_type=cloud_redis.UpdateInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.UpdateInstanceRequest, dict,])
+def test_update_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1351,10 +1339,6 @@ def test_update_instance(
     assert isinstance(response, future.Future)
 
 
-def test_update_instance_from_dict():
-    test_update_instance(request_type=dict)
-
-
 def test_update_instance_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.
@@ -1543,9 +1527,8 @@ async def test_update_instance_flattened_error_async():
         )
 
 
-def test_upgrade_instance(
-    transport: str = "grpc", request_type=cloud_redis.UpgradeInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.UpgradeInstanceRequest, dict,])
+def test_upgrade_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1569,10 +1552,6 @@ def test_upgrade_instance(
     assert isinstance(response, future.Future)
 
 
-def test_upgrade_instance_from_dict():
-    test_upgrade_instance(request_type=dict)
-
-
 def test_upgrade_instance_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.
@@ -1755,9 +1734,8 @@ async def test_upgrade_instance_flattened_error_async():
         )
 
 
-def test_import_instance(
-    transport: str = "grpc", request_type=cloud_redis.ImportInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.ImportInstanceRequest, dict,])
+def test_import_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1781,10 +1759,6 @@ def test_import_instance(
     assert isinstance(response, future.Future)
 
 
-def test_import_instance_from_dict():
-    test_import_instance(request_type=dict)
-
-
 def test_import_instance_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.
@@ -1981,9 +1955,8 @@ async def test_import_instance_flattened_error_async():
         )
 
 
-def test_export_instance(
-    transport: str = "grpc", request_type=cloud_redis.ExportInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.ExportInstanceRequest, dict,])
+def test_export_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -2007,10 +1980,6 @@ def test_export_instance(
     assert isinstance(response, future.Future)
 
 
-def test_export_instance_from_dict():
-    test_export_instance(request_type=dict)
-
-
 def test_export_instance_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.
@@ -2207,9 +2176,8 @@ async def test_export_instance_flattened_error_async():
         )
 
 
-def test_failover_instance(
-    transport: str = "grpc", request_type=cloud_redis.FailoverInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.FailoverInstanceRequest, dict,])
+def test_failover_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -2235,10 +2203,6 @@ def test_failover_instance(
     assert isinstance(response, future.Future)
 
 
-def test_failover_instance_from_dict():
-    test_failover_instance(request_type=dict)
-
-
 def test_failover_instance_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.
@@ -2439,9 +2403,8 @@ async def test_failover_instance_flattened_error_async():
         )
 
 
-def test_delete_instance(
-    transport: str = "grpc", request_type=cloud_redis.DeleteInstanceRequest
-):
+@pytest.mark.parametrize("request_type", [cloud_redis.DeleteInstanceRequest, dict,])
+def test_delete_instance(request_type, transport: str = "grpc"):
     client = CloudRedisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -2465,10 +2428,6 @@ def test_delete_instance(
     assert isinstance(response, future.Future)
 
 
-def test_delete_instance_from_dict():
-    test_delete_instance(request_type=dict)
-
-
 def test_delete_instance_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.
@@ -3173,7 +3132,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(