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

Commit ae1aeac

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: revert proto3_optional, required removal on parent_id (#714) (#265)
- [ ] Regenerate this pull request now. Source-Link: googleapis/googleapis@6b3fdce Source-Link: https://github.com/googleapis/googleapis-gen/commit/832dbe998878d8619d6b40fe57c6d2cc6e7dc90c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODMyZGJlOTk4ODc4ZDg2MTlkNmI0MGZlNTdjNmQyY2M2ZTdkYzkwYyJ9
1 parent 526fb10 commit ae1aeac

File tree

3 files changed

+41
-8
lines changed

3 files changed

+41
-8
lines changed

‎google/cloud/compute_v1/services/firewall_policies/transports/rest.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,9 @@ class _Move(FirewallPoliciesRestStub):
18051805
def __hash__(self):
18061806
return hash("Move")
18071807

1808-
__REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {}
1808+
__REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {
1809+
"parentId": "",
1810+
}
18091811

18101812
@classmethod
18111813
def _get_unset_required_fields(cls, message_dict):

‎google/cloud/compute_v1/types/compute.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50310,8 +50310,6 @@ class MoveFirewallPolicyRequest(proto.Message):
5031050310
Name of the firewall policy to update.
5031150311
parent_id (str):
5031250312
The new parent of the firewall policy.
50313-
50314-
This field is a member of `oneof`_ ``_parent_id``.
5031550313
request_id (str):
5031650314
An optional request ID to identify requests.
5031750315
Specify a unique request ID so that if you must
@@ -50339,7 +50337,6 @@ class MoveFirewallPolicyRequest(proto.Message):
5033950337
parent_id = proto.Field(
5034050338
proto.STRING,
5034150339
number=459714768,
50342-
optional=True,
5034350340
)
5034450341
request_id = proto.Field(
5034550342
proto.STRING,

‎tests/unit/gapic/compute_v1/test_firewall_policies.py‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5461,6 +5461,7 @@ def test_move_rest_required_fields(request_type=compute.MoveFirewallPolicyReques
54615461

54625462
request_init = {}
54635463
request_init["firewall_policy"] = ""
5464+
request_init["parent_id"] = ""
54645465
request = request_type(request_init)
54655466
jsonified_request = json.loads(
54665467
request_type.to_json(
@@ -5469,15 +5470,19 @@ def test_move_rest_required_fields(request_type=compute.MoveFirewallPolicyReques
54695470
)
54705471

54715472
# verify fields with default values are dropped
5473+
assert "parentId" not in jsonified_request
54725474

54735475
unset_fields = transport_class(
54745476
credentials=ga_credentials.AnonymousCredentials()
54755477
).move._get_unset_required_fields(jsonified_request)
54765478
jsonified_request.update(unset_fields)
54775479

54785480
# verify required fields with default values are now present
5481+
assert "parentId" in jsonified_request
5482+
assert jsonified_request["parentId"] == request_init["parent_id"]
54795483

54805484
jsonified_request["firewallPolicy"] = "firewall_policy_value"
5485+
jsonified_request["parentId"] = "parent_id_value"
54815486

54825487
unset_fields = transport_class(
54835488
credentials=ga_credentials.AnonymousCredentials()
@@ -5494,6 +5499,8 @@ def test_move_rest_required_fields(request_type=compute.MoveFirewallPolicyReques
54945499
# verify required fields with non-default values are left alone
54955500
assert "firewallPolicy" in jsonified_request
54965501
assert jsonified_request["firewallPolicy"] == "firewall_policy_value"
5502+
assert "parentId" in jsonified_request
5503+
assert jsonified_request["parentId"] == "parent_id_value"
54975504

54985505
client = FirewallPoliciesClient(
54995506
credentials=ga_credentials.AnonymousCredentials(),
@@ -5526,7 +5533,12 @@ def test_move_rest_required_fields(request_type=compute.MoveFirewallPolicyReques
55265533

55275534
response = client.move(request)
55285535

5529-
expected_params = []
5536+
expected_params = [
5537+
(
5538+
"parentId",
5539+
"",
5540+
),
5541+
]
55305542
actual_params = req.call_args.kwargs["params"]
55315543
assert expected_params == actual_params
55325544

@@ -5544,7 +5556,12 @@ def test_move_rest_unset_required_fields():
55445556
"requestId",
55455557
)
55465558
)
5547-
& set(("firewallPolicy",))
5559+
& set(
5560+
(
5561+
"firewallPolicy",
5562+
"parentId",
5563+
)
5564+
)
55485565
)
55495566

55505567

@@ -5753,6 +5770,7 @@ def test_move_unary_rest_required_fields(
57535770

57545771
request_init = {}
57555772
request_init["firewall_policy"] = ""
5773+
request_init["parent_id"] = ""
57565774
request = request_type(request_init)
57575775
jsonified_request = json.loads(
57585776
request_type.to_json(
@@ -5761,15 +5779,19 @@ def test_move_unary_rest_required_fields(
57615779
)
57625780

57635781
# verify fields with default values are dropped
5782+
assert "parentId" not in jsonified_request
57645783

57655784
unset_fields = transport_class(
57665785
credentials=ga_credentials.AnonymousCredentials()
57675786
).move._get_unset_required_fields(jsonified_request)
57685787
jsonified_request.update(unset_fields)
57695788

57705789
# verify required fields with default values are now present
5790+
assert "parentId" in jsonified_request
5791+
assert jsonified_request["parentId"] == request_init["parent_id"]
57715792

57725793
jsonified_request["firewallPolicy"] = "firewall_policy_value"
5794+
jsonified_request["parentId"] = "parent_id_value"
57735795

57745796
unset_fields = transport_class(
57755797
credentials=ga_credentials.AnonymousCredentials()
@@ -5786,6 +5808,8 @@ def test_move_unary_rest_required_fields(
57865808
# verify required fields with non-default values are left alone
57875809
assert "firewallPolicy" in jsonified_request
57885810
assert jsonified_request["firewallPolicy"] == "firewall_policy_value"
5811+
assert "parentId" in jsonified_request
5812+
assert jsonified_request["parentId"] == "parent_id_value"
57895813

57905814
client = FirewallPoliciesClient(
57915815
credentials=ga_credentials.AnonymousCredentials(),
@@ -5818,7 +5842,12 @@ def test_move_unary_rest_required_fields(
58185842

58195843
response = client.move_unary(request)
58205844

5821-
expected_params = []
5845+
expected_params = [
5846+
(
5847+
"parentId",
5848+
"",
5849+
),
5850+
]
58225851
actual_params = req.call_args.kwargs["params"]
58235852
assert expected_params == actual_params
58245853

@@ -5836,7 +5865,12 @@ def test_move_unary_rest_unset_required_fields():
58365865
"requestId",
58375866
)
58385867
)
5839-
& set(("firewallPolicy",))
5868+
& set(
5869+
(
5870+
"firewallPolicy",
5871+
"parentId",
5872+
)
5873+
)
58405874
)
58415875

58425876

0 commit comments

Comments
 (0)