Utilized formatAPIPath

linode · Jun 18, 2024 · 04caf51 · 04caf51
1 parent bb43a31
commit 04caf51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/account_oauth_client.go b/account_oauth_client.go
@@ -2,8 +2,6 @@ package linodego
 
 import (
 	"context"
-	"fmt"
-	"net/url"
 )
 
 // OAuthClientStatus constants start with OAuthClient and include Linode API Instance Status values
@@ -94,9 +92,7 @@ func (c *Client) ListOAuthClients(ctx context.Context, opts *ListOptions) ([]OAu
 
 // GetOAuthClient gets the OAuthClient with the provided ID
 func (c *Client) GetOAuthClient(ctx context.Context, clientID string) (*OAuthClient, error) {
-	clientID = url.PathEscape(clientID)
-	e := fmt.Sprintf("account/oauth-clients/%s", clientID)
-
+	e := formatAPIPath("account/oauth-clients/%s", clientID)
 	response, err := doGETRequest[OAuthClient](ctx, c, e)
 	if err != nil {
 		return nil, err
@@ -118,9 +114,7 @@ func (c *Client) CreateOAuthClient(ctx context.Context, opts OAuthClientCreateOp
 
 // UpdateOAuthClient updates the OAuthClient with the specified id
 func (c *Client) UpdateOAuthClient(ctx context.Context, clientID string, opts OAuthClientUpdateOptions) (*OAuthClient, error) {
-	clientID = url.PathEscape(clientID)
-
-	e := fmt.Sprintf("account/oauth-clients/%s", clientID)
+	e := formatAPIPath("account/oauth-clients/%s", clientID)
 	response, err := doPUTRequest[OAuthClient](ctx, c, e, opts)
 	if err != nil {
 		return nil, err
@@ -131,8 +125,7 @@ func (c *Client) UpdateOAuthClient(ctx context.Context, clientID string, opts OA
 
 // DeleteOAuthClient deletes the OAuthClient with the specified id
 func (c *Client) DeleteOAuthClient(ctx context.Context, clientID string) error {
-	clientID = url.PathEscape(clientID)
-	e := fmt.Sprintf("account/oauth-clients/%s", clientID)
+	e := formatAPIPath("account/oauth-clients/%s", clientID)
 	err := doDELETERequest(ctx, c, e)
 	return err
 }
diff --git a/account_payments.go b/account_payments.go
@@ -3,7 +3,6 @@ package linodego
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"time"
 
 	"github.com/linode/linodego/internal/parseabletime"
@@ -68,8 +67,7 @@ func (c *Client) ListPayments(ctx context.Context, opts *ListOptions) ([]Payment
 
 // GetPayment gets the payment with the provided ID
 func (c *Client) GetPayment(ctx context.Context, paymentID int) (*Payment, error) {
-	e := fmt.Sprintf("account/payments/%d", paymentID)
-
+	e := formatAPIPath("account/payments/%d", paymentID)
 	response, err := doGETRequest[Payment](ctx, c, e)
 	if err != nil {
 		return nil, err

diff --git a/account_user_grants.go b/account_user_grants.go
@@ -2,8 +2,6 @@ package linodego
 
 import (
 	"context"
-	"fmt"
-	"net/url"
 )
 
 type GrantPermissionLevel string
@@ -68,8 +66,7 @@ type UserGrantsUpdateOptions struct {
 }
 
 func (c *Client) GetUserGrants(ctx context.Context, username string) (*UserGrants, error) {
-	username = url.PathEscape(username)
-	e := fmt.Sprintf("account/users/%s/grants", username)
+	e := formatAPIPath("account/users/%s/grants", username)
 	response, err := doGETRequest[UserGrants](ctx, c, e)
 	if err != nil {
 		return nil, err
@@ -79,8 +76,7 @@ func (c *Client) GetUserGrants(ctx context.Context, username string) (*UserGrant
 }
 
 func (c *Client) UpdateUserGrants(ctx context.Context, username string, opts UserGrantsUpdateOptions) (*UserGrants, error) {
-	username = url.PathEscape(username)
-	e := fmt.Sprintf("account/users/%s/grants", username)
+	e := formatAPIPath("account/users/%s/grants", username)
 	response, err := doPUTRequest[UserGrants](ctx, c, e, opts)
 	if err != nil {
 		return nil, err