fix(k8s): fix 500 in PoolPublicIPDisabled test (#2216)

scaleway · Nov 8, 2023 · 9954056 · 9954056
1 parent 62ecc53
commit 9954056
Show file tree

Hide file tree

Showing 20 changed files with 11,584 additions and 23,124 deletions.
diff --git a/scaleway/resource_k8s_pool.go b/scaleway/resource_k8s_pool.go
@@ -487,6 +487,16 @@ func resourceScalewayK8SPoolDelete(ctx context.Context, d *schema.ResourceData,
 		}
 	}
 
+	_, err = k8sAPI.WaitForPool(&k8s.WaitForPoolRequest{
+		PoolID: poolID,
+		Region: region,
+	}, scw.WithContext(ctx))
+	if err != nil {
+		if !is404Error(err) {
+			return diag.FromErr(err)
+		}
+	}
+
 	return nil
 }
 

diff --git a/scaleway/resource_k8s_pool_test.go b/scaleway/resource_k8s_pool_test.go
@@ -456,7 +456,7 @@ func TestAccScalewayK8SCluster_PoolPublicIPDisabled(t *testing.T) {
 			
 				resource "scaleway_k8s_pool" "public_ip" {
 				  cluster_id          = scaleway_k8s_cluster.public_ip.id
-				  name                = "pool"
+				  name                = "test-k8s-public-ip"
 				  node_type           = "gp1_xs"
 				  size                = 1
 				  autoscaling         = false
@@ -505,7 +505,7 @@ func TestAccScalewayK8SCluster_PoolPublicIPDisabled(t *testing.T) {
 
 				resource "scaleway_k8s_pool" "public_ip" {
 				  cluster_id          = scaleway_k8s_cluster.public_ip.id
-				  name                = "pool"
+				  name                = "test-k8s-public-ip"
 				  node_type           = "gp1_xs"
 				  size                = 1
 				  autoscaling         = false

diff --git a/scaleway/testdata/data-source-k8s-cluster-basic.cassette.yaml b/scaleway/testdata/data-source-k8s-cluster-basic.cassette.yaml
diff --git a/scaleway/testdata/data-source-k8s-pool-basic.cassette.yaml b/scaleway/testdata/data-source-k8s-pool-basic.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-auto-upgrade.cassette.yaml b/scaleway/testdata/k8s-cluster-auto-upgrade.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-autoscaling.cassette.yaml b/scaleway/testdata/k8s-cluster-autoscaling.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-basic.cassette.yaml b/scaleway/testdata/k8s-cluster-basic.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-multicloud.cassette.yaml b/scaleway/testdata/k8s-cluster-multicloud.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-oidc.cassette.yaml b/scaleway/testdata/k8s-cluster-oidc.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-basic.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-basic.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-kubelet-args.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-kubelet-args.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-placement-group.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-placement-group.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-private-network.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-private-network.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-public-ip-disabled.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-public-ip-disabled.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-size.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-size.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-upgrade-policy.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-upgrade-policy.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-wait.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-wait.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-pool-zone.cassette.yaml b/scaleway/testdata/k8s-cluster-pool-zone.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-private-network.cassette.yaml b/scaleway/testdata/k8s-cluster-private-network.cassette.yaml
diff --git a/scaleway/testdata/k8s-cluster-type-change.cassette.yaml b/scaleway/testdata/k8s-cluster-type-change.cassette.yaml