From 9448f229c89d4c4c1b030987e6a4b55d82a2fde7 Mon Sep 17 00:00:00 2001
From: phm07 <22707808+phm07@users.noreply.github.com>
Date: Thu, 9 Jul 2026 10:26:01 +0200
Subject: [PATCH] fix(primary-ip): format IPv6 properly in describe

---
 internal/cmd/primaryip/describe.go      |  8 ++-
 internal/cmd/primaryip/describe_test.go | 75 +++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/internal/cmd/primaryip/describe.go b/internal/cmd/primaryip/describe.go
index f78e31dee..fbe96a625 100644
--- a/internal/cmd/primaryip/describe.go
+++ b/internal/cmd/primaryip/describe.go
@@ -32,7 +32,13 @@ var DescribeCmd = base.DescribeCmd[*hcloud.PrimaryIP]{
 		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))
 		fmt.Fprintf(out, "Type:\t%s\n", primaryIP.Type)
-		fmt.Fprintf(out, "IP:\t%s\n", primaryIP.IP.String())
+
+		if primaryIP.Network != nil {
+			fmt.Fprintf(out, "IP:\t%s\n", primaryIP.Network.String())
+		} else {
+			fmt.Fprintf(out, "IP:\t%s\n", primaryIP.IP.String())
+		}
+
 		fmt.Fprintf(out, "Blocked:\t%s\n", util.YesNo(primaryIP.Blocked))
 		fmt.Fprintf(out, "Auto delete:\t%s\n", util.YesNo(primaryIP.AutoDelete))
 
diff --git a/internal/cmd/primaryip/describe_test.go b/internal/cmd/primaryip/describe_test.go
index 5263a1018..1f29f2c30 100644
--- a/internal/cmd/primaryip/describe_test.go
+++ b/internal/cmd/primaryip/describe_test.go
@@ -88,3 +88,78 @@ Location:
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }
+
+func TestDescribeIPv6(t *testing.T) {
+	fx := testutil.NewFixture(t)
+	defer fx.Finish()
+
+	time.Local = time.UTC
+
+	cmd := primaryip.DescribeCmd.CobraCommand(fx.State())
+	fx.ExpectEnsureToken()
+
+	ip, ipNet, _ := net.ParseCIDR("2001:db8::/64")
+
+	primaryIP := &hcloud.PrimaryIP{
+		ID:           10,
+		Name:         "test-net",
+		Type:         "ipv6",
+		Created:      time.Date(2036, 8, 12, 12, 0, 0, 0, time.UTC),
+		IP:           ip,
+		Network:      ipNet,
+		Blocked:      true,
+		AutoDelete:   false,
+		AssigneeType: "server",
+		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().
+		Get(gomock.Any(), "10").
+		Return(primaryIP, nil, nil)
+
+	out, errOut, err := fx.Run(cmd, []string{"10"})
+
+	expOut := fmt.Sprintf(`ID:           10
+Name:         test-net
+Created:      %s (%s)
+Type:         ipv6
+IP:           2001:db8::/64
+Blocked:      yes
+Auto delete:  no
+
+Assignee:
+  Not assigned
+
+DNS:
+  No reverse DNS entries
+
+Protection:
+  Delete:  no
+
+Labels:
+  No labels
+
+Location:
+  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)
+	assert.Empty(t, errOut)
+	assert.Equal(t, expOut, out)
+}