Skip to content

Commit fd0731e

Browse files
fabiomatavellifabiomatavelli
committed
chore(tests): fixes indexes on TypeSet
1 parent 86843ef commit fd0731e

4 files changed

+120
-120
lines changed

‎cloudstack/resource_cloudstack_egress_firewall_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ func TestAccCloudStackEgressFirewall_basic(t *testing.T) {
4242
resource.TestCheckResourceAttr(
4343
"cloudstack_egress_firewall.foo", "rule.#", "1"),
4444
resource.TestCheckResourceAttr(
45-
"cloudstack_egress_firewall.foo", "rule.3342666485.cidr_list.140834516", "10.1.1.10/32"),
45+
"cloudstack_egress_firewall.foo", "rule.0.cidr_list.0", "10.1.1.10/32"),
4646
resource.TestCheckResourceAttr(
47-
"cloudstack_egress_firewall.foo", "rule.3342666485.protocol", "tcp"),
47+
"cloudstack_egress_firewall.foo", "rule.0.protocol", "tcp"),
4848
resource.TestCheckResourceAttr(
49-
"cloudstack_egress_firewall.foo", "rule.3342666485.ports.32925333", "8080"),
49+
"cloudstack_egress_firewall.foo", "rule.0.ports.0", "8080"),
5050
),
5151
},
5252
},
@@ -66,11 +66,11 @@ func TestAccCloudStackEgressFirewall_update(t *testing.T) {
6666
resource.TestCheckResourceAttr(
6767
"cloudstack_egress_firewall.foo", "rule.#", "1"),
6868
resource.TestCheckResourceAttr(
69-
"cloudstack_egress_firewall.foo", "rule.3342666485.cidr_list.140834516", "10.1.1.10/32"),
69+
"cloudstack_egress_firewall.foo", "rule.0.cidr_list.0", "10.1.1.10/32"),
7070
resource.TestCheckResourceAttr(
71-
"cloudstack_egress_firewall.foo", "rule.3342666485.protocol", "tcp"),
71+
"cloudstack_egress_firewall.foo", "rule.0.protocol", "tcp"),
7272
resource.TestCheckResourceAttr(
73-
"cloudstack_egress_firewall.foo", "rule.3342666485.ports.32925333", "8080"),
73+
"cloudstack_egress_firewall.foo", "rule.0.ports.0", "8080"),
7474
),
7575
},
7676

@@ -81,19 +81,19 @@ func TestAccCloudStackEgressFirewall_update(t *testing.T) {
8181
resource.TestCheckResourceAttr(
8282
"cloudstack_egress_firewall.foo", "rule.#", "2"),
8383
resource.TestCheckResourceAttr(
84-
"cloudstack_egress_firewall.foo", "rule.1558935996.cidr_list.140834516", "10.1.1.10/32"),
84+
"cloudstack_egress_firewall.foo", "rule.0.cidr_list.0", "10.1.1.10/32"),
8585
resource.TestCheckResourceAttr(
86-
"cloudstack_egress_firewall.foo", "rule.1558935996.cidr_list.2966983089", "10.1.1.11/32"),
86+
"cloudstack_egress_firewall.foo", "rule.0.cidr_list.1", "10.1.1.11/32"),
8787
resource.TestCheckResourceAttr(
88-
"cloudstack_egress_firewall.foo", "rule.1558935996.protocol", "tcp"),
88+
"cloudstack_egress_firewall.foo", "rule.0.protocol", "tcp"),
8989
resource.TestCheckResourceAttr(
90-
"cloudstack_egress_firewall.foo", "rule.1558935996.ports.32925333", "8080"),
90+
"cloudstack_egress_firewall.foo", "rule.0.ports.0", "8080"),
9191
resource.TestCheckResourceAttr(
92-
"cloudstack_egress_firewall.foo", "rule.2961518528.cidr_list.140834516", "10.1.1.10/32"),
92+
"cloudstack_egress_firewall.foo", "rule.1.cidr_list.0", "10.1.1.10/32"),
9393
resource.TestCheckResourceAttr(
94-
"cloudstack_egress_firewall.foo", "rule.2961518528.protocol", "tcp"),
94+
"cloudstack_egress_firewall.foo", "rule.1.protocol", "tcp"),
9595
resource.TestCheckResourceAttr(
96-
"cloudstack_egress_firewall.foo", "rule.2961518528.ports.1889509032", "80"),
96+
"cloudstack_egress_firewall.foo", "rule.1.ports.1", "80"),
9797
),
9898
},
9999
},

