remove :

me_installation_template me_installation_templates me_installation_template_partition* migrate dedicated server install task to reinstall task
ovh · Feb 18, 2025 · dd43b15 · dd43b15
1 parent cc939c8
commit dd43b15
Show file tree

Hide file tree

Showing 36 changed files with 6,153 additions and 4,044 deletions.
diff --git a/ovh/data_me_installation_template.go b/ovh/data_me_installation_template.go
diff --git a/ovh/data_me_installation_template_test.go b/ovh/data_me_installation_template_test.go
diff --git a/ovh/data_me_installation_templates.go b/ovh/data_me_installation_templates.go
diff --git a/ovh/data_me_installation_templates_test.go b/ovh/data_me_installation_templates_test.go
diff --git a/ovh/helpers/helpers.go b/ovh/helpers/helpers.go
@@ -242,6 +242,15 @@ func GetNilStringPointerFromData(data interface{}, id string) *string {
 	return nil
 }
 
+func GetMapFromData(data interface{}, id string) map[string]interface{} {
+	if resourceData, tok := data.(*schema.ResourceData); tok {
+		return resourceData.Get(id).(map[string]interface{})
+	} else if mapData, tok := data.(map[string]interface{}); tok {
+		return mapData[id].(map[string]interface{})
+	}
+	return nil
+}
+
 // GetNilIntPointerFromDataAndNilIfNotPresent similar to GetNilIntPointerFromData but use terraform function schema.ResourceData.Get instead of schema.ResourceData.GetOk
 func GetNilIntPointerFromDataAndNilIfNotPresent(data interface{}, id string) *int {
 	if resourceData, tok := data.(*schema.ResourceData); tok {

diff --git a/ovh/import_me_installation_template_partition_scheme_hardware_raid_test.go b/ovh/import_me_installation_template_partition_scheme_hardware_raid_test.go
diff --git a/ovh/import_me_installation_template_partition_scheme_partition_test.go b/ovh/import_me_installation_template_partition_scheme_partition_test.go
diff --git a/ovh/import_me_installation_template_partition_scheme_test.go b/ovh/import_me_installation_template_partition_scheme_test.go
diff --git a/ovh/import_me_installation_template_test.go b/ovh/import_me_installation_template_test.go
diff --git a/ovh/provider.go b/ovh/provider.go
@@ -172,8 +172,6 @@ func Provider() *schema.Provider {
 			"ovh_me_identity_groups":                                         dataSourceMeIdentityGroups(),
 			"ovh_me_identity_user":                                           dataSourceMeIdentityUser(),
 			"ovh_me_identity_users":                                          dataSourceMeIdentityUsers(),
-			"ovh_me_installation_template":                                   dataSourceMeInstallationTemplate(),
-			"ovh_me_installation_templates":                                  dataSourceMeInstallationTemplates(),
 			"ovh_me_paymentmean_bankaccount":                                 dataSourceMePaymentmeanBankaccount(),
 			"ovh_me_paymentmean_creditcard":                                  dataSourceMePaymentmeanCreditcard(),
 			"ovh_order_cart":                                                 dataSourceOrderCart(),
@@ -237,7 +235,7 @@ func Provider() *schema.Provider {
 			"ovh_dedicated_nasha_partition":                                  resourceDedicatedNASHAPartition(),
 			"ovh_dedicated_nasha_partition_access":                           resourceDedicatedNASHAPartitionAccess(),
 			"ovh_dedicated_nasha_partition_snapshot":                         resourceDedicatedNASHAPartitionSnapshot(),
-			"ovh_dedicated_server_install_task":                              resourceDedicatedServerInstallTask(),
+			"ovh_dedicated_server_reinstall_task":                            resourceDedicatedServerReinstallTask(),
 			"ovh_dedicated_server_reboot_task":                               resourceDedicatedServerRebootTask(),
 			"ovh_dedicated_server_update":                                    resourceDedicatedServerUpdate(),
 			"ovh_dedicated_server_networking":                                resourceDedicatedServerNetworking(),
@@ -271,10 +269,6 @@ func Provider() *schema.Provider {
 			"ovh_me_identity_group":                                          resourceMeIdentityGroup(),
 			"ovh_me_api_oauth2_client":                                       resourceApiOauth2Client(),
 			"ovh_me_identity_user":                                           resourceMeIdentityUser(),
-			"ovh_me_installation_template":                                   resourceMeInstallationTemplate(),
-			"ovh_me_installation_template_partition_scheme":                  resourceMeInstallationTemplatePartitionScheme(),
-			"ovh_me_installation_template_partition_scheme_hardware_raid":    resourceMeInstallationTemplatePartitionSchemeHardwareRaid(),
-			"ovh_me_installation_template_partition_scheme_partition":        resourceMeInstallationTemplatePartitionSchemePartition(),
 			"ovh_savings_plan":                                               resourceSavingsPlan(),
 			"ovh_vrack":                                                      resourceVrack(),
 			"ovh_vrack_cloudproject":                                         resourceVrackCloudProject(),

diff --git a/ovh/resource_dedicated_server.go b/ovh/resource_dedicated_server.go
@@ -226,9 +226,11 @@ func (r *dedicatedServerResource) Update(ctx context.Context, req resource.Updat
 	responseData.MergeWith(&planData)
 	responseData.MergeWith(&stateData)
 
-	// Explicitely set UserMetadata to what was defined in the plan
+	// Explicitely set Customizations/Properties/Storage to what was defined in the plan
 	// as we can't determine the right thing to do in MergeWith function
-	responseData.UserMetadata = planData.UserMetadata
+	responseData.Customizations = planData.Customizations
+	responseData.Properties = planData.Properties
+	responseData.Storage = planData.Storage
 
 	// Save updated data into Terraform state
 	resp.Diagnostics.Append(resp.State.Set(ctx, &responseData)...)
@@ -281,12 +283,14 @@ func (r *dedicatedServerResource) updateDedicatedServerResource(ctx context.Cont
 	// Check if server needs to be reinstalled
 	var shouldReinstall bool
 	if stateData != nil {
-		if stateData.TemplateName.ValueString() != planData.TemplateName.ValueString() ||
-			!stateData.UserMetadata.Equal(planData.UserMetadata) {
+		if stateData.OperatingSystem.ValueString() != planData.OperatingSystem.ValueString() ||
+			!stateData.Customizations.Equal(planData.Customizations) ||
+			!stateData.Storage.Equal(planData.Storage) ||
+			!stateData.Properties.Equal(planData.Properties) {
 			shouldReinstall = true
 		}
 	} else {
-		if planData.TemplateName.ValueString() != "" {
+		if planData.OperatingSystem.ValueString() != "" {
 			shouldReinstall = true
 		}
 	}
@@ -298,7 +302,7 @@ func (r *dedicatedServerResource) updateDedicatedServerResource(ctx context.Cont
 	}
 
 	// Trigger server reinstallation
-	endpoint := "/dedicated/server/" + url.PathEscape(serviceName) + "/install/start"
+	endpoint := "/dedicated/server/" + url.PathEscape(serviceName) + "/reinstall"
 	if shouldReinstall {
 		log.Print("Triggering server reinstallation")
 		task := DedicatedServerTask{}