From 048e0bc643533043795e354860bfac5684e87d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Bourgois?= Date: Mon, 2 Mar 2020 17:12:08 +0100 Subject: [PATCH] chore: reorder instance server list collumns (#738) --- .../namespaces/instance/v1/custom_server.go | 28 ++++++++++--------- .../test-list-server-simple.stdout.golden | 4 +-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/internal/namespaces/instance/v1/custom_server.go b/internal/namespaces/instance/v1/custom_server.go index 46febaf8e1..55dc574c20 100644 --- a/internal/namespaces/instance/v1/custom_server.go +++ b/internal/namespaces/instance/v1/custom_server.go @@ -53,22 +53,23 @@ func serversMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) type humanServerInList struct { ID string Name string + Type string State instance.ServerState Zone scw.Zone PublicIP net.IP PrivateIP *string - ImageName string Tags []string + ImageName string + PlacementGroup *instance.PlacementGroup ModificationDate time.Time CreationDate time.Time - ImageID string - Protected bool Volumes int - SecurityGroupID string + Protected bool SecurityGroupName string + SecurityGroupID string StateDetail string Arch instance.Arch - PlacementGroup *instance.PlacementGroup + ImageID string } servers := i.([]*instance.Server) @@ -87,22 +88,23 @@ func serversMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error) humanServers = append(humanServers, &humanServerInList{ ID: server.ID, Name: server.Name, + Type: server.CommercialType, State: server.State, Zone: server.Zone, - ModificationDate: server.ModificationDate, - CreationDate: server.CreationDate, - ImageID: serverImageID, - ImageName: serverImageName, - Protected: server.Protected, PublicIP: publicIPAddress, PrivateIP: server.PrivateIP, + Tags: server.Tags, + ImageName: serverImageName, + PlacementGroup: server.PlacementGroup, + ModificationDate: server.ModificationDate, + CreationDate: server.CreationDate, Volumes: len(server.Volumes), - SecurityGroupID: server.SecurityGroup.ID, + Protected: server.Protected, SecurityGroupName: server.SecurityGroup.Name, + SecurityGroupID: server.SecurityGroup.ID, StateDetail: server.StateDetail, Arch: server.Arch, - PlacementGroup: server.PlacementGroup, - Tags: server.Tags, + ImageID: serverImageID, }) } return human.Marshal(humanServers, opt) diff --git a/internal/namespaces/instance/v1/testdata/test-list-server-simple.stdout.golden b/internal/namespaces/instance/v1/testdata/test-list-server-simple.stdout.golden index fb8f8aa43d..1acfd1421a 100644 --- a/internal/namespaces/instance/v1/testdata/test-list-server-simple.stdout.golden +++ b/internal/namespaces/instance/v1/testdata/test-list-server-simple.stdout.golden @@ -1,2 +1,2 @@ -ID NAME STATE ZONE PUBLIC IP PRIVATE IP IMAGE NAME TAGS MODIFICATION DATE CREATION DATE IMAGE ID PROTECTED VOLUMES SECURITY GROUP ID SECURITY GROUP NAME STATE DETAIL ARCH -18e19087-4435-420b-abf7-a47c50a77fe7 cli-srv-mystifying-brattain archived fr-par-1 163.172.170.53 Ubuntu Bionic Beaver [] few seconds ago few seconds ago f974feac-abae-4365-b988-8ec7d1cec10d false 1 49822f6c-1d32-465c-a017-720691d159b2 Default security group - x86_64 +ID NAME TYPE STATE ZONE PUBLIC IP PRIVATE IP TAGS IMAGE NAME MODIFICATION DATE CREATION DATE VOLUMES PROTECTED SECURITY GROUP NAME SECURITY GROUP ID STATE DETAIL ARCH IMAGE ID +18e19087-4435-420b-abf7-a47c50a77fe7 cli-srv-mystifying-brattain DEV1-S archived fr-par-1 163.172.170.53 [] Ubuntu Bionic Beaver few seconds ago few seconds ago 1 false Default security group 49822f6c-1d32-465c-a017-720691d159b2 - x86_64 f974feac-abae-4365-b988-8ec7d1cec10d