‎cloudstack/resource_cloudstack_firewall_test.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ func TestAccCloudStackFirewall_basic(t *testing.T) {
4242
resource.TestCheckResourceAttr(
4343
"cloudstack_firewall.foo", "rule.#", "2"),
4444
resource.TestCheckResourceAttr(
45-
"cloudstack_firewall.foo", "rule.2263505090.cidr_list.3482919157", "10.0.0.0/24"),
45+
"cloudstack_firewall.foo", "rule.1.cidr_list.0", "10.0.0.0/24"),
4646
resource.TestCheckResourceAttr(
47-
"cloudstack_firewall.foo", "rule.2263505090.protocol", "tcp"),
47+
"cloudstack_firewall.foo", "rule.1.protocol", "tcp"),
4848
resource.TestCheckResourceAttr(
49-
"cloudstack_firewall.foo", "rule.2263505090.ports.32925333", "8080"),
49+
"cloudstack_firewall.foo", "rule.1.ports.0", "8080"),
5050
resource.TestCheckResourceAttr(
51-
"cloudstack_firewall.foo", "rule.3782201428.cidr_list.3482919157", "10.0.0.0/24"),
51+
"cloudstack_firewall.foo", "rule.0.cidr_list.0", "10.0.0.0/24"),
5252
resource.TestCheckResourceAttr(
53-
"cloudstack_firewall.foo", "rule.3782201428.protocol", "tcp"),
53+
"cloudstack_firewall.foo", "rule.0.protocol", "tcp"),
5454
resource.TestCheckResourceAttr(
55-
"cloudstack_firewall.foo", "rule.3782201428.ports.1209010669", "1000-2000"),
55+
"cloudstack_firewall.foo", "rule.0.ports.0", "1000-2000"),
5656
resource.TestCheckResourceAttr(
57-
"cloudstack_firewall.foo", "rule.3782201428.ports.1889509032", "80"),
57+
"cloudstack_firewall.foo", "rule.0.ports.1", "80"),
5858
),
5959
},
6060
},
@@ -74,19 +74,19 @@ func TestAccCloudStackFirewall_update(t *testing.T) {
7474
resource.TestCheckResourceAttr(
7575
"cloudstack_firewall.foo", "rule.#", "2"),
7676
resource.TestCheckResourceAttr(
77-
"cloudstack_firewall.foo", "rule.2263505090.cidr_list.3482919157", "10.0.0.0/24"),
77+
"cloudstack_firewall.foo", "rule.1.cidr_list.0", "10.0.0.0/24"),
7878
resource.TestCheckResourceAttr(
79-
"cloudstack_firewall.foo", "rule.2263505090.protocol", "tcp"),
79+
"cloudstack_firewall.foo", "rule.1.protocol", "tcp"),
8080
resource.TestCheckResourceAttr(
81-
"cloudstack_firewall.foo", "rule.2263505090.ports.32925333", "8080"),
81+
"cloudstack_firewall.foo", "rule.1.ports.0", "8080"),
8282
resource.TestCheckResourceAttr(
83-
"cloudstack_firewall.foo", "rule.3782201428.cidr_list.3482919157", "10.0.0.0/24"),
83+
"cloudstack_firewall.foo", "rule.0.cidr_list.0", "10.0.0.0/24"),
8484
resource.TestCheckResourceAttr(
85-
"cloudstack_firewall.foo", "rule.3782201428.protocol", "tcp"),
85+
"cloudstack_firewall.foo", "rule.0.protocol", "tcp"),
8686
resource.TestCheckResourceAttr(
87-
"cloudstack_firewall.foo", "rule.3782201428.ports.1209010669", "1000-2000"),
87+
"cloudstack_firewall.foo", "rule.0.ports.0", "1000-2000"),
8888
resource.TestCheckResourceAttr(
89-
"cloudstack_firewall.foo", "rule.3782201428.ports.1889509032", "80"),
89+
"cloudstack_firewall.foo", "rule.0.ports.1", "80"),
9090
),
9191
},
9292

