Skip to content

Commit 5450c01

Browse files
gravesmpatchback[bot]
authored andcommitted
Quote scalars with colons in flow style collection (#2014)
Quote scalars with colons in flow style collection SUMMARY Older versions of libyaml and pyyaml don't support colons in scalars that appear in flow style collections. This adds quotes to the handful of cases where they are used in the integration tests. This was uncovered by downstream testing. I am only able to reproduce the problem on the supported ee-minimal-rhel8 image. I believe this is because even though pyyaml should be recent enough, it has likely been compiled against an older version of libyaml that does not have the fix. See: yaml/libyaml#104 yaml/pyyaml#45 It's worth noting that running ansible-lint --fix will undo these changes, which is how I think they were made in the first place. ISSUE TYPE Bugfix Pull Request COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: Bikouo Aubin Reviewed-by: GomathiselviS (cherry picked from commit 68fb0a3)
1 parent 37ee05f commit 5450c01

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

tests/integration/targets/ec2_ami/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,8 @@
708708
tags:
709709
Name: "{{ ec2_ami_name }}_permissions"
710710
launch_permissions:
711-
org_arns: [arn:aws:organizations::123456789012:organization/o-123ab4cdef]
712-
org_unit_arns: [arn:aws:organizations::123456789012:ou/o-123example/ou-1234-5exampld]
711+
org_arns: ["arn:aws:organizations::123456789012:organization/o-123ab4cdef"]
712+
org_unit_arns: ["arn:aws:organizations::123456789012:ou/o-123example/ou-1234-5exampld"]
713713
register: permissions_update_result
714714

715715
- name: Get ami info

tests/integration/targets/ec2_security_group/tasks/multi_nested_target.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
to_port: 8182
1313
cidr_ipv6:
1414
- 64:ff9b::/96
15-
- [2620::/32]
15+
- ["2620::/32"]
1616
- proto: tcp
1717
ports: 5665
1818
cidr_ip:
@@ -38,7 +38,7 @@
3838
to_port: 8182
3939
cidr_ipv6:
4040
- 64:ff9b::/96
41-
- [2620::/32]
41+
- ["2620::/32"]
4242
- proto: tcp
4343
ports: 5665
4444
cidr_ip:
@@ -66,7 +66,7 @@
6666
to_port: 8182
6767
cidr_ipv6:
6868
- 64:ff9b::/96
69-
- [2620::/32]
69+
- ["2620::/32"]
7070
- proto: tcp
7171
ports: 5665
7272
cidr_ip:
@@ -92,7 +92,7 @@
9292
to_port: 8182
9393
cidr_ipv6:
9494
- 64:ff9b::/96
95-
- [2620::/32]
95+
- ["2620::/32"]
9696
- proto: tcp
9797
ports: 5665
9898
cidr_ip:
@@ -117,7 +117,7 @@
117117
to_port: 8182
118118
cidr_ipv6:
119119
- 64:ff9b::/96
120-
- [2620::/32]
120+
- ["2620::/32"]
121121
- proto: tcp
122122
ports: 5665
123123
cidr_ip:
@@ -142,7 +142,7 @@
142142
to_port: 8182
143143
cidr_ipv6:
144144
- 64:ff9b::/96
145-
- [2620::/32]
145+
- ["2620::/32"]
146146
- proto: tcp
147147
ports: 5665
148148
cidr_ip:
@@ -167,7 +167,7 @@
167167
from_port: 8182
168168
to_port: 8182
169169
cidr_ipv6:
170-
- [2620::/32, 64:ff9b::/96]
170+
- ["2620::/32", "64:ff9b::/96"]
171171
- proto: tcp
172172
ports: 5665
173173
cidr_ip:
@@ -190,8 +190,8 @@
190190
from_port: 8182
191191
to_port: 8182
192192
cidr_ipv6:
193-
- [2620::/32, 64:ff9b::/96]
194-
- [2001:DB8:A0B:12F0::1/64]
193+
- ["2620::/32", "64:ff9b::/96"]
194+
- ["2001:DB8:A0B:12F0::1/64"]
195195
- proto: tcp
196196
ports: 5665
197197
cidr_ip:

0 commit comments

Comments
 (0)