fix: Add missing fields in datasource ovh_dedicated_server

Author: Arthur Amstutz

Diff for: ovh/data_dedicated_server.go

@@ -18,6 +18,11 @@ func dataSourceDedicatedServer() *schema.Resource {
 			},
 
 			// Computed
+			"availability_zone": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Dedicated AZ localisation",
+			},
 			"urn": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -34,35 +39,34 @@ func dataSourceDedicatedServer() *schema.Resource {
 			"boot_script": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "",
+				Description: "Ipxe script served on boot",
 			},
 			"commercial_range": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "dedicater server commercial range",
+				Description: "Dedicated server commercial range",
 			},
 			"datacenter": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "dedicated datacenter localisation (bhs1,bhs2,...)",
+				Description: "Dedicated datacenter localisation (bhs1,bhs2,...)",
 			},
 			"ip": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "dedicated server ip (IPv4)",
+				Description: "Dedicated server ip (IPv4)",
 			},
 			"ips": {
 				Type:        schema.TypeList,
 				Computed:    true,
-				Description: "dedicated server ip blocks",
+				Description: "Dedicated server ip blocks",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
 			},
 			"link_speed": {
-				Type:        schema.TypeInt,
-				Computed:    true,
-				Description: "",
+				Type:     schema.TypeInt,
+				Computed: true,
 			},
 			"monitoring": {
 				Type:        schema.TypeBool,
@@ -72,13 +76,27 @@ func dataSourceDedicatedServer() *schema.Resource {
 			"name": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "dedicated server name",
+				Description: "Dedicated server name",
+			},
+			"new_upgrade_system": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"no_intervention": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "Prevent datacenter intervention",
 			},
 			"os": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: "Operating system",
 			},
+			"power_state": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Power state of the server: poweroff, poweron",
+			},
 			"professional_use": {
 				Type:        schema.TypeBool,
 				Computed:    true,
@@ -89,15 +107,25 @@ func dataSourceDedicatedServer() *schema.Resource {
 				Computed:    true,
 				Description: "",
 			},
+			"region": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Dedicated region localisation",
+			},
 			"rescue_mail": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "",
+				Description: "Custom email used to receive rescue credentials",
+			},
+			"rescue_ssh_key": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Public SSH Key used in the rescue mode",
 			},
 			"reverse": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "dedicated server reverse",
+				Description: "Dedicated server reverse",
 			},
 			"root_device": {
 				Type:        schema.TypeString,
@@ -107,12 +135,12 @@ func dataSourceDedicatedServer() *schema.Resource {
 			"server_id": {
 				Type:        schema.TypeInt,
 				Computed:    true,
-				Description: "your server id",
+				Description: "Server id",
 			},
 			"state": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "error, hacked, hackedBlocked, ok",
+				Description: "All states a Dedicated can be in: error, hacked, hackedBlocked, ok",
 			},
 			"support_level": {
 				Type:        schema.TypeString,
@@ -147,7 +175,7 @@ func dataSourceDedicatedServer() *schema.Resource {
 						"server_name": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "server name",
+							Description: "Server name",
 						},
 						"vrack": {
 							Type:        schema.TypeString,
@@ -228,6 +256,12 @@ func dataSourceDedicatedServerRead(d *schema.ResourceData, meta interface{}) err
 	d.Set("server_id", ds.ServerId)
 	d.Set("state", ds.State)
 	d.Set("support_level", ds.SupportLevel)
+	d.Set("availability_zone", ds.AvailabilityZone)
+	d.Set("new_upgrade_system", ds.NewUpgradeSystem)
+	d.Set("no_intervention", ds.NoIntervention)
+	d.Set("power_state", ds.PowerState)
+	d.Set("region", ds.Region)
+	d.Set("rescue_ssh_key", ds.RescueSshKey)
 
 	dsIps := &[]string{}
 	err = config.OVHClient.Get(

Diff for: ovh/data_dedicated_server_test.go

@@ -10,7 +10,10 @@ import (
 
 func TestAccDedicatedServerDataSource_basic(t *testing.T) {
 	dedicated_server := os.Getenv("OVH_DEDICATED_SERVER")
-	config := fmt.Sprintf(testAccDedicatedServerDatasourceConfig_Basic, dedicated_server)
+	config := fmt.Sprintf(`
+	data "ovh_dedicated_server" "server" {
+		service_name  = "%s"
+	}`, dedicated_server)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheckDedicatedServer(t) },
@@ -33,14 +36,18 @@ func TestAccDedicatedServerDataSource_basic(t *testing.T) {
 						"data.ovh_dedicated_server.server", "urn"),
 					resource.TestCheckResourceAttrSet(
 						"data.ovh_dedicated_server.server", "display_name"),
+					resource.TestCheckResourceAttr(
+						"data.ovh_dedicated_server.server", "region", "eu-west-sbg"),
+					resource.TestCheckResourceAttr(
+						"data.ovh_dedicated_server.server", "availability_zone", "eu-west-sbg-a"),
+					resource.TestCheckResourceAttr(
+						"data.ovh_dedicated_server.server", "new_upgrade_system", "true"),
+					resource.TestCheckResourceAttr(
+						"data.ovh_dedicated_server.server", "no_intervention", "false"),
+					resource.TestCheckResourceAttr(
+						"data.ovh_dedicated_server.server", "power_state", "poweron"),
 				),
 			},
 		},
 	})
 }