@@ -97,29 +97,29 @@ func TestAccCloudStackFirewall_update(t *testing.T) {
9797
resource.TestCheckResourceAttr(
9898
"cloudstack_firewall.foo", "rule.#", "3"),
9999
resource.TestCheckResourceAttr(
100-
"cloudstack_firewall.foo", "rule.3529885171.cidr_list.80081744", "10.0.1.0/24"),
100+
"cloudstack_firewall.foo", "rule.0.cidr_list.1", "10.0.1.0/24"),
101101
resource.TestCheckResourceAttr(
102-
"cloudstack_firewall.foo", "rule.3529885171.cidr_list.3482919157", "10.0.0.0/24"),
102+
"cloudstack_firewall.foo", "rule.0.cidr_list.0", "10.0.0.0/24"),
103103
resource.TestCheckResourceAttr(
104-
"cloudstack_firewall.foo", "rule.3529885171.protocol", "tcp"),
104+
"cloudstack_firewall.foo", "rule.0.protocol", "tcp"),
105105
resource.TestCheckResourceAttr(
106-
"cloudstack_firewall.foo", "rule.3529885171.ports.32925333", "8080"),
106+
"cloudstack_firewall.foo", "rule.0.ports.0", "8080"),
107107
resource.TestCheckResourceAttr(
108-
"cloudstack_firewall.foo", "rule.3782201428.cidr_list.3482919157", "10.0.0.0/24"),
108+
"cloudstack_firewall.foo", "rule.1.cidr_list.0", "10.0.0.0/24"),
109109
resource.TestCheckResourceAttr(
110-
"cloudstack_firewall.foo", "rule.3782201428.protocol", "tcp"),
110+
"cloudstack_firewall.foo", "rule.1.protocol", "tcp"),
111111
resource.TestCheckResourceAttr(
112-
"cloudstack_firewall.foo", "rule.3782201428.ports.1209010669", "1000-2000"),
112+
"cloudstack_firewall.foo", "rule.1.ports.0", "1000-2000"),
113113
resource.TestCheckResourceAttr(
114-
"cloudstack_firewall.foo", "rule.3782201428.ports.1889509032", "80"),
114+
"cloudstack_firewall.foo", "rule.1.ports.1", "80"),
115115
resource.TestCheckResourceAttr(
116-
"cloudstack_firewall.foo", "rule.4160426500.cidr_list.2835005819", "172.16.100.0/24"),
116+
"cloudstack_firewall.foo", "rule.2.cidr_list.0", "172.16.100.0/24"),
117117
resource.TestCheckResourceAttr(
118-
"cloudstack_firewall.foo", "rule.4160426500.protocol", "tcp"),
118+
"cloudstack_firewall.foo", "rule.2.protocol", "tcp"),
119119
resource.TestCheckResourceAttr(
120-
"cloudstack_firewall.foo", "rule.4160426500.ports.1889509032", "80"),
120+
"cloudstack_firewall.foo", "rule.2.ports.1", "80"),
121121
resource.TestCheckResourceAttr(
122-
"cloudstack_firewall.foo", "rule.4160426500.ports.3638101695", "443"),
122+
"cloudstack_firewall.foo", "rule.2.ports.0", "443"),
123123
),
124124
},
125125
},

