addressed review comments

digitalocean · Nov 27, 2024 · e81dfeb · e81dfeb
1 parent 96c363f
commit e81dfeb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/reserved_ipv6.go b/reserved_ipv6.go
@@ -14,8 +14,8 @@ const reservedIPV6sBasePath = "v2/reserved_ipv6"
 // endpoints of the Digital Ocean API.
 type ReservedIPV6sService interface {
 	List(context.Context, *ListOptions) ([]ReservedIPV6, *Response, error)
-	Get(context.Context, string) (*ReservedIPV6Resp, *Response, error)
-	Create(context.Context, *ReservedIPV6CreateRequest) (*ReservedIPV6Resp, *Response, error)
+	Get(context.Context, string) (*ReservedIPV6, *Response, error)
+	Create(context.Context, *ReservedIPV6CreateRequest) (*ReservedIPV6, *Response, error)
 	Delete(context.Context, string) (*Response, error)
 }
 
@@ -34,11 +34,11 @@ type ReservedIPV6 struct {
 	ReservedAt time.Time `json:"reserved_at"`
 	Droplet    *Droplet  `json:"droplet,omitempty"`
 }
-type ReservedIPV6Resp struct {
+type reservedIPV6Root struct {
 	ReservedIPV6 *ReservedIPV6 `json:"reserved_ipv6"`
 }
 
-type ReservedIPV6List struct {
+type reservedIPV6sRoot struct {
 	ReservedIPV6s []ReservedIPV6 `json:"reserved_ipv6s"`
 	Links         *Links         `json:"links"`
 	Meta          *Meta          `json:"meta"`
@@ -71,7 +71,7 @@ func (r *ReservedIPV6sServiceOp) List(ctx context.Context, opt *ListOptions) ([]
 		return nil, nil, err
 	}
 
-	root := new(ReservedIPV6List)
+	root := new(reservedIPV6sRoot)
 	resp, err := r.client.Do(ctx, req, root)
 	if err != nil {
 		return nil, nil, err
@@ -87,39 +87,39 @@ func (r *ReservedIPV6sServiceOp) List(ctx context.Context, opt *ListOptions) ([]
 }
 
 // Get an individual reserved IPv6.
-func (r *ReservedIPV6sServiceOp) Get(ctx context.Context, ip string) (*ReservedIPV6Resp, *Response, error) {
+func (r *ReservedIPV6sServiceOp) Get(ctx context.Context, ip string) (*ReservedIPV6, *Response, error) {
 	path := fmt.Sprintf("%s/%s", reservedIPV6sBasePath, ip)
 
 	req, err := r.client.NewRequest(ctx, http.MethodGet, path, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	root := new(ReservedIPV6Resp)
+	root := new(reservedIPV6Root)
 	resp, err := r.client.Do(ctx, req, root)
 	if err != nil {
 		return nil, resp, err
 	}
 
-	return root, resp, err
+	return root.ReservedIPV6, resp, err
 }
 
 // Create a new IPv6
-func (r *ReservedIPV6sServiceOp) Create(ctx context.Context, reserveRequest *ReservedIPV6CreateRequest) (*ReservedIPV6Resp, *Response, error) {
+func (r *ReservedIPV6sServiceOp) Create(ctx context.Context, reserveRequest *ReservedIPV6CreateRequest) (*ReservedIPV6, *Response, error) {
 	path := reservedIPV6sBasePath
 
 	req, err := r.client.NewRequest(ctx, http.MethodPost, path, reserveRequest)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	root := new(ReservedIPV6Resp)
+	root := new(reservedIPV6Root)
 	resp, err := r.client.Do(ctx, req, root)
 	if err != nil {
 		return nil, resp, err
 	}
 
-	return root, resp, err
+	return root.ReservedIPV6, resp, err
 }
 
 // Delete a reserved IPv6.

diff --git a/reserved_ipv6_test.go b/reserved_ipv6_test.go
@@ -38,9 +38,9 @@ func TestReservedIPV6s_Create(t *testing.T) {
 		t.Errorf("ReservedIPV6s.Create returned error: %v", err)
 	}
 
-	expected := &ReservedIPV6Resp{ReservedIPV6: &ReservedIPV6{RegionSlug: "nyc3", IP: "2604:a880:800:14::42c3:d000", ReservedAt: nowTime}}
+	expected := &reservedIPV6Root{ReservedIPV6: &ReservedIPV6{RegionSlug: "nyc3", IP: "2604:a880:800:14::42c3:d000", ReservedAt: nowTime}}
 
-	if !equalReserveIPv6Objects(reservedIP.ReservedIPV6, expected.ReservedIPV6) {
+	if !equalReserveIPv6Objects(reservedIP, expected.ReservedIPV6) {
 		t.Errorf("ReservedIPV6s.Create returned %+v, expected %+v", reservedIP, expected)
 	}
 }
@@ -123,8 +123,8 @@ func TestReservedIPV6s_Get(t *testing.T) {
 		t.Errorf("ReservedIPV6s.Get returned error: %v", err)
 	}
 
-	expected := &ReservedIPV6Resp{ReservedIPV6: &ReservedIPV6{RegionSlug: "nyc3", Droplet: &Droplet{ID: 1}, IP: "2604:a880:800:14::42c3:d001", ReservedAt: nowTime}}
-	if !equalReserveIPv6Objects(reservedIP.ReservedIPV6, expected.ReservedIPV6) {
+	expected := &reservedIPV6Root{ReservedIPV6: &ReservedIPV6{RegionSlug: "nyc3", Droplet: &Droplet{ID: 1}, IP: "2604:a880:800:14::42c3:d001", ReservedAt: nowTime}}
+	if !equalReserveIPv6Objects(reservedIP, expected.ReservedIPV6) {
 		t.Errorf("ReservedIPV6s.Get returned %+v, expected %+v", reservedIP, expected)
 	}
 }