Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yfodil merged 3 commits into from
Dec 15, 2025
+6 −4
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ff8529
fix(instance): add support for ProjectID in instance server list
remyleone Dec 15, 2025
3c05c7a
Fix
remyleone Dec 15, 2025
06b185a
Merge branch 'master' into project_id_list
remyleone Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/namespaces/instance/v1/custom_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -117,6 +118,7 @@ func serversMarshalerFunc(i any, opt *human.MarshalOpt) (string, error) {
StateDetail: server.StateDetail,
Arch: server.Arch,
ImageID: serverImageID,
ProjectID: server.Project,
})
}

Expand Down
8 changes: 4 additions & 4 deletions internal/namespaces/instance/v1/testdata/test-list-server-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 🟩🟩🟩
[
{
Expand Down
Loading