fix(dedicated_server{,_reinstall_task}): move properties to customizations.config_drive_metadata

ref: #PUBM-43183

Author: JayBeeDe

docs/guides/dedicated_server_migration.md

@@ -37,7 +37,7 @@ terraform apply
 
 ## Second step: backport your previous task details into the imported resource
 
-This step is manual and requires you to convert the previous installation details from resource `ovh_dedicated_server_install_task` to the new fields of resource `ovh_dedicated_server`: `os`, `customizations`, `properties` and `storage`.
+This step is manual and requires you to convert the previous installation details from resource `ovh_dedicated_server_install_task` to the new fields of resource `ovh_dedicated_server`: `os`, `customizations` and `storage`.
 
 Let's take an example: if you previously used the following configuration:
 
@@ -74,7 +74,6 @@ resource "ovh_dedicated_server" "srv" {
     ssh_key                  = "ssh-ed25519 AAAAC3..."
   }
   os         = "debian12_64"
-  properties = null
   storage    = null
 }
 ```
@@ -93,7 +92,7 @@ resource "ovh_dedicated_server" "srv" {
   #
 
   lifecycle {
-    ignore_changes = [os, customizations, properties, storage]
+    ignore_changes = [os, customizations, storage]
   }
 }
 ```

docs/resources/dedicated_server.md

