fix(instance): add support for ProjectID in instance server list (#5228)

remyleone · web-flow · commit d5536a1ce071 · 2025-12-15T19:08:41.000Z
diff --git a/internal/namespaces/instance/v1/custom_server.go b/internal/namespaces/instance/v1/custom_server.go
@@ -81,6 +81,7 @@ func serversMarshalerFunc(i any, opt *human.MarshalOpt) (string, error) {
 		StateDetail       string
 		Arch              instance.Arch
 		ImageID           string
+		ProjectID         string
 	}
 
 	servers := i.([]*instance.Server)
@@ -117,6 +118,7 @@ func serversMarshalerFunc(i any, opt *human.MarshalOpt) (string, error) {
 			StateDetail:       server.StateDetail,
 			Arch:              server.Arch,
 			ImageID:           serverImageID,
+			ProjectID:         server.Project,
 		})
 	}
 
diff --git a/internal/namespaces/instance/v1/testdata/test-list-server-simple.golden b/internal/namespaces/instance/v1/testdata/test-list-server-simple.golden
@@ -1,9 +1,9 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟩🟩🟩 STDOUT️ 🟩🟩🟩️
-ID                                    NAME                                          TYPE            STATE     ZONE      PUBLIC IP      PRIVATE IP  TAGS  IMAGE NAME                    ROUTED IP ENABLED  MODIFICATION DATE  CREATION DATE    VOLUMES  PROTECTED  SECURITY GROUP NAME     SECURITY GROUP ID                     STATE DETAIL  ARCH    IMAGE ID
-6ab3aeee-069c-493c-895c-f7328500e45b  cli-srv-priceless-black                       DEV1-S          archived  fr-par-1  51.158.97.101  -           []    Ubuntu 22.04 Jammy Jellyfish  true               few seconds ago    few seconds ago  1        false      Default security group  da505169-540e-4c2b-b0da-c854139224e0  -             x86_64  6d3c053e-c728-4294-b23a-560b62a4d592
-fbe2e3c3-411c-4ba5-b3f1-2eded5a8b985  tf-srv-naughty-colden                         POP2-2C-8G-WIN  archived  fr-par-1  -              -           []    Windows Server 2022           true               few seconds ago    few seconds ago  1        false      Default security group  da505169-540e-4c2b-b0da-c854139224e0  -             x86_64  5d355a7d-8abb-4418-9599-e26621bf7ca8
-6ffbe4b0-3cf0-407e-8e87-2c67defd8897  tf-tests-instance-block-external-root-volume  PLAY2-PICO      archived  fr-par-1  -              -           []    Ubuntu 22.04 Jammy Jellyfish  true               few seconds ago    few seconds ago  1        false      Default security group  c30bff3f-a276-4c5b-bb3e-92ecab6e962e  -             x86_64  6d3c053e-c728-4294-b23a-560b62a4d592
+ID                                    NAME                                          TYPE            STATE     ZONE      PUBLIC IP      PRIVATE IP  TAGS  IMAGE NAME                    ROUTED IP ENABLED  MODIFICATION DATE  CREATION DATE    VOLUMES  PROTECTED  SECURITY GROUP NAME     SECURITY GROUP ID                     STATE DETAIL  ARCH    IMAGE ID                              PROJECT ID
+6ab3aeee-069c-493c-895c-f7328500e45b  cli-srv-priceless-black                       DEV1-S          archived  fr-par-1  51.158.97.101  -           []    Ubuntu 22.04 Jammy Jellyfish  true               few seconds ago    few seconds ago  1        false      Default security group  da505169-540e-4c2b-b0da-c854139224e0  -             x86_64  6d3c053e-c728-4294-b23a-560b62a4d592  fa1e3217-dc80-42ac-85c3-3f034b78b552
+fbe2e3c3-411c-4ba5-b3f1-2eded5a8b985  tf-srv-naughty-colden                         POP2-2C-8G-WIN  archived  fr-par-1  -              -           []    Windows Server 2022           true               few seconds ago    few seconds ago  1        false      Default security group  da505169-540e-4c2b-b0da-c854139224e0  -             x86_64  5d355a7d-8abb-4418-9599-e26621bf7ca8  fa1e3217-dc80-42ac-85c3-3f034b78b552
+6ffbe4b0-3cf0-407e-8e87-2c67defd8897  tf-tests-instance-block-external-root-volume  PLAY2-PICO      archived  fr-par-1  -              -           []    Ubuntu 22.04 Jammy Jellyfish  true               few seconds ago    few seconds ago  1        false      Default security group  c30bff3f-a276-4c5b-bb3e-92ecab6e962e  -             x86_64  6d3c053e-c728-4294-b23a-560b62a4d592  44693172-d6a3-49b0-b56f-011f492e4dfa
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 [
   {

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ func serversMarshalerFunc(i any, opt *human.MarshalOpt) (string, error) {`
`81`	`81`	`StateDetail string`
`82`	`82`	`Arch instance.Arch`
`83`	`83`	`ImageID string`
	`84`	`+ ProjectID string`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`servers := i.([]*instance.Server)`
`@@ -117,6 +118,7 @@ func serversMarshalerFunc(i any, opt *human.MarshalOpt) (string, error) {`
`117`	`118`	`StateDetail: server.StateDetail,`
`118`	`119`	`Arch: server.Arch,`
`119`	`120`	`ImageID: serverImageID,`
	`121`	`+ ProjectID: server.Project,`
`120`	`122`	`})`
`121`	`123`	`}`
`122`	`124`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲`
`2`	`2`	`🟩🟩🟩 STDOUT️ 🟩🟩🟩️`
`3`		`-ID NAME TYPE STATE ZONE PUBLIC IP PRIVATE IP TAGS IMAGE NAME ROUTED IP ENABLED MODIFICATION DATE CREATION DATE VOLUMES PROTECTED SECURITY GROUP NAME SECURITY GROUP ID STATE DETAIL ARCH IMAGE ID`
`4`		`-6ab3aeee-069c-493c-895c-f7328500e45b cli-srv-priceless-black DEV1-S archived fr-par-1 51.158.97.101 - [] Ubuntu 22.04 Jammy Jellyfish true few seconds ago few seconds ago 1 false Default security group da505169-540e-4c2b-b0da-c854139224e0 - x86_64 6d3c053e-c728-4294-b23a-560b62a4d592`
`5`		`-fbe2e3c3-411c-4ba5-b3f1-2eded5a8b985 tf-srv-naughty-colden POP2-2C-8G-WIN archived fr-par-1 - - [] Windows Server 2022 true few seconds ago few seconds ago 1 false Default security group da505169-540e-4c2b-b0da-c854139224e0 - x86_64 5d355a7d-8abb-4418-9599-e26621bf7ca8`
`6`		`-6ffbe4b0-3cf0-407e-8e87-2c67defd8897 tf-tests-instance-block-external-root-volume PLAY2-PICO archived fr-par-1 - - [] Ubuntu 22.04 Jammy Jellyfish true few seconds ago few seconds ago 1 false Default security group c30bff3f-a276-4c5b-bb3e-92ecab6e962e - x86_64 6d3c053e-c728-4294-b23a-560b62a4d592`
	`3`	`+ID NAME TYPE STATE ZONE PUBLIC IP PRIVATE IP TAGS IMAGE NAME ROUTED IP ENABLED MODIFICATION DATE CREATION DATE VOLUMES PROTECTED SECURITY GROUP NAME SECURITY GROUP ID STATE DETAIL ARCH IMAGE ID PROJECT ID`
	`4`	`+6ab3aeee-069c-493c-895c-f7328500e45b cli-srv-priceless-black DEV1-S archived fr-par-1 51.158.97.101 - [] Ubuntu 22.04 Jammy Jellyfish true few seconds ago few seconds ago 1 false Default security group da505169-540e-4c2b-b0da-c854139224e0 - x86_64 6d3c053e-c728-4294-b23a-560b62a4d592 fa1e3217-dc80-42ac-85c3-3f034b78b552`
	`5`	`+fbe2e3c3-411c-4ba5-b3f1-2eded5a8b985 tf-srv-naughty-colden POP2-2C-8G-WIN archived fr-par-1 - - [] Windows Server 2022 true few seconds ago few seconds ago 1 false Default security group da505169-540e-4c2b-b0da-c854139224e0 - x86_64 5d355a7d-8abb-4418-9599-e26621bf7ca8 fa1e3217-dc80-42ac-85c3-3f034b78b552`
	`6`	`+6ffbe4b0-3cf0-407e-8e87-2c67defd8897 tf-tests-instance-block-external-root-volume PLAY2-PICO archived fr-par-1 - - [] Ubuntu 22.04 Jammy Jellyfish true few seconds ago few seconds ago 1 false Default security group c30bff3f-a276-4c5b-bb3e-92ecab6e962e - x86_64 6d3c053e-c728-4294-b23a-560b62a4d592 44693172-d6a3-49b0-b56f-011f492e4dfa`
`7`	`7`	`🟩🟩🟩 JSON STDOUT 🟩🟩🟩`
`8`	`8`	`[`
`9`	`9`	`{`