Skip to content

Commit 6f0facc

Browse files
Mia-CrossMia-Cross
authored
test(k8s): reorder sweepers (#2227)
1 parent e6b53ab commit 6f0facc

21 files changed

+12587
-10808
lines changed

‎scaleway/data_source_k8s_cluster_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ func TestAccScalewayDataSourceK8SCluster_Basic(t *testing.T) {
1616
PreCheck: func() { testAccPreCheck(t) },
1717
ProviderFactories: tt.ProviderFactories,
1818
CheckDestroy: resource.ComposeTestCheckFunc(
19-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
20-
testAccCheckScalewayK8SClusterDestroy(tt),
2119
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
20+
testAccCheckScalewayK8SClusterDestroy(tt),
21+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
2222
),
2323
Steps: []resource.TestStep{
2424
{

‎scaleway/data_source_k8s_pool_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ func TestAccScalewayDataSourceK8SPool_Basic(t *testing.T) {
1717
PreCheck: func() { testAccPreCheck(t) },
1818
ProviderFactories: tt.ProviderFactories,
1919
CheckDestroy: resource.ComposeTestCheckFunc(
20-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
21-
testAccCheckScalewayK8SClusterDestroy(tt),
2220
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
21+
testAccCheckScalewayK8SClusterDestroy(tt),
22+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
2323
),
2424
Steps: []resource.TestStep{
2525
{

‎scaleway/resource_k8s_cluster_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ func TestAccScalewayK8SCluster_Basic(t *testing.T) {
127127
},
128128
ProviderFactories: tt.ProviderFactories,
129129
CheckDestroy: resource.ComposeTestCheckFunc(
130-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
131130
testAccCheckScalewayK8SClusterDestroy(tt),
131+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
132132
),
133133
Steps: []resource.TestStep{
134134
{
@@ -183,8 +183,8 @@ func TestAccScalewayK8SCluster_Autoscaling(t *testing.T) {
183183
},
184184
ProviderFactories: tt.ProviderFactories,
185185
CheckDestroy: resource.ComposeTestCheckFunc(
186-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
187186
testAccCheckScalewayK8SClusterDestroy(tt),
187+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
188188
),
189189
Steps: []resource.TestStep{
190190
{
@@ -259,8 +259,8 @@ func TestAccScalewayK8SCluster_OIDC(t *testing.T) {
259259
},
260260
ProviderFactories: tt.ProviderFactories,
261261
CheckDestroy: resource.ComposeTestCheckFunc(
262-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
263262
testAccCheckScalewayK8SClusterDestroy(tt),
263+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
264264
),
265265
Steps: []resource.TestStep{
266266
{
@@ -329,8 +329,8 @@ func TestAccScalewayK8SCluster_AutoUpgrade(t *testing.T) {
329329
},
330330
ProviderFactories: tt.ProviderFactories,
331331
CheckDestroy: resource.ComposeTestCheckFunc(
332-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
333332
testAccCheckScalewayK8SClusterDestroy(tt),
333+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
334334
),
335335
Steps: []resource.TestStep{
336336
{
@@ -411,8 +411,8 @@ func TestAccScalewayK8SCluster_PrivateNetwork(t *testing.T) {
411411
},
412412
ProviderFactories: tt.ProviderFactories,
413413
CheckDestroy: resource.ComposeTestCheckFunc(
414-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
415414
testAccCheckScalewayK8SClusterDestroy(tt),
415+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
416416
),
417417
Steps: []resource.TestStep{
418418
{
@@ -476,8 +476,8 @@ func TestAccScalewayK8SCluster_TypeChange(t *testing.T) {
476476
},
477477
ProviderFactories: tt.ProviderFactories,
478478
CheckDestroy: resource.ComposeTestCheckFunc(
479-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
480479
testAccCheckScalewayK8SClusterDestroy(tt),
480+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
481481
),
482482
Steps: []resource.TestStep{
483483
{

‎scaleway/resource_k8s_pool_test.go

Lines changed: 24 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ func TestAccScalewayK8SCluster_PoolBasic(t *testing.T) {
2222
PreCheck: func() { testAccPreCheck(t) },
2323
ProviderFactories: tt.ProviderFactories,
2424
CheckDestroy: resource.ComposeTestCheckFunc(
25-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
26-
testAccCheckScalewayK8SClusterDestroy(tt),
2725
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
2826
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
27+
testAccCheckScalewayK8SClusterDestroy(tt),
28+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
2929
),
3030
Steps: []resource.TestStep{
3131
{
@@ -42,6 +42,7 @@ func TestAccScalewayK8SCluster_PoolBasic(t *testing.T) {
4242
resource.TestCheckResourceAttr("scaleway_k8s_pool.default", "tags.0", "terraform-test"),
4343
resource.TestCheckResourceAttr("scaleway_k8s_pool.default", "tags.1", "scaleway_k8s_cluster"),
4444
resource.TestCheckResourceAttr("scaleway_k8s_pool.default", "tags.2", "default"),
45+
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.default", "scaleway_vpc_private_network.minimal"),
4546
),
4647
},
4748
{
@@ -58,13 +59,17 @@ func TestAccScalewayK8SCluster_PoolBasic(t *testing.T) {
5859
resource.TestCheckResourceAttr("scaleway_k8s_pool.minimal", "tags.0", "terraform-test"),
5960
resource.TestCheckResourceAttr("scaleway_k8s_pool.minimal", "tags.1", "scaleway_k8s_cluster"),
6061
resource.TestCheckResourceAttr("scaleway_k8s_pool.minimal", "tags.2", "minimal"),
62+
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.default", "scaleway_vpc_private_network.minimal"),
63+
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.minimal", "scaleway_vpc_private_network.minimal"),
6164
),
6265
},
6366
{
6467
Config: testAccCheckScalewayK8SPoolConfigMinimal(latestK8SVersion, false),
6568
Check: resource.ComposeTestCheckFunc(
6669
testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.minimal"),
70+
testAccCheckScalewayK8SPoolExists(tt, "scaleway_k8s_pool.default"),
6771
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
72+
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.default", "scaleway_vpc_private_network.minimal"),
6873
),
6974
},
7075
},
@@ -79,10 +84,10 @@ func TestAccScalewayK8SCluster_PoolWait(t *testing.T) {
7984
PreCheck: func() { testAccPreCheck(t) },
8085
ProviderFactories: tt.ProviderFactories,
8186
CheckDestroy: resource.ComposeTestCheckFunc(
82-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
83-
testAccCheckScalewayK8SClusterDestroy(tt),
8487
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
8588
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
89+
testAccCheckScalewayK8SClusterDestroy(tt),
90+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
8691
),
8792
Steps: []resource.TestStep{
8893
{
@@ -160,10 +165,10 @@ func TestAccScalewayK8SCluster_PoolPlacementGroup(t *testing.T) {
160165
PreCheck: func() { testAccPreCheck(t) },
161166
ProviderFactories: tt.ProviderFactories,
162167
CheckDestroy: resource.ComposeTestCheckFunc(
163-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
164-
testAccCheckScalewayK8SClusterDestroy(tt),
165168
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group"),
166169
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group_2"),
170+
testAccCheckScalewayK8SClusterDestroy(tt),
171+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
167172
),
168173
Steps: []resource.TestStep{
169174
{
@@ -217,9 +222,9 @@ func TestAccScalewayK8SCluster_PoolUpgradePolicy(t *testing.T) {
217222
PreCheck: func() { testAccPreCheck(t) },
218223
ProviderFactories: tt.ProviderFactories,
219224
CheckDestroy: resource.ComposeTestCheckFunc(
220-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
221-
testAccCheckScalewayK8SClusterDestroy(tt),
222225
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.upgrade_policy"),
226+
testAccCheckScalewayK8SClusterDestroy(tt),
227+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
223228
),
224229
Steps: []resource.TestStep{
225230
{
@@ -272,9 +277,9 @@ func TestAccScalewayK8SCluster_PoolKubeletArgs(t *testing.T) {
272277
PreCheck: func() { testAccPreCheck(t) },
273278
ProviderFactories: tt.ProviderFactories,
274279
CheckDestroy: resource.ComposeTestCheckFunc(
275-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
276-
testAccCheckScalewayK8SClusterDestroy(tt),
277280
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.kubelet_args"),
281+
testAccCheckScalewayK8SClusterDestroy(tt),
282+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
278283
),
279284
Steps: []resource.TestStep{
280285
{
@@ -311,9 +316,9 @@ func TestAccScalewayK8SCluster_PoolZone(t *testing.T) {
311316
PreCheck: func() { testAccPreCheck(t) },
312317
ProviderFactories: tt.ProviderFactories,
313318
CheckDestroy: resource.ComposeTestCheckFunc(
314-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
315-
testAccCheckScalewayK8SClusterDestroy(tt),
316319
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.zone"),
320+
testAccCheckScalewayK8SClusterDestroy(tt),
321+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
317322
),
318323
Steps: []resource.TestStep{
319324
{
@@ -340,9 +345,9 @@ func TestAccScalewayK8SCluster_PoolSize(t *testing.T) {
340345
PreCheck: func() { testAccPreCheck(t) },
341346
ProviderFactories: tt.ProviderFactories,
342347
CheckDestroy: resource.ComposeTestCheckFunc(
343-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
344-
testAccCheckScalewayK8SClusterDestroy(tt),
345348
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.pool"),
349+
testAccCheckScalewayK8SClusterDestroy(tt),
350+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
346351
),
347352
Steps: []resource.TestStep{
348353
{
@@ -407,63 +412,6 @@ func TestAccScalewayK8SCluster_PoolSize(t *testing.T) {
407412
})
408413
}
409414

410-
func TestAccScalewayK8SCluster_PoolPrivateNetwork(t *testing.T) {
411-
tt := NewTestTools(t)
412-
defer tt.Cleanup()
413-
414-
latestK8SVersion := testAccScalewayK8SClusterGetLatestK8SVersion(tt)
415-
416-
resource.ParallelTest(t, resource.TestCase{
417-
PreCheck: func() { testAccPreCheck(t) },
418-
ProviderFactories: tt.ProviderFactories,
419-
CheckDestroy: resource.ComposeTestCheckFunc(
420-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
421-
testAccCheckScalewayK8SClusterDestroy(tt),
422-
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.pool_with_pn"),
423-
),
424-
Steps: []resource.TestStep{
425-
{
426-
Config: fmt.Sprintf(`
427-
resource "scaleway_vpc" "vpc" {
428-
name = "test-k8s-private-network"
429-
}
430-
resource "scaleway_vpc_private_network" "pn" {
431-
name = "test-k8s-private-network"
432-
vpc_id = scaleway_vpc.vpc.id
433-
}
434-
435-
resource "scaleway_k8s_cluster" "cluster_with_pn" {
436-
name = "test-k8s-private-network"
437-
version = "%s"
438-
cni = "cilium"
439-
private_network_id = scaleway_vpc_private_network.pn.id
440-
tags = [ "terraform-test", "scaleway_k8s_cluster", "private_network" ]
441-
delete_additional_resources = true
442-
depends_on = [scaleway_vpc_private_network.pn]
443-
}
444-
445-
resource "scaleway_k8s_pool" "pool_with_pn" {
446-
cluster_id = scaleway_k8s_cluster.cluster_with_pn.id
447-
name = "pool"
448-
node_type = "gp1_xs"
449-
size = 2
450-
autoscaling = false
451-
autohealing = true
452-
wait_for_pool_ready = true
453-
depends_on = [scaleway_vpc_private_network.pn]
454-
}`, latestK8SVersion),
455-
Check: resource.ComposeTestCheckFunc(
456-
testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.cluster_with_pn"),
457-
testAccCheckScalewayVPCPrivateNetworkExists(tt, "scaleway_vpc_private_network.pn"),
458-
testAccCheckScalewayK8SPoolExists(tt, "scaleway_k8s_pool.pool_with_pn"),
459-
testAccCheckScalewayK8sClusterPrivateNetworkID(tt, "scaleway_k8s_cluster.cluster_with_pn", "scaleway_vpc_private_network.pn"),
460-
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.cluster_with_pn", "scaleway_k8s_pool.pool_with_pn", "scaleway_vpc_private_network.pn"),
461-
),
462-
},
463-
},
464-
})
465-
}
466-
467415
func TestAccScalewayK8SCluster_PoolPublicIPDisabled(t *testing.T) {
468416
tt := NewTestTools(t)
469417
defer tt.Cleanup()
@@ -474,12 +422,12 @@ func TestAccScalewayK8SCluster_PoolPublicIPDisabled(t *testing.T) {
474422
PreCheck: func() { testAccPreCheck(t) },
475423
ProviderFactories: tt.ProviderFactories,
476424
CheckDestroy: resource.ComposeTestCheckFunc(
477-
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
478-
testAccCheckScalewayVPCPublicGatewayDestroy(tt),
479-
testAccCheckScalewayVPCPublicGatewayDHCPDestroy(tt),
480-
testAccCheckScalewayVPCGatewayNetworkDestroy(tt),
481-
testAccCheckScalewayK8SClusterDestroy(tt),
482425
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.public_ip"),
426+
testAccCheckScalewayK8SClusterDestroy(tt),
427+
testAccCheckScalewayVPCGatewayNetworkDestroy(tt),
428+
testAccCheckScalewayVPCPublicGatewayDHCPDestroy(tt),
429+
testAccCheckScalewayVPCPublicGatewayDestroy(tt),
430+
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
483431
),
484432
Steps: []resource.TestStep{
485433
{

0 commit comments

Comments
 (0)