Skip to content
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.

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

fix: error when updating IPv6 Primary IP #215

Merged
merged 1 commit into from Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 2 additions & 8 deletions hcloud/primary_ip.go
Expand Up @@ -90,12 +90,6 @@ type PrimaryIPUpdateOpts struct {
Name string `json:"name,omitempty"`
}

// PrimaryIPUpdateResult defines the response
// when updating a Primary IP.
type PrimaryIPUpdateResult struct {
PrimaryIP PrimaryIP `json:"primary_ip"`
}

// PrimaryIPAssignOpts defines the request to
// assign a Primary IP to an assignee (usually a server).
type PrimaryIPAssignOpts struct {
Expand Down Expand Up @@ -311,12 +305,12 @@ func (c *PrimaryIPClient) Update(ctx context.Context, primaryIP *PrimaryIP, reqB
return nil, nil, err
}

respBody := PrimaryIPUpdateResult{}
var respBody schema.PrimaryIPUpdateResult
resp, err := c.client.Do(req, &respBody)
if err != nil {
return nil, resp, err
}
return &respBody.PrimaryIP, resp, nil
return PrimaryIPFromSchema(respBody.PrimaryIP), resp, nil
}

// Assign a Primary IP to a resource
Expand Down
12 changes: 8 additions & 4 deletions hcloud/primary_ip_test.go
Expand Up @@ -3,6 +3,7 @@ package hcloud
import (
"context"
"encoding/json"
"net"
"net/http"
"testing"

Expand Down Expand Up @@ -333,8 +334,8 @@ func TestPrimaryIPClient(t *testing.T) {
t.Log(cmp.Diff(expectedReqBody, reqBody))
t.Error("unexpected request body")
}
json.NewEncoder(w).Encode(PrimaryIPUpdateResult{
PrimaryIP: PrimaryIP{ID: 1},
json.NewEncoder(w).Encode(schema.PrimaryIPUpdateResult{
PrimaryIP: schema.PrimaryIP{ID: 1, IP: "2001:db8::/64"},
})
})

Expand All @@ -347,11 +348,14 @@ func TestPrimaryIPClient(t *testing.T) {
Labels: &labels,
}

primaryIP := PrimaryIP{ID: 1}
primaryIP := PrimaryIP{ID: 1, IP: net.ParseIP("2001:db8::")}
result, resp, err := env.Client.PrimaryIP.Update(ctx, &primaryIP, opts)
assert.NoError(t, err)
assert.NotNil(t, resp, "no response returned")
assert.Equal(t, *result, primaryIP, "no primary IP returned")
if result.ID != 1 {
t.Errorf("unexpected Primary IP ID: %v", result.ID)
}
assert.Equal(t, primaryIP.IP, result.IP, "parsed the wrong IP")
})
t.Run("Assign", func(t *testing.T) {
env := newTestEnv()
Expand Down
6 changes: 6 additions & 0 deletions hcloud/schema/primary_ip.go
Expand Up @@ -47,3 +47,9 @@ type PrimaryIPGetResult struct {
type PrimaryIPListResult struct {
PrimaryIPs []PrimaryIP `json:"primary_ips"`
}

// PrimaryIPUpdateResult defines the response
// when updating a Primary IP.
type PrimaryIPUpdateResult struct {
PrimaryIP PrimaryIP `json:"primary_ip"`
}