@@ -107,6 +107,7 @@ resource "ovh_dedicated_server" "server" {
 
 * `os` - Operating System to install
 * `customizations` - Customization of the OS configuration
+  * `config_drive_metadata` - Config Drive MetaData
   * `config_drive_user_data` - Config Drive UserData
   * `efi_bootloader_path` - Path of the EFI bootloader from the OS installed on the server
   * `hostname` - Custom hostname
@@ -137,7 +138,6 @@ resource "ovh_dedicated_server" "server" {
       * `raid_level` - Software raid type
       * `size` - Partition size in MiB
     * `scheme_name` - Partitioning scheme (if applicable with selected operating system)
-* `properties` - Arbitrary properties to pass to cloud-init's config drive datasource
 
 ### Arguments used to control the lifecycle of a dedicated server
 

docs/resources/dedicated_server_reinstall_task.md

@@ -119,18 +119,16 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
   service_name = data.ovh_dedicated_server.server.service_name
   os           = "byolinux_64"
   customizations {
+    config_drive_metadata = {
+      foo = "bar"
+      hello = "world"
+    }
     config_drive_user_data = "I2Nsb3VkLWNvbmZpZwpzc2hfYXV0aG9yaXplZF9rZXlzOgogIC0gc3NoLXJzYSBBQUFBQjhkallpdz09IG15c2VsZkBteWRvbWFpbi5uZXQKCnVzZXJzOgogIC0gbmFtZTogcGF0aWVudDAKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIGdyb3VwczogdXNlcnMsIHN1ZG8KICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBmYWxzZQogICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAgLSBzc2gtcnNhIEFBQUFCOGRqWWl3PT0gbXlzZWxmQG15ZG9tYWluLm5ldApkaXNhYmxlX3Jvb3Q6IGZhbHNlCnBhY2thZ2VzOgogIC0gdmltCiAgLSB0cmVlCmZpbmFsX21lc3NhZ2U6IFRoZSBzeXN0ZW0gaXMgZmluYWxseSB1cCwgYWZ0ZXIgJFVQVElNRSBzZWNvbmRzCg=="
     hostname               = "mon-tux"
     http_headers = {
       Authorization = "Basic bG9naW46cGFzc3dvcmQ="
     }
-    image_check_sum     = "367f26c915f39314dde155db3a2b0326803e06975d1f4be04256f8b591e38fd4062d36eb7d50e99da7a50b7f4cd69640e56a4ab93e8e0274e4e478e0f84b5d29"
-    image_check_sum_type = "sha512"
-    image_url           = "https://github.com/ashmonger/akution_test/releases/download/0.5-compress/deb11k6.qcow2"
-  }
-  properties = {
-    essential = "false"
-    role      = "webservers"
+    image_url           = "https://github.com/ashmonger/akution_test/releases/latest/download/deb11k6.qcow2"
   }
 }
 ```
@@ -241,8 +239,6 @@ The following arguments are supported:
 
 ~> **WARNING** Some customizations may be required on some Operating Systems. [Check how to list the available and required customization(s) for your operating system](https://help.ovhcloud.com/csm/en-dedicated-servers-api-os-installation?id=kb_article_view&sysparm_article=KB0061951#os-inputs) (do not forget to adapt camel case customization name to snake case parameter).
 
-* `properties` - Arbitrary properties to pass to cloud-init's config drive datasource. It supports any key with any string value.
-
 * `storage`: OS reinstallation storage configurations. [More details about disks, hardware/software RAID and partitioning configuration](https://help.ovhcloud.com/csm/en-dedicated-servers-api-partitioning?id=kb_article_view&sysparm_article=KB0043882) (do not forget to adapt camel case parameters to snake case parameters).
   * `disk_group_id`: Disk group id to install the OS to (default is 0, meaning automatic).
   * `hardware_raid`: Hardware Raid configurations (if not specified, all disks of the chosen disk group id will be configured in JBOD mode).

examples/resources/dedicated_server_reinstall_task/example_4.tf

@@ -10,17 +10,15 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
   service_name = data.ovh_dedicated_server.server.service_name
   os           = "byolinux_64"
   customizations {
+    config_drive_metadata = {
+      foo = "bar"
+      hello = "world"
+    }
     config_drive_user_data = "I2Nsb3VkLWNvbmZpZwpzc2hfYXV0aG9yaXplZF9rZXlzOgogIC0gc3NoLXJzYSBBQUFBQjhkallpdz09IG15c2VsZkBteWRvbWFpbi5uZXQKCnVzZXJzOgogIC0gbmFtZTogcGF0aWVudDAKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIGdyb3VwczogdXNlcnMsIHN1ZG8KICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBmYWxzZQogICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAgLSBzc2gtcnNhIEFBQUFCOGRqWWl3PT0gbXlzZWxmQG15ZG9tYWluLm5ldApkaXNhYmxlX3Jvb3Q6IGZhbHNlCnBhY2thZ2VzOgogIC0gdmltCiAgLSB0cmVlCmZpbmFsX21lc3NhZ2U6IFRoZSBzeXN0ZW0gaXMgZmluYWxseSB1cCwgYWZ0ZXIgJFVQVElNRSBzZWNvbmRzCg=="
     hostname               = "mon-tux"
     http_headers = {
       Authorization = "Basic bG9naW46cGFzc3dvcmQ="
     }
-    image_check_sum     = "367f26c915f39314dde155db3a2b0326803e06975d1f4be04256f8b591e38fd4062d36eb7d50e99da7a50b7f4cd69640e56a4ab93e8e0274e4e478e0f84b5d29"
-    image_check_sum_type = "sha512"
-    image_url           = "https://github.com/ashmonger/akution_test/releases/download/0.5-compress/deb11k6.qcow2"
-  }
-  properties = {
-    essential = "false"
-    role      = "webservers"
+    image_url           = "https://github.com/ashmonger/akution_test/releases/latest/download/deb11k6.qcow2"
   }
 }

ovh/resource_dedicated_server.go

@@ -298,10 +298,9 @@ func (r *dedicatedServerResource) Update(ctx context.Context, req resource.Updat
 	responseData.MergeWith(&planData)
 	responseData.MergeWith(&stateData)
 
-	// Explicitely set Customizations/Properties/Storage to what was defined in the plan
+	// Explicitely set Customizations/Storage to what was defined in the plan
 	// as we can't determine the right thing to do in MergeWith function
 	responseData.Customizations = planData.Customizations
-	responseData.Properties = planData.Properties
 	responseData.Storage = planData.Storage
 
 	// Same thing for the flags to control reinstallation, set the plan value explicitly
@@ -460,8 +459,7 @@ func (r *dedicatedServerResource) reinstallDedicatedServer(ctx context.Context,
 		if planData.Os.ValueString() != "" &&
 			stateData.Os.ValueString() != planData.Os.ValueString() ||
 			!stateData.Customizations.Equal(planData.Customizations) ||
-			!stateData.Storage.Equal(planData.Storage) ||
-			!stateData.Properties.Equal(planData.Properties) {
+			!stateData.Storage.Equal(planData.Storage) {
 			shouldReinstall = true
 		}
 	}