Skip to content

Commit

Permalink
chore: use gapic-generator-python 0.58.4 (#153)
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>
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] and gcf-owl-bot[bot] authored Jan 8, 2022
1 parent 5d4b9e7 commit af133e0
Show file tree
Hide file tree
Showing 6 changed files with 207 additions and 323 deletions.
1 change: 0 additions & 1 deletion ...le-cloud-os-config/google/cloud/osconfig_v1/services/os_config_service/transports/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...ud-os-config/google/cloud/osconfig_v1/services/os_config_zonal_service/transports/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,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
1 change: 0 additions & 1 deletion ...-config/google/cloud/osconfig_v1alpha/services/os_config_zonal_service/transports/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,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
141 changes: 59 additions & 82 deletions packages/google-cloud-os-config/tests/unit/gapic/osconfig_v1/test_os_config_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,20 +255,20 @@ def test_os_config_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,
Expand Down Expand Up @@ -337,7 +337,7 @@ def test_os_config_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
Expand Down Expand Up @@ -432,7 +432,7 @@ def test_os_config_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,
Expand Down Expand Up @@ -463,7 +463,7 @@ def test_os_config_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",
Expand Down Expand Up @@ -496,9 +496,8 @@ def test_os_config_service_client_client_options_from_dict():
)


def test_execute_patch_job(
transport: str = "grpc", request_type=patch_jobs.ExecutePatchJobRequest
):
@pytest.mark.parametrize("request_type", [patch_jobs.ExecutePatchJobRequest, dict,])
def test_execute_patch_job(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -541,10 +540,6 @@ def test_execute_patch_job(
assert response.patch_deployment == "patch_deployment_value"


def test_execute_patch_job_from_dict():
test_execute_patch_job(request_type=dict)


def test_execute_patch_job_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 @@ -670,9 +665,8 @@ async def test_execute_patch_job_field_headers_async():
assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"]


def test_get_patch_job(
transport: str = "grpc", request_type=patch_jobs.GetPatchJobRequest
):
@pytest.mark.parametrize("request_type", [patch_jobs.GetPatchJobRequest, dict,])
def test_get_patch_job(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -713,10 +707,6 @@ def test_get_patch_job(
assert response.patch_deployment == "patch_deployment_value"


def test_get_patch_job_from_dict():
test_get_patch_job(request_type=dict)


def test_get_patch_job_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 @@ -904,9 +894,8 @@ async def test_get_patch_job_flattened_error_async():
)


def test_cancel_patch_job(
transport: str = "grpc", request_type=patch_jobs.CancelPatchJobRequest
):
@pytest.mark.parametrize("request_type", [patch_jobs.CancelPatchJobRequest, dict,])
def test_cancel_patch_job(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -947,10 +936,6 @@ def test_cancel_patch_job(
assert response.patch_deployment == "patch_deployment_value"


def test_cancel_patch_job_from_dict():
test_cancel_patch_job(request_type=dict)


def test_cancel_patch_job_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 @@ -1068,9 +1053,8 @@ async def test_cancel_patch_job_field_headers_async():
assert ("x-goog-request-params", "name=name/value",) in kw["metadata"]


def test_list_patch_jobs(
transport: str = "grpc", request_type=patch_jobs.ListPatchJobsRequest
):
@pytest.mark.parametrize("request_type", [patch_jobs.ListPatchJobsRequest, dict,])
def test_list_patch_jobs(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand All @@ -1097,10 +1081,6 @@ def test_list_patch_jobs(
assert response.next_page_token == "next_page_token_value"


def test_list_patch_jobs_from_dict():
test_list_patch_jobs(request_type=dict)


def test_list_patch_jobs_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 @@ -1276,8 +1256,10 @@ async def test_list_patch_jobs_flattened_error_async():
)


def test_list_patch_jobs_pager():
client = OsConfigServiceClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_patch_jobs_pager(transport_name: str = "grpc"):
client = OsConfigServiceClient(
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_patch_jobs), "__call__") as call:
Expand Down Expand Up @@ -1314,8 +1296,10 @@ def test_list_patch_jobs_pager():
assert all(isinstance(i, patch_jobs.PatchJob) for i in results)


def test_list_patch_jobs_pages():
client = OsConfigServiceClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_patch_jobs_pages(transport_name: str = "grpc"):
client = OsConfigServiceClient(
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_patch_jobs), "__call__") as call:
Expand Down Expand Up @@ -1418,9 +1402,10 @@ async def test_list_patch_jobs_async_pages():
assert page_.raw_page.next_page_token == token


def test_list_patch_job_instance_details(
transport: str = "grpc", request_type=patch_jobs.ListPatchJobInstanceDetailsRequest
):
@pytest.mark.parametrize(
"request_type", [patch_jobs.ListPatchJobInstanceDetailsRequest, dict,]
)
def test_list_patch_job_instance_details(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -1449,10 +1434,6 @@ def test_list_patch_job_instance_details(
assert response.next_page_token == "next_page_token_value"


def test_list_patch_job_instance_details_from_dict():
test_list_patch_job_instance_details(request_type=dict)


def test_list_patch_job_instance_details_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 @@ -1643,8 +1624,10 @@ async def test_list_patch_job_instance_details_flattened_error_async():
)


def test_list_patch_job_instance_details_pager():
client = OsConfigServiceClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_patch_job_instance_details_pager(transport_name: str = "grpc"):
client = OsConfigServiceClient(
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 @@ -1689,8 +1672,10 @@ def test_list_patch_job_instance_details_pager():
assert all(isinstance(i, patch_jobs.PatchJobInstanceDetails) for i in results)


def test_list_patch_job_instance_details_pages():
client = OsConfigServiceClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_patch_job_instance_details_pages(transport_name: str = "grpc"):
client = OsConfigServiceClient(
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 @@ -1819,9 +1804,10 @@ async def test_list_patch_job_instance_details_async_pages():
assert page_.raw_page.next_page_token == token


def test_create_patch_deployment(
transport: str = "grpc", request_type=patch_deployments.CreatePatchDeploymentRequest
):
@pytest.mark.parametrize(
"request_type", [patch_deployments.CreatePatchDeploymentRequest, dict,]
)
def test_create_patch_deployment(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -1855,10 +1841,6 @@ def test_create_patch_deployment(
assert response.description == "description_value"


def test_create_patch_deployment_from_dict():
test_create_patch_deployment(request_type=dict)


def test_create_patch_deployment_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 @@ -2076,9 +2058,10 @@ async def test_create_patch_deployment_flattened_error_async():
)


def test_get_patch_deployment(
transport: str = "grpc", request_type=patch_deployments.GetPatchDeploymentRequest
):
@pytest.mark.parametrize(
"request_type", [patch_deployments.GetPatchDeploymentRequest, dict,]
)
def test_get_patch_deployment(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -2112,10 +2095,6 @@ def test_get_patch_deployment(
assert response.description == "description_value"


def test_get_patch_deployment_from_dict():
test_get_patch_deployment(request_type=dict)


def test_get_patch_deployment_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 @@ -2307,9 +2286,10 @@ async def test_get_patch_deployment_flattened_error_async():
)


def test_list_patch_deployments(
transport: str = "grpc", request_type=patch_deployments.ListPatchDeploymentsRequest
):
@pytest.mark.parametrize(
"request_type", [patch_deployments.ListPatchDeploymentsRequest, dict,]
)
def test_list_patch_deployments(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand Down Expand Up @@ -2338,10 +2318,6 @@ def test_list_patch_deployments(
assert response.next_page_token == "next_page_token_value"


def test_list_patch_deployments_from_dict():
test_list_patch_deployments(request_type=dict)


def test_list_patch_deployments_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 @@ -2532,8 +2508,10 @@ async def test_list_patch_deployments_flattened_error_async():
)


def test_list_patch_deployments_pager():
client = OsConfigServiceClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_patch_deployments_pager(transport_name: str = "grpc"):
client = OsConfigServiceClient(
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 @@ -2578,8 +2556,10 @@ def test_list_patch_deployments_pager():
assert all(isinstance(i, patch_deployments.PatchDeployment) for i in results)


def test_list_patch_deployments_pages():
client = OsConfigServiceClient(credentials=ga_credentials.AnonymousCredentials,)
def test_list_patch_deployments_pages(transport_name: str = "grpc"):
client = OsConfigServiceClient(
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 @@ -2706,9 +2686,10 @@ async def test_list_patch_deployments_async_pages():
assert page_.raw_page.next_page_token == token


def test_delete_patch_deployment(
transport: str = "grpc", request_type=patch_deployments.DeletePatchDeploymentRequest
):
@pytest.mark.parametrize(
"request_type", [patch_deployments.DeletePatchDeploymentRequest, dict,]
)
def test_delete_patch_deployment(request_type, transport: str = "grpc"):
client = OsConfigServiceClient(
credentials=ga_credentials.AnonymousCredentials(), transport=transport,
)
Expand All @@ -2734,10 +2715,6 @@ def test_delete_patch_deployment(
assert response is None


def test_delete_patch_deployment_from_dict():
test_delete_patch_deployment(request_type=dict)


def test_delete_patch_deployment_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 @@ -3485,7 +3462,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
Loading

0 comments on commit af133e0

Please sign in to comment.