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

gcf-owl-bot[bot] · parthea · web-flow · commit 1e44d01ec2e9 · 2022-01-07T19:35:58.000-05:00
* 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> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/packages/google-cloud-firestore/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py
@@ -109,7 +109,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/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/transports/base.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/transports/base.py
@@ -105,7 +105,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/packages/google-cloud-firestore/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py b/packages/google-cloud-firestore/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py
@@ -260,20 +260,20 @@ def test_firestore_admin_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,
@@ -332,7 +332,7 @@ def test_firestore_admin_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
@@ -427,7 +427,7 @@ def test_firestore_admin_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,
@@ -458,7 +458,7 @@ def test_firestore_admin_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",
@@ -491,9 +491,8 @@ def test_firestore_admin_client_client_options_from_dict():
         )
 
 
-def test_create_index(
-    transport: str = "grpc", request_type=firestore_admin.CreateIndexRequest
-):
+@pytest.mark.parametrize("request_type", [firestore_admin.CreateIndexRequest, dict,])
+def test_create_index(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -517,10 +516,6 @@ def test_create_index(
     assert isinstance(response, future.Future)
 
 
-def test_create_index_from_dict():
-    test_create_index(request_type=dict)
-
-
 def test_create_index_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.
@@ -709,9 +704,8 @@ async def test_create_index_flattened_error_async():
         )
 
 
-def test_list_indexes(
-    transport: str = "grpc", request_type=firestore_admin.ListIndexesRequest
-):
+@pytest.mark.parametrize("request_type", [firestore_admin.ListIndexesRequest, dict,])
+def test_list_indexes(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -738,10 +732,6 @@ def test_list_indexes(
     assert response.next_page_token == "next_page_token_value"
 
 
-def test_list_indexes_from_dict():
-    test_list_indexes(request_type=dict)
-
-
 def test_list_indexes_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.
@@ -919,8 +909,10 @@ async def test_list_indexes_flattened_error_async():
         )
 
 
-def test_list_indexes_pager():
-    client = FirestoreAdminClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_indexes_pager(transport_name: str = "grpc"):
+    client = FirestoreAdminClient(
+        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_indexes), "__call__") as call:
@@ -953,8 +945,10 @@ def test_list_indexes_pager():
         assert all(isinstance(i, index.Index) for i in results)
 
 
-def test_list_indexes_pages():
-    client = FirestoreAdminClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_indexes_pages(transport_name: str = "grpc"):
+    client = FirestoreAdminClient(
+        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_indexes), "__call__") as call:
@@ -1041,9 +1035,8 @@ async def test_list_indexes_async_pages():
             assert page_.raw_page.next_page_token == token
 
 