‎cloudstack/resource_cloudstack_network_acl_rule_test.go

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@ func TestAccCloudStackNetworkACLRule_basic(t *testing.T) {
4242
resource.TestCheckResourceAttr(
4343
"cloudstack_network_acl_rule.foo", "rule.#", "3"),
4444
resource.TestCheckResourceAttr(
45-
"cloudstack_network_acl_rule.foo", "rule.2898748868.action", "allow"),
45+
"cloudstack_network_acl_rule.foo", "rule.0.action", "allow"),
4646
resource.TestCheckResourceAttr(
47-
"cloudstack_network_acl_rule.foo", "rule.2898748868.cidr_list.2835005819", "172.16.100.0/24"),
47+
"cloudstack_network_acl_rule.foo", "rule.0.cidr_list.0", "172.16.100.0/24"),
4848
resource.TestCheckResourceAttr(
49-
"cloudstack_network_acl_rule.foo", "rule.2898748868.protocol", "tcp"),
49+
"cloudstack_network_acl_rule.foo", "rule.0.protocol", "tcp"),
5050
resource.TestCheckResourceAttr(
51-
"cloudstack_network_acl_rule.foo", "rule.2898748868.ports.#", "2"),
51+
"cloudstack_network_acl_rule.foo", "rule.0.ports.#", "2"),
5252
resource.TestCheckResourceAttr(
53-
"cloudstack_network_acl_rule.foo", "rule.2898748868.ports.1889509032", "80"),
53+
"cloudstack_network_acl_rule.foo", "rule.0.ports.1", "80"),
5454
resource.TestCheckResourceAttr(
55-
"cloudstack_network_acl_rule.foo", "rule.2898748868.ports.3638101695", "443"),
55+
"cloudstack_network_acl_rule.foo", "rule.0.ports.0", "443"),
5656
resource.TestCheckResourceAttr(
57-
"cloudstack_network_acl_rule.foo", "rule.2898748868.traffic_type", "ingress"),
57+
"cloudstack_network_acl_rule.foo", "rule.0.traffic_type", "ingress"),
5858
resource.TestCheckResourceAttr(
59-
"cloudstack_network_acl_rule.foo", "rule.1480917538.action", "allow"),
59+
"cloudstack_network_acl_rule.foo", "rule.1.action", "allow"),
6060
resource.TestCheckResourceAttr(
61-
"cloudstack_network_acl_rule.foo", "rule.1480917538.cidr_list.#", "1"),
61+
"cloudstack_network_acl_rule.foo", "rule.1.cidr_list.#", "1"),
6262
resource.TestCheckResourceAttr(
63-
"cloudstack_network_acl_rule.foo", "rule.1480917538.cidr_list.3056857544", "172.18.100.0/24"),
63+
"cloudstack_network_acl_rule.foo", "rule.1.cidr_list.0", "172.18.100.0/24"),
6464
resource.TestCheckResourceAttr(
65-
"cloudstack_network_acl_rule.foo", "rule.1480917538.icmp_code", "-1"),
65+
"cloudstack_network_acl_rule.foo", "rule.1.icmp_code", "-1"),
6666
resource.TestCheckResourceAttr(
67-
"cloudstack_network_acl_rule.foo", "rule.1480917538.icmp_type", "-1"),
67+
"cloudstack_network_acl_rule.foo", "rule.1.icmp_type", "-1"),
6868
resource.TestCheckResourceAttr(
69-
"cloudstack_network_acl_rule.foo", "rule.1480917538.traffic_type", "ingress"),
69+
"cloudstack_network_acl_rule.foo", "rule.1.traffic_type", "ingress"),
7070
),
7171
},
7272
},
@@ -86,31 +86,31 @@ func TestAccCloudStackNetworkACLRule_update(t *testing.T) {
8686
resource.TestCheckResourceAttr(
8787
"cloudstack_network_acl_rule.foo", "rule.#", "3"),
8888
resource.TestCheckResourceAttr(
89-
"cloudstack_network_acl_rule.foo", "rule.2898748868.action", "allow"),
89+
"cloudstack_network_acl_rule.foo", "rule.0.action", "allow"),
9090
resource.TestCheckResourceAttr(
91-
"cloudstack_network_acl_rule.foo", "rule.2898748868.cidr_list.2835005819", "172.16.100.0/24"),
91+
"cloudstack_network_acl_rule.foo", "rule.0.cidr_list.0", "172.16.100.0/24"),
9292
resource.TestCheckResourceAttr(
93-
"cloudstack_network_acl_rule.foo", "rule.2898748868.protocol", "tcp"),
93+
"cloudstack_network_acl_rule.foo", "rule.0.protocol", "tcp"),
9494
resource.TestCheckResourceAttr(
95-
"cloudstack_network_acl_rule.foo", "rule.2898748868.ports.#", "2"),
95+
"cloudstack_network_acl_rule.foo", "rule.0.ports.#", "2"),
9696
resource.TestCheckResourceAttr(
97-
"cloudstack_network_acl_rule.foo", "rule.2898748868.ports.1889509032", "80"),
97+
"cloudstack_network_acl_rule.foo", "rule.0.ports.1", "80"),
9898
resource.TestCheckResourceAttr(
99-
"cloudstack_network_acl_rule.foo", "rule.2898748868.ports.3638101695", "443"),
99+
"cloudstack_network_acl_rule.foo", "rule.0.ports.0", "443"),
100100
resource.TestCheckResourceAttr(
101-
"cloudstack_network_acl_rule.foo", "rule.2898748868.traffic_type", "ingress"),
101+
"cloudstack_network_acl_rule.foo", "rule.0.traffic_type", "ingress"),
102102
resource.TestCheckResourceAttr(
103-
"cloudstack_network_acl_rule.foo", "rule.1480917538.action", "allow"),
103+
"cloudstack_network_acl_rule.foo", "rule.1.action", "allow"),
104104
resource.TestCheckResourceAttr(
105-
"cloudstack_network_acl_rule.foo", "rule.1480917538.cidr_list.#", "1"),
105+
"cloudstack_network_acl_rule.foo", "rule.1.cidr_list.#", "1"),
106106
resource.TestCheckResourceAttr(
107-
"cloudstack_network_acl_rule.foo", "rule.1480917538.cidr_list.3056857544", "172.18.100.0/24"),
107+
"cloudstack_network_acl_rule.foo", "rule.1.cidr_list.0", "172.18.100.0/24"),
108108
resource.TestCheckResourceAttr(
109-
"cloudstack_network_acl_rule.foo", "rule.1480917538.icmp_code", "-1"),
109+
"cloudstack_network_acl_rule.foo", "rule.1.icmp_code", "-1"),
110110
resource.TestCheckResourceAttr(
111-
"cloudstack_network_acl_rule.foo", "rule.1480917538.icmp_type", "-1"),
111+
"cloudstack_network_acl_rule.foo", "rule.1.icmp_type", "-1"),
112112
resource.TestCheckResourceAttr(
113-
"cloudstack_network_acl_rule.foo", "rule.1480917538.traffic_type", "ingress"),
113+
"cloudstack_network_acl_rule.foo", "rule.1.traffic_type", "ingress"),
114114
),
115115
},
116116

