Skip to content

Commit ff5dc34

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
chore: Update gapic-generator-python to v1.11.9 (#490)
* chore: Update gapic-generator-python to v1.11.7 PiperOrigin-RevId: 573230664 Source-Link: googleapis/googleapis@93beed3 Source-Link: googleapis/googleapis-gen@f4a4eda Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjRhNGVkYWE4MDU3NjM5ZmNmNmFkZjkxNzk4NzIyODBkMWE4ZjY1MSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Update gapic-generator-python to v1.11.8 PiperOrigin-RevId: 574178735 Source-Link: googleapis/googleapis@7307199 Source-Link: googleapis/googleapis-gen@ce3af21 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2UzYWYyMWI3YzU1OWE4N2MyYmVmYzA3NmJlMGUzYWVkYTNhMjZmMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: Update gapic-generator-python to v1.11.9 PiperOrigin-RevId: 574520922 Source-Link: googleapis/googleapis@5183984 Source-Link: googleapis/googleapis-gen@a59af19 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTU5YWYxOWQ0YWM2NTA5ZmFlZGYxY2MzOTAyOTE0MWI2YTViODk2OCJ9 * 🦉 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> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent 2857422 commit ff5dc34

2 files changed

Lines changed: 139 additions & 56 deletions

File tree

‎packages/google-cloud-datastore/tests/unit/gapic/datastore_admin_v1/test_datastore_admin.py‎

Lines changed: 73 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2609,6 +2609,73 @@ def test_create_index_rest(request_type):
26092609
"properties": [{"name": "name_value", "direction": 1}],
26102610
"state": 1,
26112611
}
2612+
# The version of a generated dependency at test runtime may differ from the version used during generation.
2613+
# Delete any fields which are not present in the current runtime dependency
2614+
# See https://github.com/googleapis/gapic-generator-python/issues/1748
2615+
2616+
# Determine if the message type is proto-plus or protobuf
2617+
test_field = datastore_admin.CreateIndexRequest.meta.fields["index"]
2618+
2619+
def get_message_fields(field):
2620+
# Given a field which is a message (composite type), return a list with
2621+
# all the fields of the message.
2622+
# If the field is not a composite type, return an empty list.
2623+
message_fields = []
2624+
2625+
if hasattr(field, "message") and field.message:
2626+
is_field_type_proto_plus_type = not hasattr(field.message, "DESCRIPTOR")
2627+
2628+
if is_field_type_proto_plus_type:
2629+
message_fields = field.message.meta.fields.values()
2630+
# Add `# pragma: NO COVER` because there may not be any `*_pb2` field types
2631+
else: # pragma: NO COVER
2632+
message_fields = field.message.DESCRIPTOR.fields
2633+
return message_fields
2634+
2635+
runtime_nested_fields = [
2636+
(field.name, nested_field.name)
2637+
for field in get_message_fields(test_field)
2638+
for nested_field in get_message_fields(field)
2639+
]
2640+
2641+
subfields_not_in_runtime = []
2642+
2643+
# For each item in the sample request, create a list of sub fields which are not present at runtime
2644+
# Add `# pragma: NO COVER` because this test code will not run if all subfields are present at runtime
2645+
for field, value in request_init["index"].items(): # pragma: NO COVER
2646+
result = None
2647+
is_repeated = False
2648+
# For repeated fields
2649+
if isinstance(value, list) and len(value):
2650+
is_repeated = True
2651+
result = value[0]
2652+
# For fields where the type is another message
2653+
if isinstance(value, dict):
2654+
result = value
2655+
2656+
if result and hasattr(result, "keys"):
2657+
for subfield in result.keys():
2658+
if (field, subfield) not in runtime_nested_fields:
2659+
subfields_not_in_runtime.append(
2660+
{
2661+
"field": field,
2662+
"subfield": subfield,
2663+
"is_repeated": is_repeated,
2664+
}
2665+
)
2666+
2667+
# Remove fields from the sample request which are not present in the runtime version of the dependency
2668+
# Add `# pragma: NO COVER` because this test code will not run if all subfields are present at runtime
2669+
for subfield_to_delete in subfields_not_in_runtime: # pragma: NO COVER
2670+
field = subfield_to_delete.get("field")
2671+
field_repeated = subfield_to_delete.get("is_repeated")
2672+
subfield = subfield_to_delete.get("subfield")
2673+
if subfield:
2674+
if field_repeated:
2675+
for i in range(0, len(request_init["index"][field])):
2676+
del request_init["index"][field][i][subfield]
2677+
else:
2678+
del request_init["index"][field][subfield]
26122679
request = request_type(**request_init)
26132680

