Skip to content

Fix handling of None type and empty inputs for ACL ipv4 and ipv6 variables #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ykim-akamai merged 5 commits into from
Mar 18, 2025
Merged

Fix handling of None type and empty inputs for ACL ipv4 and ipv6 variables #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3931fdd
fix assertions
ykim-akamai Mar 18, 2025
8c6c4cc
remove debug statements
ykim-akamai Mar 18, 2025
aece9e5
update variable name
ykim-akamai Mar 18, 2025
6289860
fix ipv4 and ipv6 vars from configured_acl
ykim-akamai Mar 18, 2025
d6a4e0b
update assertions
ykim-akamai Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/modules/lke_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ def _attempt_update_acl(self, cluster: LKECluster) -> None:
ipv4 = configured_addresses.get("ipv4")
ipv6 = configured_addresses.get("ipv6")

configured_acl["addresses"]["ipv4"] = None if ipv4 == [] else ipv4
configured_acl["addresses"]["ipv6"] = None if ipv6 == [] else ipv6
configured_acl["addresses"]["ipv4"] = [] if not ipv4 else ipv4
configured_acl["addresses"]["ipv6"] = [] if not ipv6 else ipv6

user_defined_keys = set(linode_lke_cluster_acl.keys())
current_acl = control_plane_acl if control_plane_acl is not None else {}
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/lke_cluster_acl/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@
- update_cluster.cluster.region == "us-mia"
- update_cluster.cluster.control_plane.acl.enabled
- update_cluster.cluster.control_plane.acl.addresses.ipv4[0] == "10.0.0.5/32"
- update_cluster.cluster.control_plane.acl.addresses.ipv6 == None

- update_cluster.cluster.control_plane.acl.addresses.ipv6 == []

- name: Don't change the cluster
linode.cloud.lke_cluster:
Expand All @@ -93,8 +92,7 @@
- not unchanged_cluster.changed
- unchanged_cluster.cluster.control_plane.acl.enabled
- unchanged_cluster.cluster.control_plane.acl.addresses.ipv4[0] == "10.0.0.5/32"
- unchanged_cluster.cluster.control_plane.acl.addresses.ipv6 == None

- unchanged_cluster.cluster.control_plane.acl.addresses.ipv6 == []

- name: Disable ACLs on the cluster
linode.cloud.lke_cluster:
Expand All @@ -118,6 +116,8 @@
that:
- acl_disabled_cluster.changed
- not acl_disabled_cluster.cluster.control_plane.acl.enabled
- acl_disabled_cluster.cluster.control_plane.acl.addresses.ipv4 == []
- acl_disabled_cluster.cluster.control_plane.acl.addresses.ipv6 == []
always:
- ignore_errors: yes
block:
Expand Down
Loading