Fix

Author: remyleone

docs/resources/instance_server.md

@@ -100,22 +100,13 @@ resource "scaleway_instance_server" "web" {
 
 ```hcl
 resource "scaleway_instance_server" "web" {
-  type = "DEV1-S"
+  type  = "DEV1-S"
   image = "ubuntu_focal"
 
-  tags = [ "web", "public" ]
-
-  user_data {
-    key = "plop"
-    value = "world"
-  }
-
   user_data {
-    key = "xavier"
-    value = "niel"
+    foo        = "bar"
+    cloud-init = file("${path.module}/cloud-init.yml")
   }
-
-  cloud_init = file("${path.module}/cloud-init.yml")
 }
 ```
 
@@ -169,13 +160,12 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 - `state` - (Defaults to `started`) The state of the server. Possible values are: `started`, `stopped` or `standby`.
 
-- `cloud_init` - (Optional) The cloud init script associated with this server. Updates to this field will trigger a stop/start of the server.
-
 - `user_data` - (Optional) The user data associated with the server.
-
-    - `key` - (Required) The user data key. The `cloud-init` key is reserved, please use `cloud_init` attribute instead.
-
-    - `value` - (Required) The user data content. It could be a string or a file content using [file](https://www.terraform.io/docs/configuration/functions/file.html) or [filebase64](https://www.terraform.io/docs/configuration/functions/filebase64.html) for example.
+  Use the `cloud-init` key to use [cloud-init](https://cloudinit.readthedocs.io/en/latest/) on your instance.
+  You can define values using:
+    - string
+    - UTF-8 encoded file content using [file](https://www.terraform.io/docs/configuration/functions/file.html)
+    - Binary files using [filebase64](https://www.terraform.io/docs/configuration/functions/filebase64.html).
 
 - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
 

scaleway/helpers_instance.go

@@ -3,7 +3,6 @@ package scaleway
 import (
 	"context"
 	"fmt"
-	"hash/crc32"
 	"sort"
 	"time"
 
@@ -62,28 +61,6 @@ func instanceAPIWithZoneAndNestedID(m interface{}, zonedNestedID string) (*insta
 	return instanceAPI, zone, innerID, outerID, nil
 }
 
-// hash hashes a string to a unique hashcode.
-//
-// crc32 returns a uint32, but for our use we need
-// and non negative integer. Here we cast to an integer
-// and invert it if the result is negative.
-func hash(s string) int {
-	v := int(crc32.ChecksumIEEE([]byte(s)))
-	if v >= 0 {
-		return v
-	}
-	if -v >= 0 {
-		return -v
-	}
-	// v == MinInt
-	return 0
-}
-
-func userDataHash(v interface{}) int {
-	userData := v.(map[string]interface{})
-	return hash(userData["key"].(string) + userData["value"].(string))
-}
-
 // orderVolumes return an ordered slice based on the volume map key "0", "1", "2",...
 func orderVolumes(v map[string]*instance.Volume) []*instance.Volume {
 	indexes := []string{}