fix(instance): restore location field in json output (#5210)

Author: Mia-Cross

internal/namespaces/instance/v1/custom_server.go

@@ -408,6 +408,7 @@ type customServer struct {
 	Arch                            instance.Arch                  `json:"arch"`
 	PlacementGroup                  *instance.PlacementGroup       `json:"placement_group"`
 	Zone                            scw.Zone                       `json:"zone"`
+	Location                        *instance.ServerLocation       `json:"location"`
 	AdminPasswordEncryptionSSHKeyID *string                        `json:"admin_password_encryption_ssh_key_id"`
 	AdminPasswordEncryptedValue     *string                        `json:"admin_password_encrypted_value"`
 	Filesystems                     []*instance.ServerFilesystem   `json:"filesystems"`
@@ -440,6 +441,7 @@ func customServerFromInstanceServer(server *instance.Server) *customServer {
 		Arch:                            server.Arch,
 		PlacementGroup:                  server.PlacementGroup,
 		Zone:                            server.Zone,
+		Location:                        server.Location,
 		AdminPasswordEncryptionSSHKeyID: server.AdminPasswordEncryptionSSHKeyID,
 		AdminPasswordEncryptedValue:     server.AdminPasswordEncryptedValue,
 		Filesystems:                     server.Filesystems,

internal/namespaces/instance/v1/testdata/test-get-server-simple.cassette.yaml

@@ -1,16 +1,16 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟩🟩🟩 STDOUT️ 🟩🟩🟩️
-ID                  9b14016b-b1d9-4ab9-a0bb-17a5702cdabc
-Name                cli-srv-adoring-edison
+ID                  28d0b697-6469-4839-94cc-8746a8e506b3
+Name                cli-srv-vibrant-jepsen
 Organization        fa1e3217-dc80-42ac-85c3-3f034b78b552
 Project             fa1e3217-dc80-42ac-85c3-3f034b78b552
 CommercialType      DEV1-S
 CreationDate        few seconds ago
 DynamicIPRequired   false
 RoutedIPEnabled     true
-Hostname            cli-srv-adoring-edison
+Hostname            cli-srv-vibrant-jepsen
 Protected           false
-MacAddress          de:00:00:d1:46:1d
+MacAddress          de:00:00:d8:f5:fb
 ModificationDate    few seconds ago
 State               archived
 StateDetail         -
@@ -41,7 +41,7 @@ Allowed Actions:
 
 Volumes:
 ID                                    NAME                                       SIZE   VOLUME TYPE  IOPS  STATE   CREATION DATE    MODIFICATION DATE  BOOT   ZONE
-bf509bb0-1f87-40cc-80fe-b866b919aeae  Ubuntu 22.04 Jammy Jellyfish_sbs_volume_0  10 GB  sbs_5k       5K    in_use  few seconds ago  few seconds ago    false  fr-par-1
+e3fbb54f-ea7f-46c2-8434-a105741a8867  Ubuntu 22.04 Jammy Jellyfish_sbs_volume_0  10 GB  sbs_5k       5K    in_use  few seconds ago  few seconds ago    false  fr-par-1
 
 Public IPs:
 ID   ADDRESS  GATEWAY  NETMASK  FAMILY  DYNAMIC  PROVISIONING MODE  TAGS  IPAM ID  STATE
@@ -53,8 +53,8 @@ Server Filesystems:
 FILESYSTEM ID  STATE
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 {
-  "id": "9b14016b-b1d9-4ab9-a0bb-17a5702cdabc",
-  "name": "cli-srv-adoring-edison",
+  "id": "28d0b697-6469-4839-94cc-8746a8e506b3",
+  "name": "cli-srv-vibrant-jepsen",
   "organization": "fa1e3217-dc80-42ac-85c3-3f034b78b552",
   "project": "fa1e3217-dc80-42ac-85c3-3f034b78b552",
   "allowed_actions": [
@@ -66,7 +66,7 @@ FILESYSTEM ID  STATE
   "creation_date": "1970-01-01T00:00:00.0Z",
   "dynamic_ip_required": false,
   "routed_ip_enabled": true,
-  "hostname": "cli-srv-adoring-edison",
+  "hostname": "cli-srv-vibrant-jepsen",
   "image": {
     "id": "6d3c053e-c728-4294-b23a-560b62a4d592",
     "name": "Ubuntu 22.04 Jammy Jellyfish",
@@ -92,7 +92,7 @@ FILESYSTEM ID  STATE
   "protected": false,
   "private_ip": null,
   "public_ips": [],
-  "mac_address": "de:00:00:d1:46:1d",
+  "mac_address": "de:00:00:d8:f5:fb",
   "modification_date": "1970-01-01T00:00:00.0Z",
   "state": "stopped",
   "state_detail": "",
@@ -105,13 +105,14 @@ FILESYSTEM ID  STATE
   "arch": "x86_64",
   "placement_group": null,
   "zone": "fr-par-1",
+  "location": null,
   "admin_password_encryption_ssh_key_id": null,
   "admin_password_encrypted_value": null,
   "filesystems": [],
   "end_of_service": false,
   "Volumes": [
     {
-      "id": "bf509bb0-1f87-40cc-80fe-b866b919aeae",
+      "id": "e3fbb54f-ea7f-46c2-8434-a105741a8867",
       "name": "Ubuntu 22.04 Jammy Jellyfish_sbs_volume_0",
       "size": 10000000000,
       "volume_type": "sbs_5k",