@@ -121,47 +121,47 @@ func TestAccCloudStackNetworkACLRule_update(t *testing.T) {
121121
resource.TestCheckResourceAttr(
122122
"cloudstack_network_acl_rule.foo", "rule.#", "4"),
123123
resource.TestCheckResourceAttr(
124-
"cloudstack_network_acl_rule.foo", "rule.1724235854.action", "deny"),
124+
"cloudstack_network_acl_rule.foo", "rule.1.action", "deny"),
125125
resource.TestCheckResourceAttr(
126-
"cloudstack_network_acl_rule.foo", "rule.1724235854.cidr_list.3482919157", "10.0.0.0/24"),
126+
"cloudstack_network_acl_rule.foo", "rule.1.cidr_list.0", "10.0.0.0/24"),
127127
resource.TestCheckResourceAttr(
128-
"cloudstack_network_acl_rule.foo", "rule.1724235854.protocol", "tcp"),
128+
"cloudstack_network_acl_rule.foo", "rule.1.protocol", "tcp"),
129129
resource.TestCheckResourceAttr(
130-
"cloudstack_network_acl_rule.foo", "rule.1724235854.ports.#", "2"),
130+
"cloudstack_network_acl_rule.foo", "rule.1.ports.#", "2"),
131131
resource.TestCheckResourceAttr(
132-
"cloudstack_network_acl_rule.foo", "rule.1724235854.ports.1209010669", "1000-2000"),
132+
"cloudstack_network_acl_rule.foo", "rule.1.ports.0", "1000-2000"),
133133
resource.TestCheckResourceAttr(
134-
"cloudstack_network_acl_rule.foo", "rule.1724235854.ports.1889509032", "80"),
134+
"cloudstack_network_acl_rule.foo", "rule.1.ports.1", "80"),
135135
resource.TestCheckResourceAttr(
136-
"cloudstack_network_acl_rule.foo", "rule.1724235854.traffic_type", "egress"),
136+
"cloudstack_network_acl_rule.foo", "rule.1.traffic_type", "egress"),
137137
resource.TestCheckResourceAttr(
138-
"cloudstack_network_acl_rule.foo", "rule.2090315355.action", "deny"),
138+
"cloudstack_network_acl_rule.foo", "rule.2.action", "deny"),
139139
resource.TestCheckResourceAttr(
140-
"cloudstack_network_acl_rule.foo", "rule.2090315355.cidr_list.#", "2"),
140+
"cloudstack_network_acl_rule.foo", "rule.2.cidr_list.#", "2"),
141141
resource.TestCheckResourceAttr(
142-
"cloudstack_network_acl_rule.foo", "rule.2090315355.cidr_list.2104435309", "172.18.101.0/24"),
142+
"cloudstack_network_acl_rule.foo", "rule.2.cidr_list.1", "172.18.101.0/24"),
143143
resource.TestCheckResourceAttr(
144-
"cloudstack_network_acl_rule.foo", "rule.2090315355.cidr_list.3056857544", "172.18.100.0/24"),
144+
"cloudstack_network_acl_rule.foo", "rule.2.cidr_list.0", "172.18.100.0/24"),
145145
resource.TestCheckResourceAttr(
146-
"cloudstack_network_acl_rule.foo", "rule.2090315355.icmp_code", "-1"),
146+
"cloudstack_network_acl_rule.foo", "rule.2.icmp_code", "-1"),
147147
resource.TestCheckResourceAttr(
148-
"cloudstack_network_acl_rule.foo", "rule.2090315355.icmp_type", "-1"),
148+
"cloudstack_network_acl_rule.foo", "rule.2.icmp_type", "-1"),
149149
resource.TestCheckResourceAttr(
150-
"cloudstack_network_acl_rule.foo", "rule.2090315355.traffic_type", "ingress"),
150+
"cloudstack_network_acl_rule.foo", "rule.2.traffic_type", "ingress"),
151151
resource.TestCheckResourceAttr(
152-
"cloudstack_network_acl_rule.foo", "rule.2576683033.action", "allow"),
152+
"cloudstack_network_acl_rule.foo", "rule.0.action", "allow"),
153153
resource.TestCheckResourceAttr(
154-
"cloudstack_network_acl_rule.foo", "rule.2576683033.cidr_list.3056857544", "172.18.100.0/24"),
154+
"cloudstack_network_acl_rule.foo", "rule.0.cidr_list.0", "172.18.100.0/24"),
155155
resource.TestCheckResourceAttr(
156-
"cloudstack_network_acl_rule.foo", "rule.2576683033.protocol", "tcp"),
156+
"cloudstack_network_acl_rule.foo", "rule.0.protocol", "tcp"),
157157
resource.TestCheckResourceAttr(
158-
"cloudstack_network_acl_rule.foo", "rule.2576683033.ports.#", "2"),
158+
"cloudstack_network_acl_rule.foo", "rule.0.ports.#", "2"),
159159
resource.TestCheckResourceAttr(
160-
"cloudstack_network_acl_rule.foo", "rule.2576683033.ports.1889509032", "80"),
160+
"cloudstack_network_acl_rule.foo", "rule.0.ports.1", "80"),
161161
resource.TestCheckResourceAttr(
162-
"cloudstack_network_acl_rule.foo", "rule.2576683033.ports.3638101695", "443"),
162+
"cloudstack_network_acl_rule.foo", "rule.0.ports.0", "443"),
163163
resource.TestCheckResourceAttr(
164-
"cloudstack_network_acl_rule.foo", "rule.2576683033.traffic_type", "ingress"),
164+
"cloudstack_network_acl_rule.foo", "rule.0.traffic_type", "ingress"),
165165
),
166166
},
167167
},

0 commit comments

Comments
 (0)