fix(k8s): handle regional IDs properly (scaleway#320)

Signed-off-by: Patrik Cyvoct <pcyvoct@scaleway.com>
clement-gilbert · Nov 18, 2019 · ef26e25 · ef26e25
1 parent 8245fab
commit ef26e25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/scaleway/resource_k8s_cluster_beta.go b/scaleway/resource_k8s_cluster_beta.go
@@ -301,7 +301,7 @@ func resourceScalewayK8SClusterBetaCreate(d *schema.ResourceData, m interface{})
 	}
 
 	if placementGroupID, ok := d.GetOk("default_pool.0.placement_group_id"); ok {
-		defaultPoolReq.PlacementGroupID = scw.StringPtr(placementGroupID.(string))
+		defaultPoolReq.PlacementGroupID = scw.StringPtr(expandID(placementGroupID.(string)))
 	}
 
 	defaultPoolReq.MinSize = scw.Uint32Ptr(uint32(d.Get("default_pool.0.min_size").(int)))
@@ -350,7 +350,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolRead(d *schema.ResourceData, m int
 	if defaultPoolID, ok := d.GetOk("default_pool.0.pool_id"); ok {
 		poolResp, err := k8sAPI.GetPool(&k8s.GetPoolRequest{
 			Region: region,
-			PoolID: defaultPoolID.(string),
+			PoolID: expandID(defaultPoolID.(string)),
 		})
 		if err != nil {
 			return err
@@ -373,7 +373,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolRead(d *schema.ResourceData, m int
 	}
 
 	defaultPool := map[string]interface{}{}
-	defaultPool["pool_id"] = pool.ID
+	defaultPool["pool_id"] = newRegionalId(region, pool.ID)
 	defaultPool["node_type"] = pool.NodeType
 	defaultPool["autoscaling"] = pool.Autoscaling
 	defaultPool["autohealing"] = pool.Autohealing
@@ -487,7 +487,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolUpdate(d *schema.ResourceData, m i
 
 		updateRequest := &k8s.UpdatePoolRequest{
 			Region: region,
-			PoolID: defaultPoolID,
+			PoolID: expandID(defaultPoolID),
 		}
 
 		if autohealing, ok := d.GetOk("default_pool.0.autohealing"); ok {
@@ -527,7 +527,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolUpdate(d *schema.ResourceData, m i
 				Size:        uint32(d.Get("default_pool.0.size").(int)),
 			}
 			if placementGroupID, ok := d.GetOk("default_pool.0.placement_group_id"); ok {
-				defaultPoolRequest.PlacementGroupID = scw.StringPtr(placementGroupID.(string))
+				defaultPoolRequest.PlacementGroupID = scw.StringPtr(expandID(placementGroupID.(string)))
 			}
 
 			if minSize, ok := d.GetOk("default_pool.0.min_size"); ok {
@@ -547,7 +547,7 @@ func resourceScalewayK8SClusterBetaDefaultPoolUpdate(d *schema.ResourceData, m i
 				return err
 			}
 			defaultPool := map[string]interface{}{}
-			defaultPool["pool_id"] = defaultPoolRes.ID
+			defaultPool["pool_id"] = newRegionalId(region, defaultPoolRes.ID)
 
 			d.Set("default_pool", []map[string]interface{}{defaultPool})
 

diff --git a/scaleway/resource_k8s_pool_beta.go b/scaleway/resource_k8s_pool_beta.go
@@ -124,7 +124,7 @@ func resourceScalewayK8SPoolBetaCreate(d *schema.ResourceData, m interface{}) er
 	}
 
 	if placementGroupID, ok := d.GetOk("placement_group_id"); ok {
-		req.PlacementGroupID = scw.StringPtr(placementGroupID.(string))
+		req.PlacementGroupID = scw.StringPtr(expandID(placementGroupID.(string)))
 	}
 
 	if minSize, ok := d.GetOk("min_size"); ok {