feat(instance): brk change, use TypeMap for user_data and remove user_data

Author: remyleone

scaleway/resource_instance_server.go

@@ -194,26 +194,11 @@ func resourceScalewayInstanceServer() *schema.Resource {
 				ValidateFunc: validation.StringLenBetween(0, 127998),
 			},
 			"user_data": {
-				Type:        schema.TypeSet,
+				Type:        schema.TypeMap,
 				Optional:    true,
-				MaxItems:    98,
 				Description: "The user data associated with the server", // TODO: document reserved keys (`cloud-init`)
-				Set:         userDataHash,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"key": {
-							Type:         schema.TypeString,
-							Required:     true,
-							ValidateFunc: validationStringNotInSlice([]string{"cloud-init"}, true),
-							Description:  "A user data key, the value \"cloud-init\" is not allowed",
-						},
-						"value": {
-							Type:         schema.TypeString,
-							Required:     true,
-							ValidateFunc: validation.StringLenBetween(0, 127998),
-							Description:  "A user value",
-						},
-					},
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
 				},
 			},
 			"zone":            zoneSchema(),
@@ -340,11 +325,9 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
 		UserData: make(map[string]io.Reader),
 	}
 
-	if allUserData, ok := d.GetOk("user_data"); ok {
-		userDataSet := allUserData.(*schema.Set)
-		for _, rawUserData := range userDataSet.List() {
-			userData := rawUserData.(map[string]interface{})
-			userDataRequests.UserData[userData["key"].(string)] = bytes.NewBufferString(userData["value"].(string))
+	if rawUserData, ok := d.GetOk("user_data"); ok {
+		for key, value := range rawUserData.(map[string]interface{}) {
+			userDataRequests.UserData[key] = bytes.NewBufferString(value.(string))
 		}
 	}
 
@@ -487,23 +470,20 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD
 		ServerID: ID,
 	}, scw.WithContext(ctx))
 
-	var userDataList []interface{}
+	userData := make(map[string]interface{})
 	for key, value := range allUserData.UserData {
-		userData, err := ioutil.ReadAll(value)
+		userDataValue, err := ioutil.ReadAll(value)
 		if err != nil {
 			return diag.FromErr(err)
 		}
-		if key != "cloud-init" {
-			userDataList = append(userDataList, map[string]interface{}{
-				"key":   key,
-				"value": string(userData),
-			})
-		} else {
-			_ = d.Set("cloud_init", string(userData))
-		}
-	}
-	if len(userDataList) > 0 {
-		_ = d.Set("user_data", schema.NewSet(userDataHash, userDataList))
+		//if key != "cloud-init" {
+		userData[key] = string(userDataValue)
+		//	} else {
+		//_ = d.Set("cloud_init", string(userDataValue))
+		//}
+	}
+	if len(userData) > 0 {
+		_ = d.Set("user_data", userData)
 	}
 
 	return nil

scaleway/resource_instance_server_test.go

@@ -346,7 +346,6 @@ func TestAccScalewayInstanceServer_UserData_WithCloudInitAtStart(t *testing.T) {
 		CheckDestroy:      testAccCheckScalewayInstanceServerDestroy(tt),
 		Steps: []resource.TestStep{
 			{
-				// With cloud-init and user data
 				Config: `
 				data "scaleway_instance_image" "ubuntu" {
 				 	architecture = "x86_64"
@@ -357,71 +356,19 @@ func TestAccScalewayInstanceServer_UserData_WithCloudInitAtStart(t *testing.T) {
 				 	image = "${data.scaleway_instance_image.ubuntu.id}"
 				 	type  = "DEV1-S"
 
-					user_data {
-				   		key   = "plop"
-				   		value = "world"
-				 	}
-				
-				 	user_data {
-				   		key   = "blanquette"
-				   		value = "hareng pomme à l'huile"
-				 	}
-					
-				 	cloud_init = <<EOF
+					user_data = {
+				   		foo   = "bar"
+						cloud-init =  <<EOF
 #cloud-config
 apt_update: true
 apt_upgrade: true
-EOF
+EOF 
+				 	}
 				}`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "user_data.0.key", "blanquette"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "user_data.0.value", "hareng pomme à l'huile"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "user_data.1.key", "plop"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "user_data.1.value", "world"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "cloud_init", "#cloud-config\napt_update: true\napt_upgrade: true\n"),
-				),
-			},
-			{
-				// With cloud-init and without user data
-				Config: `
-					data "scaleway_instance_image" "ubuntu" {
-						architecture = "x86_64"
-						name         = "Ubuntu 20.04 Focal Fossa"
-					}
-
-					resource "scaleway_instance_server" "base" {
-						image = "${data.scaleway_instance_image.ubuntu.id}"
-						type  = "DEV1-S"
-						cloud_init = <<EOF
-#cloud-config
-apt_update: true
-apt_upgrade: true
-EOF
-					}`,
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),
-					resource.TestCheckNoResourceAttr("scaleway_instance_server.base", "user_data"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "cloud_init", "#cloud-config\napt_update: true\napt_upgrade: true\n"),
-				),
-			},
-			{
-				// No user data nor cloud init
-				Config: `
-					data "scaleway_instance_image" "ubuntu" {
-					  architecture = "x86_64"
-					  name         = "Ubuntu 20.04 Focal Fossa"
-					}
-
-					resource "scaleway_instance_server" "base" {
-					  image = "${data.scaleway_instance_image.ubuntu.id}"
-					  type  = "DEV1-S"
-					  tags  = [ "terraform-test", "scaleway_instance_server", "user_data" ]
-					}`,
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),
-					resource.TestCheckNoResourceAttr("scaleway_instance_server.base", "user_data"),
-					resource.TestCheckResourceAttr("scaleway_instance_server.base", "cloud_init", ""),
+					resource.TestCheckResourceAttr("scaleway_instance_server.base", "user_data.foo", "bar"),
+					resource.TestCheckResourceAttr("scaleway_instance_server.base", "user_data.cloud-init", "#cloud-config\napt_update: true\napt_upgrade: true\n"),
 				),
 			},
 		},
@@ -452,7 +399,6 @@ func TestAccScalewayInstanceServer_UserData_WithoutCloudInitAtStart(t *testing.T
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),
 					resource.TestCheckNoResourceAttr("scaleway_instance_server.base", "user_data"),
-					resource.TestCheckNoResourceAttr("scaleway_instance_server.base", "cloud_init"),
 				),
 			},
 			{
@@ -468,11 +414,13 @@ func TestAccScalewayInstanceServer_UserData_WithoutCloudInitAtStart(t *testing.T
 						type  = "DEV1-S"
 						tags  = [ "terraform-test", "scaleway_instance_server", "user_data" ]
 
-						cloud_init = <<EOF
+						user_data = {
+							cloud-init = <<EOF
 #cloud-config
 apt_update: true
 apt_upgrade: true
 EOF
+						}
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckScalewayInstanceServerExists(tt, "scaleway_instance_server.base"),