Skip to content
This repository was archived by the owner on Dec 31, 2023. It is now read-only.

Commit cb7c193

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: Add async context manager return types (#398)
* fix: Add async context manager return types chore: Mock return_value should not populate oneof message fields chore: Support snippet generation for services that only support REST transport chore: Update gapic-generator-python to v1.11.0 PiperOrigin-RevId: 545430278 Source-Link: googleapis/googleapis@601b532 Source-Link: https://github.com/googleapis/googleapis-gen/commit/b3f18d0f6560a855022fd058865e7620479d7af9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjNmMThkMGY2NTYwYTg1NTAyMmZkMDU4ODY1ZTc2MjA0NzlkN2FmOSJ9 * 🦉 Updates from OwlBot post-processor 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>
1 parent 57141c2 commit cb7c193

6 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎google/cloud/kms_v1/services/ekm_service/async_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ async def test_iam_permissions(
15071507
# Done; return the response.
15081508
return response
15091509

1510-
async def __aenter__(self):
1510+
async def __aenter__(self) -> "EkmServiceAsyncClient":
15111511
return self
15121512

15131513
async def __aexit__(self, exc_type, exc, tb):

‎google/cloud/kms_v1/services/ekm_service/transports/rest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,7 +1557,7 @@ def __call__(
15571557
request_kwargs = json_format.MessageToDict(request)
15581558
transcoded_request = path_template.transcode(http_options, **request_kwargs)
15591559

1560-
body = json.loads(json.dumps(transcoded_request["body"]))
1560+
body = json.dumps(transcoded_request["body"])
15611561
uri = transcoded_request["uri"]
15621562
method = transcoded_request["method"]
15631563

@@ -1649,7 +1649,7 @@ def __call__(
16491649
request_kwargs = json_format.MessageToDict(request)
16501650
transcoded_request = path_template.transcode(http_options, **request_kwargs)
16511651

1652-
body = json.loads(json.dumps(transcoded_request["body"]))
1652+
body = json.dumps(transcoded_request["body"])
16531653
uri = transcoded_request["uri"]
16541654
method = transcoded_request["method"]
16551655

‎google/cloud/kms_v1/services/key_management_service/async_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4329,7 +4329,7 @@ async def test_iam_permissions(
43294329
# Done; return the response.
43304330
return response
43314331

4332-
async def __aenter__(self):
4332+
async def __aenter__(self) -> "KeyManagementServiceAsyncClient":
43334333
return self
43344334

43354335
async def __aexit__(self, exc_type, exc, tb):

‎google/cloud/kms_v1/services/key_management_service/transports/rest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4519,7 +4519,7 @@ def __call__(
45194519
request_kwargs = json_format.MessageToDict(request)
45204520
transcoded_request = path_template.transcode(http_options, **request_kwargs)
45214521

4522-
body = json.loads(json.dumps(transcoded_request["body"]))
4522+
body = json.dumps(transcoded_request["body"])
45234523
uri = transcoded_request["uri"]
45244524
method = transcoded_request["method"]
45254525

@@ -4611,7 +4611,7 @@ def __call__(
46114611
request_kwargs = json_format.MessageToDict(request)
46124612
transcoded_request = path_template.transcode(http_options, **request_kwargs)
46134613

4614-
body = json.loads(json.dumps(transcoded_request["body"]))
4614+
body = json.dumps(transcoded_request["body"])
46154615
uri = transcoded_request["uri"]
46164616
method = transcoded_request["method"]
46174617

‎tests/unit/gapic/kms_v1/test_ekm_service.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,9 +1126,11 @@ async def test_list_ekm_connections_async_pages():
11261126
RuntimeError,
11271127
)
11281128
pages = []
1129-
async for page_ in (
1129+
# Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
1130+
# See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
1131+
async for page_ in ( # pragma: no branch
11301132
await client.list_ekm_connections(request={})
1131-
).pages: # pragma: no branch
1133+
).pages:
11321134
pages.append(page_)
11331135
for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
11341136
assert page_.raw_page.next_page_token == token

‎tests/unit/gapic/kms_v1/test_key_management_service.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,9 +1175,11 @@ async def test_list_key_rings_async_pages():
11751175
RuntimeError,
11761176
)
11771177
pages = []
1178-
async for page_ in (
1178+
# Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
1179+
# See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
1180+
async for page_ in ( # pragma: no branch
11791181
await client.list_key_rings(request={})
1180-
).pages: # pragma: no branch
1182+
).pages:
11811183
pages.append(page_)
11821184
for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
11831185
assert page_.raw_page.next_page_token == token
@@ -1599,9 +1601,11 @@ async def test_list_crypto_keys_async_pages():
15991601
RuntimeError,
16001602
)
16011603
pages = []
1602-
async for page_ in (
1604+
# Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
1605+
# See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
1606+
async for page_ in ( # pragma: no branch
16031607
await client.list_crypto_keys(request={})
1604-
).pages: # pragma: no branch
1608+
).pages:
16051609
pages.append(page_)
16061610
for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
16071611
assert page_.raw_page.next_page_token == token
@@ -2045,9 +2049,11 @@ async def test_list_crypto_key_versions_async_pages():
20452049
RuntimeError,
20462050
)
20472051
pages = []
2048-
async for page_ in (
2052+
# Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
2053+
# See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
2054+
async for page_ in ( # pragma: no branch
20492055
await client.list_crypto_key_versions(request={})
2050-
).pages: # pragma: no branch
2056+
).pages:
20512057
pages.append(page_)
20522058
for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
20532059
assert page_.raw_page.next_page_token == token
@@ -2469,9 +2475,11 @@ async def test_list_import_jobs_async_pages():
24692475
RuntimeError,
24702476
)
24712477
pages = []
2472-
async for page_ in (
2478+
# Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
2479+
# See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
2480+
async for page_ in ( # pragma: no branch
24732481
await client.list_import_jobs(request={})
2474-
).pages: # pragma: no branch
2482+
).pages:
24752483
pages.append(page_)
24762484
for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
24772485
assert page_.raw_page.next_page_token == token
@@ -2730,7 +2738,6 @@ def test_get_crypto_key(request_type, transport: str = "grpc"):
27302738
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
27312739
import_only=True,
27322740
crypto_key_backend="crypto_key_backend_value",
2733-
rotation_period=duration_pb2.Duration(seconds=751),
27342741
)
27352742
response = client.get_crypto_key(request)
27362743

@@ -4009,7 +4016,6 @@ def test_create_crypto_key(request_type, transport: str = "grpc"):
40094016
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
40104017
import_only=True,
40114018
crypto_key_backend="crypto_key_backend_value",
4012-
rotation_period=duration_pb2.Duration(seconds=751),
40134019
)
40144020
response = client.create_crypto_key(request)
40154021

