diff --git a/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py b/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py index 7289e1c..1f9c8ae 100644 --- a/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py +++ b/google/cloud/billing/budgets_v1/services/budget_service/transports/base.py @@ -106,7 +106,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/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py b/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py index 47211c1..56d0322 100644 --- a/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py +++ b/google/cloud/billing/budgets_v1beta1/services/budget_service/transports/base.py @@ -106,7 +106,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/tests/unit/gapic/budgets_v1/test_budget_service.py b/tests/unit/gapic/budgets_v1/test_budget_service.py index 0638e8c..15d1fab 100644 --- a/tests/unit/gapic/budgets_v1/test_budget_service.py +++ b/tests/unit/gapic/budgets_v1/test_budget_service.py @@ -253,20 +253,20 @@ def test_budget_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, @@ -325,7 +325,7 @@ def test_budget_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 @@ -420,7 +420,7 @@ def test_budget_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, @@ -451,7 +451,7 @@ def test_budget_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", @@ -484,9 +484,8 @@ def test_budget_service_client_client_options_from_dict(): ) -def test_create_budget( - transport: str = "grpc", request_type=budget_service.CreateBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.CreateBudgetRequest, dict,]) +def test_create_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -515,10 +514,6 @@ def test_create_budget( assert response.etag == "etag_value" -def test_create_budget_from_dict(): - test_create_budget(request_type=dict) - - def test_create_budget_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. @@ -708,9 +703,8 @@ async def test_create_budget_flattened_error_async(): ) -def test_update_budget( - transport: str = "grpc", request_type=budget_service.UpdateBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.UpdateBudgetRequest, dict,]) +def test_update_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -739,10 +733,6 @@ def test_update_budget( assert response.etag == "etag_value" -def test_update_budget_from_dict(): - test_update_budget(request_type=dict) - - def test_update_budget_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. @@ -934,9 +924,8 @@ async def test_update_budget_flattened_error_async(): ) -def test_get_budget( - transport: str = "grpc", request_type=budget_service.GetBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.GetBudgetRequest, dict,]) +def test_get_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -965,10 +954,6 @@ def test_get_budget( assert response.etag == "etag_value" -def test_get_budget_from_dict(): - test_get_budget(request_type=dict) - - def test_get_budget_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. @@ -1144,9 +1129,8 @@ async def test_get_budget_flattened_error_async(): ) -def test_list_budgets( - transport: str = "grpc", request_type=budget_service.ListBudgetsRequest -): +@pytest.mark.parametrize("request_type", [budget_service.ListBudgetsRequest, dict,]) +def test_list_budgets(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1173,10 +1157,6 @@ def test_list_budgets( assert response.next_page_token == "next_page_token_value" -def test_list_budgets_from_dict(): - test_list_budgets(request_type=dict) - - def test_list_budgets_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. @@ -1352,8 +1332,10 @@ async def test_list_budgets_flattened_error_async(): ) -def test_list_budgets_pager(): - client = BudgetServiceClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_budgets_pager(transport_name: str = "grpc"): + client = BudgetServiceClient( + 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_budgets), "__call__") as call: @@ -1390,8 +1372,10 @@ def test_list_budgets_pager(): assert all(isinstance(i, budget_model.Budget) for i in results) -def test_list_budgets_pages(): - client = BudgetServiceClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_budgets_pages(transport_name: str = "grpc"): + client = BudgetServiceClient( + 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_budgets), "__call__") as call: @@ -1490,9 +1474,8 @@ async def test_list_budgets_async_pages(): assert page_.raw_page.next_page_token == token -def test_delete_budget( - transport: str = "grpc", request_type=budget_service.DeleteBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.DeleteBudgetRequest, dict,]) +def test_delete_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1516,10 +1499,6 @@ def test_delete_budget( assert response is None -def test_delete_budget_from_dict(): - test_delete_budget(request_type=dict) - - def test_delete_budget_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. @@ -2214,7 +2193,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/tests/unit/gapic/budgets_v1beta1/test_budget_service.py b/tests/unit/gapic/budgets_v1beta1/test_budget_service.py index feee982..38b2739 100644 --- a/tests/unit/gapic/budgets_v1beta1/test_budget_service.py +++ b/tests/unit/gapic/budgets_v1beta1/test_budget_service.py @@ -255,20 +255,20 @@ def test_budget_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, @@ -327,7 +327,7 @@ def test_budget_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 @@ -422,7 +422,7 @@ def test_budget_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, @@ -453,7 +453,7 @@ def test_budget_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", @@ -486,9 +486,8 @@ def test_budget_service_client_client_options_from_dict(): ) -def test_create_budget( - transport: str = "grpc", request_type=budget_service.CreateBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.CreateBudgetRequest, dict,]) +def test_create_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -517,10 +516,6 @@ def test_create_budget( assert response.etag == "etag_value" -def test_create_budget_from_dict(): - test_create_budget(request_type=dict) - - def test_create_budget_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. @@ -626,9 +621,8 @@ async def test_create_budget_field_headers_async(): assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] -def test_update_budget( - transport: str = "grpc", request_type=budget_service.UpdateBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.UpdateBudgetRequest, dict,]) +def test_update_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -657,10 +651,6 @@ def test_update_budget( assert response.etag == "etag_value" -def test_update_budget_from_dict(): - test_update_budget(request_type=dict) - - def test_update_budget_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. @@ -766,9 +756,8 @@ async def test_update_budget_field_headers_async(): assert ("x-goog-request-params", "budget.name=budget.name/value",) in kw["metadata"] -def test_get_budget( - transport: str = "grpc", request_type=budget_service.GetBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.GetBudgetRequest, dict,]) +def test_get_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -797,10 +786,6 @@ def test_get_budget( assert response.etag == "etag_value" -def test_get_budget_from_dict(): - test_get_budget(request_type=dict) - - def test_get_budget_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. @@ -906,9 +891,8 @@ async def test_get_budget_field_headers_async(): assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] -def test_list_budgets( - transport: str = "grpc", request_type=budget_service.ListBudgetsRequest -): +@pytest.mark.parametrize("request_type", [budget_service.ListBudgetsRequest, dict,]) +def test_list_budgets(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -935,10 +919,6 @@ def test_list_budgets( assert response.next_page_token == "next_page_token_value" -def test_list_budgets_from_dict(): - test_list_budgets(request_type=dict) - - def test_list_budgets_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. @@ -1042,8 +1022,10 @@ async def test_list_budgets_field_headers_async(): assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] -def test_list_budgets_pager(): - client = BudgetServiceClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_budgets_pager(transport_name: str = "grpc"): + client = BudgetServiceClient( + 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_budgets), "__call__") as call: @@ -1080,8 +1062,10 @@ def test_list_budgets_pager(): assert all(isinstance(i, budget_model.Budget) for i in results) -def test_list_budgets_pages(): - client = BudgetServiceClient(credentials=ga_credentials.AnonymousCredentials,) +def test_list_budgets_pages(transport_name: str = "grpc"): + client = BudgetServiceClient( + 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_budgets), "__call__") as call: @@ -1180,9 +1164,8 @@ async def test_list_budgets_async_pages(): assert page_.raw_page.next_page_token == token -def test_delete_budget( - transport: str = "grpc", request_type=budget_service.DeleteBudgetRequest -): +@pytest.mark.parametrize("request_type", [budget_service.DeleteBudgetRequest, dict,]) +def test_delete_budget(request_type, transport: str = "grpc"): client = BudgetServiceClient( credentials=ga_credentials.AnonymousCredentials(), transport=transport, ) @@ -1206,10 +1189,6 @@ def test_delete_budget( assert response is None -def test_delete_budget_from_dict(): - test_delete_budget(request_type=dict) - - def test_delete_budget_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. @@ -1834,7 +1813,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(