feat: review feedback

Author: apricote

internal/cmd/datacenter/describe.go

@@ -41,14 +41,14 @@ func DescribeDatacenter(client hcapi2.Client, datacenter *hcloud.Datacenter, sho
 	fmt.Fprintf(&sb, "Name:\t%s\n", datacenter.Name)
 	fmt.Fprintf(&sb, "Description:\t%s\n", datacenter.Description)
 
-	fmt.Fprintln(&sb)
-	fmt.Fprintf(&sb, "Location:\n")
-	fmt.Fprint(&sb, util.PrefixLines(location.DescribeLocation(datacenter.Location), "  "))
-
 	if short {
 		return sb.String()
 	}
 
+	fmt.Fprintln(&sb)
+	fmt.Fprintf(&sb, "Location:\n")
+	fmt.Fprint(&sb, util.PrefixLines(location.DescribeLocation(datacenter.Location), "  "))
+
 	type ServerTypeStatus struct {
 		ID        int64
 		Available bool

internal/cmd/primaryip/describe.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
+	"github.com/hetznercloud/cli/internal/cmd/datacenter"
 	"github.com/hetznercloud/cli/internal/cmd/location"
 	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
@@ -26,7 +27,7 @@ var DescribeCmd = base.DescribeCmd[*hcloud.PrimaryIP]{
 		}
 		return ip, hcloud.SchemaFromPrimaryIP(ip), nil
 	},
-	PrintText: func(_ state.State, _ *cobra.Command, out io.Writer, primaryIP *hcloud.PrimaryIP) error {
+	PrintText: func(s state.State, _ *cobra.Command, out io.Writer, primaryIP *hcloud.PrimaryIP) error {
 		fmt.Fprintf(out, "ID:\t%d\n", primaryIP.ID)
 		fmt.Fprintf(out, "Name:\t%s\n", primaryIP.Name)
 		fmt.Fprintf(out, "Created:\t%s (%s)\n", util.Datetime(primaryIP.Created), humanize.Time(primaryIP.Created))
@@ -64,6 +65,13 @@ var DescribeCmd = base.DescribeCmd[*hcloud.PrimaryIP]{
 		fmt.Fprintln(out)
 		fmt.Fprintf(out, "Location:\n")
 		fmt.Fprintf(out, "%s", util.PrefixLines(location.DescribeLocation(primaryIP.Location), "  "))
+
+		if primaryIP.Datacenter != nil {
+			fmt.Fprintln(out)
+			fmt.Fprintf(out, "Datacenter:\n")
+			fmt.Fprintf(out, "%s", util.PrefixLines(datacenter.DescribeDatacenter(s.Client(), primaryIP.Datacenter, true), "  "))
+		}
+
 		return nil
 	},
 }

internal/cmd/primaryip/describe_test.go

@@ -35,7 +35,16 @@ func TestDescribe(t *testing.T) {
 		Blocked:      true,
 		AutoDelete:   false,
 		AssigneeType: "server",
-		Location:     &hcloud.Location{ID: 0},
+		Location: &hcloud.Location{
+			ID:          3,
+			Name:        "hel1",
+			Description: "Helsinki DC Park 1",
+			NetworkZone: "eu-central",
+			Country:     "FI",
+			City:        "Helsinki",
+			Latitude:    60.169855,
+			Longitude:   24.938379,
+		},
 	}
 
 	fx.Client.PrimaryIPClient.EXPECT().
@@ -65,14 +74,14 @@ Labels:
   No labels
 
 Location:
-  ID:            0
-  Name:          
-  Description:   
-  Network Zone:  
-  Country:       
-  City:          
-  Latitude:      0.000000
-  Longitude:     0.000000
+  ID:            3
+  Name:          hel1
+  Description:   Helsinki DC Park 1
+  Network Zone:  eu-central
+  Country:       FI
+  City:          Helsinki
+  Latitude:      60.169855
+  Longitude:     24.938379
 `, util.Datetime(primaryIP.Created), humanize.Time(primaryIP.Created))
 
 	require.NoError(t, err)

internal/cmd/server/describe.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
+	"github.com/hetznercloud/cli/internal/cmd/datacenter"
 	"github.com/hetznercloud/cli/internal/cmd/image"
 	"github.com/hetznercloud/cli/internal/cmd/iso"
 	"github.com/hetznercloud/cli/internal/cmd/location"
@@ -148,6 +149,12 @@ var DescribeCmd = base.DescribeCmd[*hcloud.Server]{
 		fmt.Fprintf(out, "Location:\n")
 		fmt.Fprint(out, util.PrefixLines(location.DescribeLocation(server.Location), "  "))
 
+		if server.Datacenter != nil {
+			fmt.Fprintln(out)
+			fmt.Fprintf(out, "Datacenter:\n")
+			fmt.Fprintf(out, "%s", util.PrefixLines(datacenter.DescribeDatacenter(s.Client(), server.Datacenter, true), "  "))
+		}
+
 		fmt.Fprintln(out)
 		if server.BackupWindow != "" {
 			fmt.Fprintf(out, "Backup Window:\t%s\n", server.BackupWindow)

internal/cmd/server/list.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	humanize "github.com/dustin/go-humanize"
+	"github.com/dustin/go-humanize"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
@@ -37,7 +37,7 @@ var serverStatusStrings = []string{
 var ListCmd = &base.ListCmd[*hcloud.Server, schema.Server]{
 	ResourceNamePlural: "Servers",
 	JSONKeyGetByName:   "servers",
-	DefaultColumns:     []string{"id", "name", "status", "ipv4", "ipv6", "private_net", "datacenter", "age"},
+	DefaultColumns:     []string{"id", "name", "status", "ipv4", "ipv6", "private_net", "location", "age"},
 	SortOption:         config.OptionSortServer,
 
 	AdditionalFlags: func(cmd *cobra.Command) {
@@ -89,7 +89,11 @@ var ListCmd = &base.ListCmd[*hcloud.Server, schema.Server]{
 				return humanize.IBytes(server.OutgoingTraffic)
 			}).
 			AddFieldFn("datacenter", func(server *hcloud.Server) string {
-				return server.Datacenter.Name
+				if server.Datacenter != nil {
+					return server.Datacenter.Name
+				} else {
+					return "-"
+				}
 			}).
 			AddFieldFn("location", func(server *hcloud.Server) string {
 				return server.Location.Name

internal/cmd/server/list_test.go

@@ -34,10 +34,10 @@ func TestList(t *testing.T) {
 		).
 		Return([]*hcloud.Server{
 			{
-				ID:         123,
-				Name:       "test",
-				Status:     hcloud.ServerStatusRunning,
-				Datacenter: &hcloud.Datacenter{Name: "fsn1-dc14"},
+				ID:       123,
+				Name:     "test",
+				Status:   hcloud.ServerStatusRunning,
+				Location: &hcloud.Location{Name: "fsn1"},
 				PublicNet: hcloud.ServerPublicNet{
 					IPv4: hcloud.ServerPublicNetIPv4{
 						IP: net.ParseIP("192.168.2.1"),
@@ -49,8 +49,8 @@ func TestList(t *testing.T) {
 
 	out, errOut, err := fx.Run(cmd, []string{"--status", "running"})
 
-	expOut := `ID    NAME   STATUS    IPV4          IPV6   PRIVATE NET   DATACENTER   AGE
-123   test   running   192.168.2.1   -      -             fsn1-dc14    20s
+	expOut := `ID    NAME   STATUS    IPV4          IPV6   PRIVATE NET   LOCATION   AGE
+123   test   running   192.168.2.1   -      -             fsn1       20s
 `
 
 	require.NoError(t, err)