-
-const testAccDedicatedServerDatasourceConfig_Basic = `
-data "ovh_dedicated_server" "server" {
-  service_name  = "%s"
-}
-`

Diff for: ovh/types_dedicated_server.go

@@ -9,6 +9,7 @@ import (
 )
 
 type DedicatedServer struct {
+	AvailabilityZone   string `json:"availabilityZone"`
 	Name               string `json:"name"`
 	BootId             int    `json:"bootId"`
 	BootScript         string `json:"bootScript"`
@@ -17,10 +18,15 @@ type DedicatedServer struct {
 	Ip                 string `json:"ip"`
 	LinkSpeed          int    `json:"linkSpeed"`
 	Monitoring         bool   `json:"monitoring"`
+	NewUpgradeSystem   bool   `json:"newUpgradeSystem"`
+	NoIntervention     bool   `json:"noIntervention"`
 	Os                 string `json:"os"`
+	PowerState         string `json:"powerState"`
 	ProfessionalUse    bool   `json:"professionalUse"`
 	Rack               string `json:"rack"`
+	Region             string `json:"region"`
 	RescueMail         string `json:"rescueMail"`
+	RescueSshKey       string `json:"rescueSshKey"`
 	Reverse            string `json:"reverse"`
 	RootDevice         string `json:"rootDevice"`
 	ServerId           int    `json:"serverId"`

Diff for: website/docs/d/dedicated_server.html.markdown

@@ -23,6 +23,7 @@ data "ovh_dedicated_server" "server" {
 `id` is set with the service_name of the dedicated server.
 In addition, the following attributes are exported:
 
+* `availability_zone` - Dedicated AZ localisation
 * `boot_id` - Boot id of the server
 * `boot_script` - Boot script of the server
 * `urn` - URN of the dedicated server instance
@@ -33,11 +34,16 @@ In addition, the following attributes are exported:
 * `link_speed` - Link speed of the server
 * `monitoring` - Icmp monitoring state
 * `name` - Dedicated server name
+* `new_upgrade_system`
+* `no_intervention` - Prevent datacenter intervention
 * `display_name` - Dedicated server display name
 * `os` - Operating system
+* `power_state` - Power state of the server (poweroff, poweron)
 * `professional_use` - Does this server have professional use option
 * `rack` - Rack id of the server
+* `region` - Dedicated region localisation
 * `rescue_mail` - Rescue mail of the server
+* `rescue_ssh_key` - Public SSH Key used in the rescue mode
 * `reverse` - Dedicated server reverse
 * `root_device` - Root device of the server
 * `server_id` - Server id