fix(k8s): fix waiting for multicloud cluster (#1325)

Author: remyleone

scaleway/resource_k8s_cluster.go

@@ -385,8 +385,13 @@ func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceDat
 	}
 
 	d.SetId(newRegionalIDString(region, res.ID))
-
-	_, err = waitK8SClusterPool(ctx, k8sAPI, region, res.ID, d.Timeout(schema.TimeoutCreate))
+	if clusterType.(string) == "multicloud" {
+		// In case of multi-cloud, we do not have the guarantee that a pool will be created in Scaleway.
+		_, err = waitK8SCluster(ctx, k8sAPI, region, res.ID, d.Timeout(schema.TimeoutCreate))
+	} else {
+		// If we are not in multi-cloud, we can wait for the pool to be created.
+		_, err = waitK8SClusterPool(ctx, k8sAPI, region, res.ID, d.Timeout(schema.TimeoutCreate))
+	}
 	if err != nil {
 		return diag.FromErr(err)
 	}

scaleway/resource_k8s_cluster_test.go

@@ -384,6 +384,30 @@ func TestAccScalewayK8SCluster_AutoUpgrade(t *testing.T) {
 	})
 }
 
+func TestAccScalewayK8SCluster_Multicloud(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+
+	latestK8SVersion := testAccScalewayK8SClusterGetLatestK8SVersion(tt)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayK8SClusterDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckScalewayK8SClusterMulticloud(latestK8SVersion),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.multicloud"),
+					resource.TestCheckResourceAttr("scaleway_k8s_cluster.multicloud", "version", latestK8SVersion),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckScalewayK8SClusterDestroy(tt *TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		for _, rs := range state.RootModule().Resources {
@@ -543,3 +567,21 @@ resource "scaleway_k8s_cluster" "auto_upgrade" {
 	tags = [ "terraform-test", "scaleway_k8s_cluster", "auto_upgrade" ]
 }`, version, enable, hour, day)
 }
+
+func testAccCheckScalewayK8SClusterMulticloud(version string) string {
+	return fmt.Sprintf(`
+resource "scaleway_k8s_cluster" "multicloud" {
+	name = "test-multicloud"
+	version = "%s"
+	cni = "kilo"
+	type = "multicloud"
+}
+
+resource "scaleway_k8s_pool" "multicloud" {
+	cluster_id = "${scaleway_k8s_cluster.multicloud.id}"
+	name = "test-multicloud"
+	node_type = "DEV1-M"
+	size = 1
+}
+`, version)
+}