26142681
# Mock the http request call within the method and fake a response.
@@ -2698,14 +2765,6 @@ def test_create_index_rest_bad_request(
26982765

26992766
# send a request that will satisfy transcoding
27002767
request_init = {"project_id": "sample1"}
2701-
request_init["index"] = {
2702-
"project_id": "project_id_value",
2703-
"index_id": "index_id_value",
2704-
"kind": "kind_value",
2705-
"ancestor": 1,
2706-
"properties": [{"name": "name_value", "direction": 1}],
2707-
"state": 1,
2708-
}
27092768
request = request_type(**request_init)
27102769

27112770
# Mock the http request call within the method and fake a BadRequest error.
@@ -2881,8 +2940,9 @@ def test_get_index_rest(request_type):
28812940
# Wrap the value into a proper Response obj
28822941
response_value = Response()
28832942
response_value.status_code = 200
2884-
pb_return_value = index.Index.pb(return_value)
2885-
json_return_value = json_format.MessageToJson(pb_return_value)
2943+
# Convert return value to protobuf type
2944+
return_value = index.Index.pb(return_value)
2945+
json_return_value = json_format.MessageToJson(return_value)
28862946

28872947
response_value._content = json_return_value.encode("UTF-8")
28882948
req.return_value = response_value
@@ -3009,8 +3069,9 @@ def test_list_indexes_rest(request_type):
30093069
# Wrap the value into a proper Response obj
30103070
response_value = Response()
30113071
response_value.status_code = 200
3012-
pb_return_value = datastore_admin.ListIndexesResponse.pb(return_value)
3013-
json_return_value = json_format.MessageToJson(pb_return_value)
3072+
# Convert return value to protobuf type
3073+
return_value = datastore_admin.ListIndexesResponse.pb(return_value)
3074+
json_return_value = json_format.MessageToJson(return_value)
30143075

30153076
response_value._content = json_return_value.encode("UTF-8")
30163077
req.return_value = response_value

‎packages/google-cloud-datastore/tests/unit/gapic/datastore_v1/test_datastore.py‎

Lines changed: 66 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2456,8 +2456,9 @@ def test_lookup_rest(request_type):
24562456
# Wrap the value into a proper Response obj
24572457
response_value = Response()
24582458
response_value.status_code = 200
2459-
pb_return_value = datastore.LookupResponse.pb(return_value)
2460-
json_return_value = json_format.MessageToJson(pb_return_value)
2459+
# Convert return value to protobuf type
2460+
return_value = datastore.LookupResponse.pb(return_value)
2461+
json_return_value = json_format.MessageToJson(return_value)
24612462

24622463
response_value._content = json_return_value.encode("UTF-8")
24632464
req.return_value = response_value
@@ -2531,8 +2532,9 @@ def test_lookup_rest_required_fields(request_type=datastore.LookupRequest):
25312532
response_value = Response()
25322533
response_value.status_code = 200
25332534

2534-
pb_return_value = datastore.LookupResponse.pb(return_value)
2535-
json_return_value = json_format.MessageToJson(pb_return_value)
2535+
# Convert return value to protobuf type
2536+
return_value = datastore.LookupResponse.pb(return_value)
2537+
json_return_value = json_format.MessageToJson(return_value)
25362538

25372539
response_value._content = json_return_value.encode("UTF-8")
25382540
req.return_value = response_value
@@ -2669,8 +2671,9 @@ def test_lookup_rest_flattened():
26692671
# Wrap the value into a proper Response obj
26702672
response_value = Response()
26712673
response_value.status_code = 200
2672-
pb_return_value = datastore.LookupResponse.pb(return_value)
2673-
json_return_value = json_format.MessageToJson(pb_return_value)
2674+
# Convert return value to protobuf type
2675+
return_value = datastore.LookupResponse.pb(return_value)
2676+
json_return_value = json_format.MessageToJson(return_value)
26742677
response_value._content = json_return_value.encode("UTF-8")
26752678
req.return_value = response_value
26762679

@@ -2741,8 +2744,9 @@ def test_run_query_rest(request_type):
27412744
# Wrap the value into a proper Response obj
27422745
response_value = Response()
27432746
response_value.status_code = 200
2744-
pb_return_value = datastore.RunQueryResponse.pb(return_value)
2745-
json_return_value = json_format.MessageToJson(pb_return_value)
2747+
# Convert return value to protobuf type
2748+
return_value = datastore.RunQueryResponse.pb(return_value)
2749+
json_return_value = json_format.MessageToJson(return_value)
27462750

27472751
response_value._content = json_return_value.encode("UTF-8")
27482752
req.return_value = response_value
@@ -2816,8 +2820,9 @@ def test_run_query_rest_required_fields(request_type=datastore.RunQueryRequest):
28162820
response_value = Response()
28172821
response_value.status_code = 200
28182822

2819-
pb_return_value = datastore.RunQueryResponse.pb(return_value)
2820-
json_return_value = json_format.MessageToJson(pb_return_value)
2823+
# Convert return value to protobuf type
2824+
return_value = datastore.RunQueryResponse.pb(return_value)
2825+
json_return_value = json_format.MessageToJson(return_value)
28212826

28222827
response_value._content = json_return_value.encode("UTF-8")
28232828
req.return_value = response_value
@@ -2948,8 +2953,9 @@ def test_run_aggregation_query_rest(request_type):
29482953
# Wrap the value into a proper Response obj
29492954
response_value = Response()
29502955
response_value.status_code = 200
2951-
pb_return_value = datastore.RunAggregationQueryResponse.pb(return_value)
2952-
json_return_value = json_format.MessageToJson(pb_return_value)
2956+
# Convert return value to protobuf type
2957+
return_value = datastore.RunAggregationQueryResponse.pb(return_value)
2958+
json_return_value = json_format.MessageToJson(return_value)
29532959

29542960
response_value._content = json_return_value.encode("UTF-8")
29552961
req.return_value = response_value
@@ -3025,8 +3031,9 @@ def test_run_aggregation_query_rest_required_fields(
30253031
response_value = Response()
30263032
response_value.status_code = 200
30273033

3028-
pb_return_value = datastore.RunAggregationQueryResponse.pb(return_value)
3029-
json_return_value = json_format.MessageToJson(pb_return_value)
3034+
# Convert return value to protobuf type
3035+
return_value = datastore.RunAggregationQueryResponse.pb(return_value)
3036+
json_return_value = json_format.MessageToJson(return_value)
30303037

30313038
response_value._content = json_return_value.encode("UTF-8")
30323039
req.return_value = response_value
@@ -3159,8 +3166,9 @@ def test_begin_transaction_rest(request_type):
31593166
# Wrap the value into a proper Response obj
31603167
response_value = Response()
31613168
response_value.status_code = 200
3162-
pb_return_value = datastore.BeginTransactionResponse.pb(return_value)
3163-
json_return_value = json_format.MessageToJson(pb_return_value)
3169+
# Convert return value to protobuf type
3170+
return_value = datastore.BeginTransactionResponse.pb(return_value)
3171+
json_return_value = json_format.MessageToJson(return_value)
31643172

31653173
response_value._content = json_return_value.encode("UTF-8")
31663174
req.return_value = response_value
@@ -3236,8 +3244,9 @@ def test_begin_transaction_rest_required_fields(
32363244
response_value = Response()
32373245
response_value.status_code = 200
32383246

3239-
pb_return_value = datastore.BeginTransactionResponse.pb(return_value)
3240-
json_return_value = json_format.MessageToJson(pb_return_value)
3247+
# Convert return value to protobuf type
3248+
return_value = datastore.BeginTransactionResponse.pb(return_value)
3249+
json_return_value = json_format.MessageToJson(return_value)
32413250

32423251
response_value._content = json_return_value.encode("UTF-8")
32433252
req.return_value = response_value
@@ -3360,8 +3369,9 @@ def test_begin_transaction_rest_flattened():
33603369
# Wrap the value into a proper Response obj
33613370
response_value = Response()
33623371
response_value.status_code = 200
3363-
pb_return_value = datastore.BeginTransactionResponse.pb(return_value)
3364-
json_return_value = json_format.MessageToJson(pb_return_value)
3372+
# Convert return value to protobuf type
3373+
return_value = datastore.BeginTransactionResponse.pb(return_value)
3374+
json_return_value = json_format.MessageToJson(return_value)
33653375
response_value._content = json_return_value.encode("UTF-8")
33663376
req.return_value = response_value
33673377

@@ -3425,8 +3435,9 @@ def test_commit_rest(request_type):
34253435
# Wrap the value into a proper Response obj
34263436
response_value = Response()
34273437
response_value.status_code = 200
3428-
pb_return_value = datastore.CommitResponse.pb(return_value)
3429-
json_return_value = json_format.MessageToJson(pb_return_value)
3438+
# Convert return value to protobuf type
3439+
return_value = datastore.CommitResponse.pb(return_value)
3440+
json_return_value = json_format.MessageToJson(return_value)
34303441

34313442
response_value._content = json_return_value.encode("UTF-8")
34323443
req.return_value = response_value
@@ -3500,8 +3511,9 @@ def test_commit_rest_required_fields(request_type=datastore.CommitRequest):
35003511
response_value = Response()
35013512
response_value.status_code = 200
35023513

3503-
pb_return_value = datastore.CommitResponse.pb(return_value)
3504-
json_return_value = json_format.MessageToJson(pb_return_value)
3514+
# Convert return value to protobuf type
3515+
return_value = datastore.CommitResponse.pb(return_value)
3516+
json_return_value = json_format.MessageToJson(return_value)
35053517

35063518
response_value._content = json_return_value.encode("UTF-8")
35073519
req.return_value = response_value
@@ -3634,8 +3646,9 @@ def test_commit_rest_flattened():
36343646
# Wrap the value into a proper Response obj
36353647
response_value = Response()
36363648
response_value.status_code = 200
3637-
pb_return_value = datastore.CommitResponse.pb(return_value)
3638-
json_return_value = json_format.MessageToJson(pb_return_value)
3649+
# Convert return value to protobuf type
3650+
return_value = datastore.CommitResponse.pb(return_value)
3651+
json_return_value = json_format.MessageToJson(return_value)
36393652
response_value._content = json_return_value.encode("UTF-8")
36403653
req.return_value = response_value
36413654

@@ -3709,8 +3722,9 @@ def test_rollback_rest(request_type):
37093722
# Wrap the value into a proper Response obj
37103723
response_value = Response()
37113724
response_value.status_code = 200
3712-
pb_return_value = datastore.RollbackResponse.pb(return_value)
3713-
json_return_value = json_format.MessageToJson(pb_return_value)
3725+
# Convert return value to protobuf type
3726+
return_value = datastore.RollbackResponse.pb(return_value)
3727+
json_return_value = json_format.MessageToJson(return_value)
37143728

37153729
response_value._content = json_return_value.encode("UTF-8")
37163730
req.return_value = response_value
@@ -3787,8 +3801,9 @@ def test_rollback_rest_required_fields(request_type=datastore.RollbackRequest):
37873801
response_value = Response()
37883802
response_value.status_code = 200
37893803

3790-
pb_return_value = datastore.RollbackResponse.pb(return_value)
3791-
json_return_value = json_format.MessageToJson(pb_return_value)
3804+
# Convert return value to protobuf type
3805+
return_value = datastore.RollbackResponse.pb(return_value)
3806+
json_return_value = json_format.MessageToJson(return_value)
37923807

37933808
response_value._content = json_return_value.encode("UTF-8")
37943809
req.return_value = response_value
@@ -3918,8 +3933,9 @@ def test_rollback_rest_flattened():
39183933
# Wrap the value into a proper Response obj
39193934
response_value = Response()
39203935
response_value.status_code = 200
3921-
pb_return_value = datastore.RollbackResponse.pb(return_value)
3922-
json_return_value = json_format.MessageToJson(pb_return_value)
3936+
# Convert return value to protobuf type
3937+
return_value = datastore.RollbackResponse.pb(return_value)
3938+
json_return_value = json_format.MessageToJson(return_value)
39233939
response_value._content = json_return_value.encode("UTF-8")
39243940
req.return_value = response_value
39253941

@@ -3981,8 +3997,9 @@ def test_allocate_ids_rest(request_type):
39813997
# Wrap the value into a proper Response obj
39823998
response_value = Response()
39833999
response_value.status_code = 200
3984-
pb_return_value = datastore.AllocateIdsResponse.pb(return_value)
3985-
json_return_value = json_format.MessageToJson(pb_return_value)
4000+
# Convert return value to protobuf type
4001+
return_value = datastore.AllocateIdsResponse.pb(return_value)
4002+
json_return_value = json_format.MessageToJson(return_value)
39864003

39874004
response_value._content = json_return_value.encode("UTF-8")
39884005
req.return_value = response_value
@@ -4055,8 +4072,9 @@ def test_allocate_ids_rest_required_fields(request_type=datastore.AllocateIdsReq
40554072
response_value = Response()
40564073
response_value.status_code = 200
40574074

4058-
pb_return_value = datastore.AllocateIdsResponse.pb(return_value)
4059-
json_return_value = json_format.MessageToJson(pb_return_value)
4075+
# Convert return value to protobuf type
4076+
return_value = datastore.AllocateIdsResponse.pb(return_value)
4077+
json_return_value = json_format.MessageToJson(return_value)
40604078

40614079
response_value._content = json_return_value.encode("UTF-8")
40624080
req.return_value = response_value
@@ -4190,8 +4208,9 @@ def test_allocate_ids_rest_flattened():
41904208
# Wrap the value into a proper Response obj
41914209
response_value = Response()
41924210
response_value.status_code = 200
4193-
pb_return_value = datastore.AllocateIdsResponse.pb(return_value)
4194-
json_return_value = json_format.MessageToJson(pb_return_value)
4211+
# Convert return value to protobuf type
4212+
return_value = datastore.AllocateIdsResponse.pb(return_value)
4213+
json_return_value = json_format.MessageToJson(return_value)
41954214
response_value._content = json_return_value.encode("UTF-8")
41964215
req.return_value = response_value
41974216

@@ -4257,8 +4276,9 @@ def test_reserve_ids_rest(request_type):
42574276
# Wrap the value into a proper Response obj
42584277
response_value = Response()
42594278
response_value.status_code = 200
4260-
pb_return_value = datastore.ReserveIdsResponse.pb(return_value)
4261-
json_return_value = json_format.MessageToJson(pb_return_value)
4279+
# Convert return value to protobuf type
4280+
return_value = datastore.ReserveIdsResponse.pb(return_value)
4281+
json_return_value = json_format.MessageToJson(return_value)
42624282

42634283
response_value._content = json_return_value.encode("UTF-8")
42644284
req.return_value = response_value
@@ -4331,8 +4351,9 @@ def test_reserve_ids_rest_required_fields(request_type=datastore.ReserveIdsReque
43314351
response_value = Response()
43324352
response_value.status_code = 200
43334353

4334-
pb_return_value = datastore.ReserveIdsResponse.pb(return_value)
4335-
json_return_value = json_format.MessageToJson(pb_return_value)
4354+
# Convert return value to protobuf type
4355+
return_value = datastore.ReserveIdsResponse.pb(return_value)
4356+
json_return_value = json_format.MessageToJson(return_value)
43364357

43374358
response_value._content = json_return_value.encode("UTF-8")
43384359
req.return_value = response_value
@@ -4466,8 +4487,9 @@ def test_reserve_ids_rest_flattened():
44664487
# Wrap the value into a proper Response obj
44674488
response_value = Response()
44684489
response_value.status_code = 200
4469-
pb_return_value = datastore.ReserveIdsResponse.pb(return_value)
4470-
json_return_value = json_format.MessageToJson(pb_return_value)
4490+
# Convert return value to protobuf type
4491+
return_value = datastore.ReserveIdsResponse.pb(return_value)
4492+
json_return_value = json_format.MessageToJson(return_value)
44714493
response_value._content = json_return_value.encode("UTF-8")
44724494
req.return_value = response_value
44734495

0 commit comments

Comments
 (0)