-def test_get_index(
-    transport: str = "grpc", request_type=firestore_admin.GetIndexRequest
-):
+@pytest.mark.parametrize("request_type", [firestore_admin.GetIndexRequest, dict,])
+def test_get_index(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1074,10 +1067,6 @@ def test_get_index(
     assert response.state == index.Index.State.CREATING
 
 
-def test_get_index_from_dict():
-    test_get_index(request_type=dict)
-
-
 def test_get_index_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.
@@ -1255,9 +1244,8 @@ async def test_get_index_flattened_error_async():
         )
 
 
-def test_delete_index(
-    transport: str = "grpc", request_type=firestore_admin.DeleteIndexRequest
-):
+@pytest.mark.parametrize("request_type", [firestore_admin.DeleteIndexRequest, dict,])
+def test_delete_index(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1281,10 +1269,6 @@ def test_delete_index(
     assert response is None
 
 
-def test_delete_index_from_dict():
-    test_delete_index(request_type=dict)
-
-
 def test_delete_index_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.
@@ -1453,9 +1437,8 @@ async def test_delete_index_flattened_error_async():
         )
 
 
-def test_get_field(
-    transport: str = "grpc", request_type=firestore_admin.GetFieldRequest
-):
+@pytest.mark.parametrize("request_type", [firestore_admin.GetFieldRequest, dict,])
+def test_get_field(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1480,10 +1463,6 @@ def test_get_field(
     assert response.name == "name_value"
 
 
-def test_get_field_from_dict():
-    test_get_field(request_type=dict)
-
-
 def test_get_field_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.
@@ -1655,9 +1634,8 @@ async def test_get_field_flattened_error_async():
         )
 
 
-def test_update_field(
-    transport: str = "grpc", request_type=firestore_admin.UpdateFieldRequest
-):
+@pytest.mark.parametrize("request_type", [firestore_admin.UpdateFieldRequest, dict,])
+def test_update_field(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1681,10 +1659,6 @@ def test_update_field(
     assert isinstance(response, future.Future)
 
 
-def test_update_field_from_dict():
-    test_update_field(request_type=dict)
-
-
 def test_update_field_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.
@@ -1861,9 +1835,8 @@ async def test_update_field_flattened_error_async():
         )
 
 
-def test_list_fields(
-    transport: str = "grpc", request_type=firestore_admin.ListFieldsRequest
-):
+@pytest.mark.parametrize("request_type", [firestore_admin.ListFieldsRequest, dict,])
+def test_list_fields(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1890,10 +1863,6 @@ def test_list_fields(
     assert response.next_page_token == "next_page_token_value"
 
 
-def test_list_fields_from_dict():
-    test_list_fields(request_type=dict)
-
-
 def test_list_fields_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.
@@ -2069,8 +2038,10 @@ async def test_list_fields_flattened_error_async():
         )
 
 
-def test_list_fields_pager():
-    client = FirestoreAdminClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_fields_pager(transport_name: str = "grpc"):
+    client = FirestoreAdminClient(
+        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_fields), "__call__") as call:
@@ -2101,8 +2072,10 @@ def test_list_fields_pager():
         assert all(isinstance(i, field.Field) for i in results)
 
 
-def test_list_fields_pages():
-    client = FirestoreAdminClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_fields_pages(transport_name: str = "grpc"):
+    client = FirestoreAdminClient(
+        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_fields), "__call__") as call:
@@ -2183,9 +2156,10 @@ async def test_list_fields_async_pages():
             assert page_.raw_page.next_page_token == token
 
 
-def test_export_documents(
-    transport: str = "grpc", request_type=firestore_admin.ExportDocumentsRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [firestore_admin.ExportDocumentsRequest, dict,]
+)
+def test_export_documents(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -2209,10 +2183,6 @@ def test_export_documents(
     assert isinstance(response, future.Future)
 
 
-def test_export_documents_from_dict():
-    test_export_documents(request_type=dict)
-
-
 def test_export_documents_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.
@@ -2387,9 +2357,10 @@ async def test_export_documents_flattened_error_async():
         )
 
 
-def test_import_documents(
-    transport: str = "grpc", request_type=firestore_admin.ImportDocumentsRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [firestore_admin.ImportDocumentsRequest, dict,]
+)
+def test_import_documents(request_type, transport: str = "grpc"):
     client = FirestoreAdminClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -2413,10 +2384,6 @@ def test_import_documents(
     assert isinstance(response, future.Future)
 
 
-def test_import_documents_from_dict():
-    test_import_documents(request_type=dict)
-
-
 def test_import_documents_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.
@@ -3230,7 +3197,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/packages/google-cloud-firestore/tests/unit/gapic/firestore_v1/test_firestore.py b/packages/google-cloud-firestore/tests/unit/gapic/firestore_v1/test_firestore.py

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ def __init__(`
`109`	`109`	`credentials, _ = google.auth.load_credentials_from_file(`
`110`	`110`	`credentials_file, **scopes_kwargs, quota_project_id=quota_project_id`
`111`	`111`	`)`
`112`		`-`
`113`	`112`	`elif credentials is None:`
`114`	`113`	`credentials, _ = google.auth.default(`
`115`	`114`	`**scopes_kwargs, quota_project_id=quota_project_id`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ def __init__(`
`105`	`105`	`credentials, _ = google.auth.load_credentials_from_file(`
`106`	`106`	`credentials_file, **scopes_kwargs, quota_project_id=quota_project_id`
`107`	`107`	`)`
`108`		`-`
`109`	`108`	`elif credentials is None:`
`110`	`109`	`credentials, _ = google.auth.default(`
`111`	`110`	`**scopes_kwargs, quota_project_id=quota_project_id`