Skip to content

Commit

Permalink
chore: use gapic-generator-python 0.58.4 (#149)
Browse files Browse the repository at this point in the history 
* 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 <[email protected]>
  • Loading branch information
@gcf-owl-bot @parthea
3 people authored Jan 7, 2022
1 parent 01585af commit 06e4cee
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 64 deletions.
1 change: 0 additions & 1 deletion ...ccess-approval/google/cloud/accessapproval_v1/services/access_approval/transports/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,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
Expand Down
106 changes: 43 additions & 63 deletions ...s/google-cloud-access-approval/tests/unit/gapic/accessapproval_v1/test_access_approval.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,20 +250,20 @@ def test_access_approval_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,
Expand Down Expand Up @@ -322,7 +322,7 @@ def test_access_approval_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
Expand Down Expand Up @@ -417,7 +417,7 @@ def test_access_approval_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,
Expand Down Expand Up @@ -448,7 +448,7 @@ def test_access_approval_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",
Expand Down Expand Up @@ -481,9 +481,10 @@ def test_access_approval_client_client_options_from_dict():
)


def test_list_approval_requests(
transport: str = "grpc", request_type=accessapproval.ListApprovalRequestsMessage
):
@pytest.mark.parametrize(
"request_type", [accessapproval.ListApprovalRequestsMessage, dict,]
)
def test_list_approval_requests(request_type, transport: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -512,10 +513,6 @@ def test_list_approval_requests(
assert response.next_page_token == "next_page_token_value"


def test_list_approval_requests_from_dict():
test_list_approval_requests(request_type=dict)


def test_list_approval_requests_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.
Expand Down Expand Up @@ -706,8 +703,10 @@ async def test_list_approval_requests_flattened_error_async():
)


def test_list_approval_requests_pager():
client = AccessApprovalClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_approval_requests_pager(transport_name: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
)

# Mock the actual call within the gRPC stub, and fake the request.
with mock.patch.object(
Expand Down Expand Up @@ -752,8 +751,10 @@ def test_list_approval_requests_pager():
assert all(isinstance(i, accessapproval.ApprovalRequest) for i in results)


def test_list_approval_requests_pages():
client = AccessApprovalClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_approval_requests_pages(transport_name: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
)

# Mock the actual call within the gRPC stub, and fake the request.
with mock.patch.object(
Expand Down Expand Up @@ -876,9 +877,10 @@ async def test_list_approval_requests_async_pages():
assert page_.raw_page.next_page_token == token


def test_get_approval_request(
transport: str = "grpc", request_type=accessapproval.GetApprovalRequestMessage
):
@pytest.mark.parametrize(
"request_type", [accessapproval.GetApprovalRequestMessage, dict,]
)
def test_get_approval_request(request_type, transport: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -912,10 +914,6 @@ def test_get_approval_request(
assert response.requested_resource_name == "requested_resource_name_value"


def test_get_approval_request_from_dict():
test_get_approval_request(request_type=dict)


def test_get_approval_request_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.
Expand Down Expand Up @@ -1108,9 +1106,10 @@ async def test_get_approval_request_flattened_error_async():
)


def test_approve_approval_request(
transport: str = "grpc", request_type=accessapproval.ApproveApprovalRequestMessage
):
@pytest.mark.parametrize(
"request_type", [accessapproval.ApproveApprovalRequestMessage, dict,]
)
def test_approve_approval_request(request_type, transport: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -1144,10 +1143,6 @@ def test_approve_approval_request(
assert response.requested_resource_name == "requested_resource_name_value"


def test_approve_approval_request_from_dict():
test_approve_approval_request(request_type=dict)


def test_approve_approval_request_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.
Expand Down Expand Up @@ -1264,9 +1259,10 @@ async def test_approve_approval_request_field_headers_async():
assert ("x-goog-request-params", "name=name/value",) in kw["metadata"]


def test_dismiss_approval_request(
transport: str = "grpc", request_type=accessapproval.DismissApprovalRequestMessage
):
@pytest.mark.parametrize(
"request_type", [accessapproval.DismissApprovalRequestMessage, dict,]
)
def test_dismiss_approval_request(request_type, transport: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -1300,10 +1296,6 @@ def test_dismiss_approval_request(
assert response.requested_resource_name == "requested_resource_name_value"


def test_dismiss_approval_request_from_dict():
test_dismiss_approval_request(request_type=dict)


def test_dismiss_approval_request_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.
Expand Down Expand Up @@ -1420,10 +1412,10 @@ async def test_dismiss_approval_request_field_headers_async():
assert ("x-goog-request-params", "name=name/value",) in kw["metadata"]


def test_get_access_approval_settings(
transport: str = "grpc",
request_type=accessapproval.GetAccessApprovalSettingsMessage,
):
@pytest.mark.parametrize(
"request_type", [accessapproval.GetAccessApprovalSettingsMessage, dict,]
)
def test_get_access_approval_settings(request_type, transport: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -1456,10 +1448,6 @@ def test_get_access_approval_settings(
assert response.enrolled_ancestor is True


def test_get_access_approval_settings_from_dict():
test_get_access_approval_settings(request_type=dict)


def test_get_access_approval_settings_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.
Expand Down Expand Up @@ -1654,10 +1642,10 @@ async def test_get_access_approval_settings_flattened_error_async():
)


def test_update_access_approval_settings(
transport: str = "grpc",
request_type=accessapproval.UpdateAccessApprovalSettingsMessage,
):
@pytest.mark.parametrize(
"request_type", [accessapproval.UpdateAccessApprovalSettingsMessage, dict,]
)
def test_update_access_approval_settings(request_type, transport: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -1690,10 +1678,6 @@ def test_update_access_approval_settings(
assert response.enrolled_ancestor is True


def test_update_access_approval_settings_from_dict():
test_update_access_approval_settings(request_type=dict)


def test_update_access_approval_settings_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.
Expand Down Expand Up @@ -1908,10 +1892,10 @@ async def test_update_access_approval_settings_flattened_error_async():
)


def test_delete_access_approval_settings(
transport: str = "grpc",
request_type=accessapproval.DeleteAccessApprovalSettingsMessage,
):
@pytest.mark.parametrize(
"request_type", [accessapproval.DeleteAccessApprovalSettingsMessage, dict,]
)
def test_delete_access_approval_settings(request_type, transport: str = "grpc"):
client = AccessApprovalClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand All @@ -1937,10 +1921,6 @@ def test_delete_access_approval_settings(
assert response is None


def test_delete_access_approval_settings_from_dict():
test_delete_access_approval_settings(request_type=dict)


def test_delete_access_approval_settings_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.
Expand Down Expand Up @@ -2618,7 +2598,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(
Expand Down

0 comments on commit 06e4cee

Please sign in to comment.