Skip to content

Commit 83f4e36

Browse files
Mia-CrossMia-Cross
committed
use set check functions in the tests
1 parent 08f1939 commit 83f4e36

File tree

1 file changed

+41
-23
lines changed

1 file changed

+41
-23
lines changed

‎internal/services/k8s/acl_test.go‎

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ func TestAccACL_Basic(t *testing.T) {
4646
resource.TestCheckResourceAttrPair("scaleway_k8s_acl.acl_basic", "cluster_id", "scaleway_k8s_cluster.acl_basic", "id"),
4747
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "no_ip_allowed", "false"),
4848
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.#", "1"),
49-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.ip", "1.2.3.4/32"),
50-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.scaleway_ranges", "false"),
51-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.description", "First rule"),
49+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_basic", "acl_rules.*", map[string]string{
50+
"ip": "1.2.3.4/32",
51+
"description": "First rule",
52+
"scaleway_ranges": "false",
53+
}),
5254
resource.TestCheckResourceAttrSet("scaleway_k8s_acl.acl_basic", "acl_rules.0.id"),
5355
),
5456
},
@@ -77,13 +79,17 @@ func TestAccACL_Basic(t *testing.T) {
7779
Check: resource.ComposeTestCheckFunc(
7880
resource.TestCheckResourceAttrPair("scaleway_k8s_acl.acl_basic", "cluster_id", "scaleway_k8s_cluster.acl_basic", "id"),
7981
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.#", "2"),
80-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.ip", "1.2.3.4/32"),
81-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.scaleway_ranges", "false"),
82-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.description", ""),
82+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_basic", "acl_rules.*", map[string]string{
83+
"ip": "1.2.3.4/32",
84+
"description": "",
85+
"scaleway_ranges": "false",
86+
}),
87+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_basic", "acl_rules.*", map[string]string{
88+
"ip": "5.6.7.0/30",
89+
"description": "",
90+
"scaleway_ranges": "false",
91+
}),
8392
resource.TestCheckResourceAttrSet("scaleway_k8s_acl.acl_basic", "acl_rules.0.id"),
84-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.1.ip", "5.6.7.0/30"),
85-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.1.scaleway_ranges", "false"),
86-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.1.description", ""),
8793
resource.TestCheckResourceAttrSet("scaleway_k8s_acl.acl_basic", "acl_rules.1.id"),
8894
),
8995
},
@@ -113,13 +119,17 @@ func TestAccACL_Basic(t *testing.T) {
113119
Check: resource.ComposeTestCheckFunc(
114120
resource.TestCheckResourceAttrPair("scaleway_k8s_acl.acl_basic", "cluster_id", "scaleway_k8s_cluster.acl_basic", "id"),
115121
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.#", "2"),
116-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.ip", "1.2.3.4/32"),
117-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.scaleway_ranges", "false"),
118-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.0.description", "First rule"),
122+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_basic", "acl_rules.*", map[string]string{
123+
"ip": "1.2.3.4/32",
124+
"description": "First rule",
125+
"scaleway_ranges": "false",
126+
}),
127+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_basic", "acl_rules.*", map[string]string{
128+
"ip": "",
129+
"description": "Scaleway ranges rule",
130+
"scaleway_ranges": "true",
131+
}),
119132
resource.TestCheckResourceAttrSet("scaleway_k8s_acl.acl_basic", "acl_rules.0.id"),
120-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.1.ip", ""),
121-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.1.scaleway_ranges", "true"),
122-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_basic", "acl_rules.1.description", "Scaleway ranges rule"),
123133
resource.TestCheckResourceAttrSet("scaleway_k8s_acl.acl_basic", "acl_rules.1.id"),
124134
),
125135
},
@@ -211,14 +221,22 @@ func TestAccACL_RulesOrder(t *testing.T) {
211221
Check: resource.ComposeTestCheckFunc(
212222
resource.TestCheckResourceAttrPair("scaleway_k8s_acl.acl_order", "cluster_id", "scaleway_k8s_cluster.acl_order", "id"),
213223
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.#", "4"),
214-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.0.ip", "12.2.3.4/32"),
215-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.1.ip", "1.2.3.4/32"),
216-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.2.ip", "11.2.3.4/32"),
217-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.3.ip", "1.2.3.7/32"),
218-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.0.description", "First rule"),
219-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.1.description", "Fourth rule"),
220-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.2.description", "Second rule"),
221-
resource.TestCheckResourceAttr("scaleway_k8s_acl.acl_order", "acl_rules.3.description", "Third rule"),
224+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_order", "acl_rules.*", map[string]string{
225+
"ip": "12.2.3.4/32",
226+
"description": "First rule",
227+
}),
228+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_order", "acl_rules.*", map[string]string{
229+
"ip": "11.2.3.4/32",
230+
"description": "Second rule",
231+
}),
232+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_order", "acl_rules.*", map[string]string{
233+
"ip": "1.2.3.7/32",
234+
"description": "Third rule",
235+
}),
236+
resource.TestCheckTypeSetElemNestedAttrs("scaleway_k8s_acl.acl_order", "acl_rules.*", map[string]string{
237+
"ip": "1.2.3.4/32",
238+
"description": "Fourth rule",
239+
}),
222240
),
223241
},
224242
{

0 commit comments

Comments
 (0)