Merge branch 'main' into TPT-2873_firewall_rules-instance_firewalls

Author: ezilber-akamai

account_child.go

@@ -14,6 +14,7 @@ type ChildAccount = Account
 type ChildAccountToken = Token
 
 // ListChildAccounts lists child accounts under the current account.
+// NOTE: Parent/Child related features may not be generally available.
 func (c *Client) ListChildAccounts(ctx context.Context, opts *ListOptions) ([]ChildAccount, error) {
 	return getPaginatedResults[ChildAccount](
 		ctx,
@@ -24,6 +25,7 @@ func (c *Client) ListChildAccounts(ctx context.Context, opts *ListOptions) ([]Ch
 }
 
 // GetChildAccount gets a single child accounts under the current account.
+// NOTE: Parent/Child related features may not be generally available.
 func (c *Client) GetChildAccount(ctx context.Context, euuid string) (*ChildAccount, error) {
 	return doGETRequest[ChildAccount](
 		ctx,
@@ -35,6 +37,7 @@ func (c *Client) GetChildAccount(ctx context.Context, euuid string) (*ChildAccou
 // CreateChildAccountToken creates a short-lived token that can be used to
 // access the Linode API under a child account.
 // The attributes of this token are not currently configurable.
+// NOTE: Parent/Child related features may not be generally available.
 func (c *Client) CreateChildAccountToken(ctx context.Context, euuid string) (*ChildAccountToken, error) {
 	return doPOSTRequest[ChildAccountToken, any](
 		ctx,

account_users.go

@@ -3,11 +3,8 @@ package linodego
 import (
 	"context"
 	"encoding/json"
-	"fmt"
-	"net/url"
 	"time"
 
-	"github.com/go-resty/resty/v2"
 	"github.com/linode/linodego/internal/parseabletime"
 )
 
@@ -82,91 +79,53 @@ func (i User) GetUpdateOptions() (o UserUpdateOptions) {
 	return
 }
 
-// UsersPagedResponse represents a paginated User API response
-type UsersPagedResponse struct {
-	*PageOptions
-	Data []User `json:"data"`
-}
-
-// endpoint gets the endpoint URL for User
-func (UsersPagedResponse) endpoint(_ ...any) string {
-	return "account/users"
-}
-
-func (resp *UsersPagedResponse) castResult(r *resty.Request, e string) (int, int, error) {
-	res, err := coupleAPIErrors(r.SetResult(UsersPagedResponse{}).Get(e))
-	if err != nil {
-		return 0, 0, err
-	}
-	castedRes := res.Result().(*UsersPagedResponse)
-	resp.Data = append(resp.Data, castedRes.Data...)
-	return castedRes.Pages, castedRes.Results, nil
-}
-
 // ListUsers lists Users on the account
 func (c *Client) ListUsers(ctx context.Context, opts *ListOptions) ([]User, error) {
-	response := UsersPagedResponse{}
-	err := c.listHelper(ctx, &response, opts)
+	response, err := getPaginatedResults[User](ctx, c, "account/users", opts)
 	if err != nil {
 		return nil, err
 	}
 
-	return response.Data, nil
+	return response, nil
 }
 
 // GetUser gets the user with the provided ID
 func (c *Client) GetUser(ctx context.Context, userID string) (*User, error) {
-	userID = url.PathEscape(userID)
-	e := fmt.Sprintf("account/users/%s", userID)
-	req := c.R(ctx).SetResult(&User{})
-	r, err := coupleAPIErrors(req.Get(e))
+	e := formatAPIPath("account/users/%s", userID)
+	response, err := doGETRequest[User](ctx, c, e)
 	if err != nil {
 		return nil, err
 	}
 
-	return r.Result().(*User), nil
+	return response, nil
 }
 
 // CreateUser creates a User.  The email address must be confirmed before the
 // User account can be accessed.
 func (c *Client) CreateUser(ctx context.Context, opts UserCreateOptions) (*User, error) {
-	body, err := json.Marshal(opts)
-	if err != nil {
-		return nil, err
-	}
-
 	e := "account/users"
-	req := c.R(ctx).SetResult(&User{}).SetBody(string(body))
-	r, err := coupleAPIErrors(req.Post(e))
+	response, err := doPOSTRequest[User](ctx, c, e, opts)
 	if err != nil {
 		return nil, err
 	}
 
-	return r.Result().(*User), nil
+	return response, nil
 }
 
 // UpdateUser updates the User with the specified id
 func (c *Client) UpdateUser(ctx context.Context, userID string, opts UserUpdateOptions) (*User, error) {
-	body, err := json.Marshal(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	userID = url.PathEscape(userID)
-	e := fmt.Sprintf("account/users/%s", userID)
-	req := c.R(ctx).SetResult(&User{}).SetBody(string(body))
-	r, err := coupleAPIErrors(req.Put(e))
+	e := formatAPIPath("account/users/%s", userID)
+	response, err := doPUTRequest[User](ctx, c, e, opts)
 	if err != nil {
 		return nil, err
 	}
 
-	return r.Result().(*User), nil
+	return response, nil
 }
 
 // DeleteUser deletes the User with the specified id
 func (c *Client) DeleteUser(ctx context.Context, userID string) error {
-	userID = url.PathEscape(userID)
-	e := fmt.Sprintf("account/users/%s", userID)
-	_, err := coupleAPIErrors(c.R(ctx).Delete(e))
+	e := formatAPIPath("account/users/%s", userID)
+	err := doDELETERequest(ctx, c, e)
 	return err
 }

betas.go

@@ -3,11 +3,8 @@ package linodego
 import (
 	"context"
 	"encoding/json"
-	"fmt"
-	"net/url"
 	"time"
 
-	"github.com/go-resty/resty/v2"
 	"github.com/linode/linodego/internal/parseabletime"
 )
 
@@ -32,17 +29,6 @@ type BetaProgram struct {
 	MoreInfo string `json:"more_info"`
 }
 
-// BetasPagedResponse represents a paginated Beta Programs API response
-type BetasPagedResponse struct {
-	*PageOptions
-	Data []BetaProgram `json:"data"`
-}
-
-// endpoint gets the endpoint URL for BetaProgram
-func (BetasPagedResponse) endpoint(_ ...any) string {
-	return "/betas"
-}
-
 // UnmarshalJSON implements the json.Unmarshaler interface
 func (beta *BetaProgram) UnmarshalJSON(b []byte) error {
 	type Mask BetaProgram
@@ -65,35 +51,23 @@ func (beta *BetaProgram) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (resp *BetasPagedResponse) castResult(r *resty.Request, e string) (int, int, error) {
-	res, err := coupleAPIErrors(r.SetResult(BetasPagedResponse{}).Get(e))
-	if err != nil {
-		return 0, 0, err
-	}
-	castedRes := res.Result().(*BetasPagedResponse)
-	resp.Data = append(resp.Data, castedRes.Data...)
-	return castedRes.Pages, castedRes.Results, nil
-}
-
 // ListBetaPrograms lists active beta programs
 func (c *Client) ListBetaPrograms(ctx context.Context, opts *ListOptions) ([]BetaProgram, error) {
-	response := BetasPagedResponse{}
-	err := c.listHelper(ctx, &response, opts)
+	response, err := getPaginatedResults[BetaProgram](ctx, c, "/betas", opts)
 	if err != nil {
 		return nil, err
 	}
-	return response.Data, nil
+
+	return response, nil
 }
 
 // GetBetaProgram gets the beta program's detail with the ID
 func (c *Client) GetBetaProgram(ctx context.Context, betaID string) (*BetaProgram, error) {
-	req := c.R(ctx).SetResult(&BetaProgram{})
-	betaID = url.PathEscape(betaID)
-	b := fmt.Sprintf("betas/%s", betaID)
-	r, err := coupleAPIErrors(req.Get(b))
+	e := formatAPIPath("betas/%s", betaID)
+	response, err := doGETRequest[BetaProgram](ctx, c, e)
 	if err != nil {
 		return nil, err
 	}
 
-	return r.Result().(*BetaProgram), nil
+	return response, nil
 }