@@ -5080,7 +5086,6 @@ def test_update_crypto_key(request_type, transport: str = "grpc"):
50805086
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
50815087
import_only=True,
50825088
crypto_key_backend="crypto_key_backend_value",
5083-
rotation_period=duration_pb2.Duration(seconds=751),
50845089
)
50855090
response = client.update_crypto_key(request)
50865091

@@ -5651,7 +5656,6 @@ def test_update_crypto_key_primary_version(request_type, transport: str = "grpc"
56515656
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
56525657
import_only=True,
56535658
crypto_key_backend="crypto_key_backend_value",
5654-
rotation_period=duration_pb2.Duration(seconds=751),
56555659
)
56565660
response = client.update_crypto_key_primary_version(request)
56575661

@@ -10325,7 +10329,6 @@ def test_get_crypto_key_rest(request_type):
1032510329
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
1032610330
import_only=True,
1032710331
crypto_key_backend="crypto_key_backend_value",
10328-
rotation_period=duration_pb2.Duration(seconds=751),
1032910332
)
1033010333

1033110334
# Wrap the value into a proper Response obj
@@ -11798,7 +11801,6 @@ def test_create_crypto_key_rest(request_type):
1179811801
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
1179911802
import_only=True,
1180011803
crypto_key_backend="crypto_key_backend_value",
11801-
rotation_period=duration_pb2.Duration(seconds=751),
1180211804
)
1180311805

1180411806
# Wrap the value into a proper Response obj
@@ -13199,7 +13201,6 @@ def test_update_crypto_key_rest(request_type):
1319913201
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
1320013202
import_only=True,
1320113203
crypto_key_backend="crypto_key_backend_value",
13202-
rotation_period=duration_pb2.Duration(seconds=751),
1320313204
)
1320413205

1320513206
# Wrap the value into a proper Response obj
@@ -13918,7 +13919,6 @@ def test_update_crypto_key_primary_version_rest(request_type):
1391813919
purpose=resources.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT,
1391913920
import_only=True,
1392013921
crypto_key_backend="crypto_key_backend_value",
13921-
rotation_period=duration_pb2.Duration(seconds=751),
1392213922
)
1392313923

1392413924
# Wrap the value into a proper Response obj

0 commit comments

Comments
 (0)