From 4e7034075363baa598a94c07083aa2a0d2779701 Mon Sep 17 00:00:00 2001
From: "Jonas L." <jooola@users.noreply.github.com>
Date: Mon, 11 Nov 2024 16:56:06 +0100
Subject: [PATCH] fix: do not send primary IPs ID opts to the API (#552)

The ID is not part of the request body docs, but was still send. This
removes the ID from the request body.
---
 hcloud/primary_ip.go      |  8 +++----
 hcloud/primary_ip_test.go | 44 +++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/hcloud/primary_ip.go b/hcloud/primary_ip.go
index 5d241e6d..05c412ee 100644
--- a/hcloud/primary_ip.go
+++ b/hcloud/primary_ip.go
@@ -119,7 +119,7 @@ type PrimaryIPUpdateOpts struct {
 // PrimaryIPAssignOpts defines the request to
 // assign a Primary IP to an assignee (usually a server).
 type PrimaryIPAssignOpts struct {
-	ID           int64
+	ID           int64  `json:"-"`
 	AssigneeID   int64  `json:"assignee_id"`
 	AssigneeType string `json:"assignee_type"`
 }
@@ -133,7 +133,7 @@ type PrimaryIPAssignResult struct {
 // PrimaryIPChangeDNSPtrOpts defines the request to
 // change a DNS PTR entry from a Primary IP.
 type PrimaryIPChangeDNSPtrOpts struct {
-	ID     int64
+	ID     int64  `json:"-"`
 	DNSPtr string `json:"dns_ptr"`
 	IP     string `json:"ip"`
 }
@@ -147,8 +147,8 @@ type PrimaryIPChangeDNSPtrResult struct {
 // PrimaryIPChangeProtectionOpts defines the request to
 // change protection configuration of a Primary IP.
 type PrimaryIPChangeProtectionOpts struct {
-	ID     int64
-	Delete bool `json:"delete"`
+	ID     int64 `json:"-"`
+	Delete bool  `json:"delete"`
 }
 
 // PrimaryIPChangeProtectionResult defines the response
diff --git a/hcloud/primary_ip_test.go b/hcloud/primary_ip_test.go
index e53c9365..a61c8455 100644
--- a/hcloud/primary_ip_test.go
+++ b/hcloud/primary_ip_test.go
@@ -368,18 +368,15 @@ func TestPrimaryIPClient(t *testing.T) {
 				t.Error("expected POST")
 			}
 			w.Header().Set("Content-Type", "application/json")
-			expectedReqBody := PrimaryIPAssignOpts{
-				AssigneeType: "server",
-				AssigneeID:   1,
-				ID:           1,
-			}
+
 			if err := json.NewDecoder(r.Body).Decode(&reqBody); err != nil {
 				t.Fatal(err)
 			}
-			if !cmp.Equal(expectedReqBody, reqBody) {
-				t.Log(cmp.Diff(expectedReqBody, reqBody))
-				t.Error("unexpected request body")
-			}
+
+			assert.Equal(t, int64(1), reqBody.AssigneeID)
+			assert.Equal(t, "server", reqBody.AssigneeType)
+			assert.Equal(t, int64(0), reqBody.ID)
+
 			json.NewEncoder(w).Encode(PrimaryIPAssignResult{
 				Action: schema.Action{ID: 1},
 			})
@@ -428,16 +425,15 @@ func TestPrimaryIPClient(t *testing.T) {
 				t.Error("expected POST")
 			}
 			w.Header().Set("Content-Type", "application/json")
-			expectedReqBody := PrimaryIPChangeDNSPtrOpts{
-				ID: 1,
-			}
+
 			if err := json.NewDecoder(r.Body).Decode(&reqBody); err != nil {
 				t.Fatal(err)
 			}
-			if !cmp.Equal(expectedReqBody, reqBody) {
-				t.Log(cmp.Diff(expectedReqBody, reqBody))
-				t.Error("unexpected request body")
-			}
+
+			assert.Equal(t, "value", reqBody.DNSPtr)
+			assert.Equal(t, "127.0.0.1", reqBody.IP)
+			assert.Equal(t, int64(0), reqBody.ID)
+
 			json.NewEncoder(w).Encode(PrimaryIPChangeDNSPtrResult{
 				Action: schema.Action{ID: 1},
 			})
@@ -445,7 +441,9 @@ func TestPrimaryIPClient(t *testing.T) {
 
 		ctx := context.Background()
 		opts := PrimaryIPChangeDNSPtrOpts{
-			ID: 1,
+			ID:     1,
+			DNSPtr: "value",
+			IP:     "127.0.0.1",
 		}
 
 		action, resp, err := env.Client.PrimaryIP.ChangeDNSPtr(ctx, opts)
@@ -463,17 +461,13 @@ func TestPrimaryIPClient(t *testing.T) {
 				t.Error("expected POST")
 			}
 			w.Header().Set("Content-Type", "application/json")
-			expectedReqBody := PrimaryIPChangeProtectionOpts{
-				ID:     1,
-				Delete: true,
-			}
 			if err := json.NewDecoder(r.Body).Decode(&reqBody); err != nil {
 				t.Fatal(err)
 			}
-			if !cmp.Equal(expectedReqBody, reqBody) {
-				t.Log(cmp.Diff(expectedReqBody, reqBody))
-				t.Error("unexpected request body")
-			}
+
+			assert.True(t, reqBody.Delete)
+			assert.Equal(t, int64(0), reqBody.ID)
+
 			json.NewEncoder(w).Encode(PrimaryIPChangeProtectionResult{
 				Action: schema.Action{ID: 1},
 			})