Add efiBootloaderPath for dedicated server resource (and dedicated

server update)

Author: bigbigbang

ovh/data_dedicated_server.go

@@ -51,6 +51,11 @@ func dataSourceDedicatedServer() *schema.Resource {
 				Computed:    true,
 				Description: "Dedicated datacenter localisation (bhs1,bhs2,...)",
 			},
+			"efi_bootloader_path": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "path of the EFI bootloader",
+			},
 			"ip": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -243,6 +248,7 @@ func dataSourceDedicatedServerRead(d *schema.ResourceData, meta interface{}) err
 	d.Set("boot_script", ds.BootScript)
 	d.Set("commercial_range", ds.CommercialRange)
 	d.Set("datacenter", ds.Datacenter)
+	d.Set("efi_bootloader_path", ds.EfiBootloaderPath)
 	d.Set("ip", ds.Ip)
 	d.Set("link_speed", ds.LinkSpeed)
 	d.Set("monitoring", ds.Monitoring)

ovh/data_dedicated_server_test.go

@@ -37,9 +37,9 @@ func TestAccDedicatedServerDataSource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(
 						"data.ovh_dedicated_server.server", "display_name"),
 					resource.TestCheckResourceAttr(
-						"data.ovh_dedicated_server.server", "region", "eu-west-sbg"),
+						"data.ovh_dedicated_server.server", "region", "ca-east-bhs"),
 					resource.TestCheckResourceAttr(
-						"data.ovh_dedicated_server.server", "availability_zone", "eu-west-sbg-a"),
+						"data.ovh_dedicated_server.server", "availability_zone", "ca-east-bhs-a"),
 					resource.TestCheckResourceAttr(
 						"data.ovh_dedicated_server.server", "new_upgrade_system", "true"),
 					resource.TestCheckResourceAttr(

ovh/resource_dedicated_server_gen.go

@@ -88,10 +88,6 @@ func TestAccDedicatedServerInstall_usermetadata(t *testing.T) {
 			{
 				Config: testAccDedicatedServerInstallConfig("usermetadata"),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(
-						"ovh_dedicated_server_update.server", "state", "ok"),
-					resource.TestCheckResourceAttr(
-						"ovh_dedicated_server_update.server", "monitoring", "true"),
 					resource.TestCheckResourceAttr(
 						"ovh_dedicated_server_install_task.server_install", "function", "reinstallServer"),
 					resource.TestCheckResourceAttr(
@@ -144,10 +140,11 @@ data ovh_dedicated_server_boots "harddisk" {
 }
 
 resource ovh_dedicated_server_update "server" {
-  service_name = data.ovh_dedicated_server_boots.harddisk.service_name
-  boot_id      = data.ovh_dedicated_server_boots.harddisk.result[0]
-  monitoring   = true
-  state        = "ok"
+  service_name        = data.ovh_dedicated_server_boots.harddisk.service_name
+  boot_id             = data.ovh_dedicated_server_boots.harddisk.result[0]
+  monitoring          = true
+  state               = "ok"
+  efi_bootloader_path = "\\efi\\debian\\grubx64.efi"
 }
 
 resource "ovh_me_installation_template" "debian" {
@@ -186,10 +183,11 @@ data ovh_dedicated_server_boots "rescue" {
 }
 
 resource ovh_dedicated_server_update "server" {
-  service_name = data.ovh_dedicated_server_boots.harddisk.service_name
-  boot_id      = data.ovh_dedicated_server_boots.harddisk.result[0]
-  monitoring   = true
-  state        = "ok"
+  service_name        = data.ovh_dedicated_server_boots.harddisk.service_name
+  boot_id             = data.ovh_dedicated_server_boots.harddisk.result[0]
+  monitoring          = true
+  state               = "ok"
+  efi_bootloader_path = "\\efi\\debian\\grubx64.efi"
 }
 
 resource ovh_dedicated_server_install_task "server_install" {
@@ -208,12 +206,6 @@ data ovh_dedicated_server_boots "harddisk" {
 	boot_type    = "harddisk"
 }
 
-resource ovh_dedicated_server_update "server" {
-  service_name = data.ovh_dedicated_server_boots.harddisk.service_name
-  monitoring   = true
-  state        = "ok"
-}
-
 resource ovh_dedicated_server_install_task "server_install" {
   service_name      = data.ovh_dedicated_server_boots.harddisk.service_name
   template_name     = "byolinux_64"

ovh/resource_dedicated_server_install_task_test.go

@@ -11,17 +11,19 @@ import (
 
 func dedicatedServerResourceTestConfig(updated bool) string {
 	var (
-		monitoring     = true
-		noIntervention = false
-		baseTemplate   = "debian11_64"
-		displayName    = "First display name"
+		monitoring        = true
+		noIntervention    = false
+		baseTemplate      = "debian11_64"
+		displayName       = "First display name"
+		efiBootloaderPath = ""
 	)
 
 	if updated {
 		monitoring = false
 		noIntervention = true
 		baseTemplate = "debian12_64"
 		displayName = "Second display name"
+		efiBootloaderPath = "\\efi\\debian\\grubx64.efi"
 	}
 
 	return fmt.Sprintf(`
@@ -33,6 +35,7 @@ func dedicatedServerResourceTestConfig(updated bool) string {
 		no_intervention = %t
 		display_name = "%s"
 		template_name = "%s"
+		efi_bootloader_path = "%s"
 
 		plan = [
 			{
@@ -84,7 +87,7 @@ func dedicatedServerResourceTestConfig(updated bool) string {
 			}
 		]
 	}
-	`, monitoring, noIntervention, displayName, baseTemplate)
+	`, monitoring, noIntervention, displayName, baseTemplate, efiBootloaderPath)
 }
 
 func TestAccDedicatedServer_basic(t *testing.T) {
@@ -107,6 +110,8 @@ func TestAccDedicatedServer_basic(t *testing.T) {
 						"ovh_dedicated_server.server", "iam.display_name", "First display name"),
 					resource.TestCheckResourceAttr(
 						"ovh_dedicated_server.server", "os", "debian11_64"),
+					resource.TestCheckResourceAttr(
+						"ovh_dedicated_server.server", "efi_bootloader_path", ""),
 				),
 			},
 			{
@@ -122,6 +127,8 @@ func TestAccDedicatedServer_basic(t *testing.T) {
 						"ovh_dedicated_server.server", "iam.display_name", "Second display name"),
 					resource.TestCheckResourceAttr(
 						"ovh_dedicated_server.server", "os", "debian12_64"),
+					resource.TestCheckResourceAttr(
+						"ovh_dedicated_server.server", "efi_bootloader_path", "\\efi\\debian\\grubx64.efi"),
 				),
 			},
 			{

ovh/resource_dedicated_server_test.go

@@ -34,6 +34,12 @@ func resourceDedicatedServerUpdate() *schema.Resource {
 				Description: "The boot script of your dedicated server.",
 				Optional:    true,
 			},
+			"efi_bootloader_path": {
+				Type:        schema.TypeString,
+				Description: "The path of the EFI bootloader.",
+				Computed:    true,
+				Optional:    true,
+			},
 			"monitoring": {
 				Type:        schema.TypeBool,
 				Computed:    true,
@@ -113,6 +119,7 @@ func resourceDedicatedServerUpdateRead(ctx context.Context, d *schema.ResourceDa
 
 	d.Set("boot_id", ds.BootId)
 	d.Set("boot_script", ds.BootScript)
+	d.Set("efi_bootloader_path", ds.EfiBootloaderPath)
 	d.Set("monitoring", ds.Monitoring)
 	d.Set("state", ds.State)
 	d.Set("display_name", ds.DisplayName)

ovh/resource_dedicated_server_update.go

@@ -26,6 +26,8 @@ func TestAccDedicatedServerUpdate_basic(t *testing.T) {
 						"ovh_dedicated_server_update.server", "state", "ok"),
 					resource.TestCheckResourceAttr(
 						"ovh_dedicated_server_update.server", "boot_script", ""),
+					resource.TestCheckResourceAttr(
+						"ovh_dedicated_server_update.server", "efi_bootloader_path", "\\efi\\boot\\bootx64.efi"),
 					resource.TestCheckResourceAttr(
 						"ovh_dedicated_server_update.server", "display_name", "An awesome display name"),
 				),
@@ -40,6 +42,8 @@ func TestAccDedicatedServerUpdate_basic(t *testing.T) {
 						"ovh_dedicated_server_update.server", "state", "ok"),
 					resource.TestCheckResourceAttr(
 						"ovh_dedicated_server_update.server", "boot_script", ""),
+					resource.TestCheckResourceAttr(
+						"ovh_dedicated_server_update.server", "efi_bootloader_path", "\\efi\\boot\\bootx64.efi"),
 					resource.TestCheckResourceAttr(
 						"ovh_dedicated_server_update.server", "display_name", "An awesome display name restored"),
 				),
@@ -76,6 +80,7 @@ resource ovh_dedicated_server_update "server" {
   monitoring   = true
   state        = "ok"
   display_name = "An awesome display name"
+  efi_bootloader_path = "\\efi\\boot\\bootx64.efi"
 }
 
 output test {
@@ -95,6 +100,7 @@ resource ovh_dedicated_server_update "server" {
   monitoring   = false
   state        = "ok"
   display_name = "An awesome display name restored"
+  efi_bootloader_path = "\\efi\\boot\\bootx64.efi"
 }
 
 output test {

ovh/resource_dedicated_server_update_test.go

@@ -15,6 +15,7 @@ type DedicatedServer struct {
 	BootScript         string `json:"bootScript"`
 	CommercialRange    string `json:"commercialRange"`
 	Datacenter         string `json:"datacenter"`
+	EfiBootloaderPath  string `json:"efiBootloaderPath"`
 	Ip                 string `json:"ip"`
 	LinkSpeed          int    `json:"linkSpeed"`
 	Monitoring         bool   `json:"monitoring"`
@@ -46,15 +47,17 @@ func (ds DedicatedServer) String() string {
 }
 
 type DedicatedServerUpdateOpts struct {
-	BootId     *int64  `json:"bootId,omitempty"`
-	BootScript *string `json:"bootScript,omitempty"`
-	Monitoring *bool   `json:"monitoring,omitempty"`
-	State      *string `json:"state,omitempty"`
+	BootId            *int64  `json:"bootId,omitempty"`
+	BootScript        *string `json:"bootScript,omitempty"`
+	EfiBootloaderPath *string `json:"efiBootloaderPath,omitempty"`
+	Monitoring        *bool   `json:"monitoring,omitempty"`
+	State             *string `json:"state,omitempty"`
 }
 
 func (opts *DedicatedServerUpdateOpts) FromResource(d *schema.ResourceData) *DedicatedServerUpdateOpts {
 	opts.BootId = helpers.GetNilInt64PointerFromData(d, "boot_id")
 	opts.BootScript = helpers.GetNilStringPointerFromData(d, "boot_script")
+	opts.EfiBootloaderPath = helpers.GetNilStringPointerFromData(d, "efi_bootloader_path")
 	opts.Monitoring = helpers.GetNilBoolPointerFromData(d, "monitoring")
 	opts.State = helpers.GetNilStringPointerFromData(d, "state")
 	return opts

ovh/types_dedicated_server.go

@@ -29,6 +29,7 @@ In addition, the following attributes are exported:
 * `urn` - URN of the dedicated server instance
 * `commercial_range` - Dedicated server commercial range
 * `datacenter` - Dedicated datacenter localisation (bhs1,bhs2,...)
+* `efi_bootloader_path` - Path of the EFI bootloader of the dedicated server
 * `ip` - Dedicated server ip (IPv4)
 * `ips` - Dedicated server ip blocks
 * `link_speed` - Link speed of the server

website/docs/d/dedicated_server.html.markdown

@@ -142,6 +142,7 @@ The `user_metadata` block supports many arguments, here is a non-exhaustive list
   * `tags` - Resource tags. Tags that were internally computed are prefixed with `ovh:`
 * `boot_id` - Boot id of the server
 * `boot_script` - Boot script of the server
+* `efi_bootloader_path` - Path of the EFI bootloader
 * `link_speed` - Link speed of the server
 * `monitoring` - Icmp monitoring state
 * `no_intervention` - Prevent datacenter intervention

website/docs/r/dedicated_server.html.markdown

@@ -36,6 +36,7 @@ The following arguments are supported:
 * `service_name` - (Required) The service_name of your dedicated server.
 * `boot_id` - boot id of the server
 * `boot_script` - boot script of the server
+* `efi_bootloader_path` - path of the EFI bootloader
 * `monitoring` - Icmp monitoring state
 * `state` - error, hacked, hackedBlocked, ok
 * `display_name` - display name of the dedicated server
@@ -46,6 +47,7 @@ The following attributes are exported:
 
 * `service_name` - See Argument Reference above.
 * `boot_id` - See Argument Reference above.
+* `efi_bootloader_path` - See Argument Reference above.
 * `monitoring` - See Argument Reference above.
 * `state` - See Argument Reference above.
 * `display_name` - See Argument Reference above.