fix conflict

instances.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
-	"net/url"
 	"time"
 
 	"github.com/go-resty/resty/v2"
@@ -450,8 +449,10 @@ func (c *Client) MigrateInstance(ctx context.Context, linodeID int, opts Instanc
 // simpleInstanceAction is a helper for Instance actions that take no parameters
 // and return empty responses `{}` unless they return a standard error
 func (c *Client) simpleInstanceAction(ctx context.Context, action string, linodeID int) error {
-	action = url.PathEscape(action)
-	e := fmt.Sprintf("linode/instances/%d/%s", linodeID, action)
-	_, err := coupleAPIErrors(c.R(ctx).Post(e))
+	_, err := doPOSTRequest[any, any](
+		ctx,
+		c,
+		fmt.Sprintf("linode/instances/%d/%s", linodeID, action),
+	)
 	return err
 }

internal/testutil/mock.go

@@ -21,7 +21,7 @@ func MockRequestURL(path string) *regexp.Regexp {
 	return regexp.MustCompile(fmt.Sprintf("/[a-zA-Z0-9]+/%s", strings.TrimPrefix(path, "/")))
 }
 
-func MockRequestBodyValidate(t *testing.T, expected interface{}, response interface{}) httpmock.Responder {
+func MockRequestBodyValidate(t *testing.T, expected any, response any) httpmock.Responder {
 	t.Helper()
 
 	return func(request *http.Request) (*http.Response, error) {
@@ -54,6 +54,18 @@ func MockRequestBodyValidate(t *testing.T, expected interface{}, response interf
 	}
 }
 
+func MockRequestBodyValidateNoBody(t *testing.T, response any) httpmock.Responder {
+	t.Helper()
+
+	return func(request *http.Request) (*http.Response, error) {
+		if request.Body != nil {
+			t.Fatal("got request body when no request body was expected")
+		}
+
+		return httpmock.NewJsonResponse(200, response)
+	}
+}
+
 // CreateMockClient is generic because importing the linodego package will result
 // in a cyclic dependency. This pattern isn't ideal but works for now.
 func CreateMockClient[T any](t *testing.T, createFunc func(*http.Client) T) *T {

request_helpers.go

@@ -122,16 +122,21 @@ func doPOSTRequest[T, O any](
 ) (*T, error) {
 	var resultType T
 
+	numOpts := len(options)
+
+	if numOpts > 1 {
+		return nil, fmt.Errorf("invalid number of options: %d", len(options))
+	}
+
 	req := client.R(ctx).SetResult(&resultType)
 
-	// `null` is not accepted by the API
-	if len(options) > 0 {
+	if numOpts > 0 {
 		body, err := json.Marshal(options[0])
 		if err != nil {
 			return nil, err
 		}
 
-		req = req.SetBody(body)
+		req.SetBody(string(body))
 	}
 
 	r, err := coupleAPIErrors(req.Post(endpoint))
@@ -152,16 +157,21 @@ func doPUTRequest[T, O any](
 ) (*T, error) {
 	var resultType T
 
+	numOpts := len(options)
+
+	if numOpts > 1 {
+		return nil, fmt.Errorf("invalid number of options: %d", len(options))
+	}
+
 	req := client.R(ctx).SetResult(&resultType)
 
-	// `null` is not accepted by the API
-	if len(options) > 0 {
+	if numOpts > 0 {
 		body, err := json.Marshal(options[0])
 		if err != nil {
 			return nil, err
 		}
 
-		req = req.SetBody(body)
+		req.SetBody(string(body))
 	}
 
 	r, err := coupleAPIErrors(req.Put(endpoint))

request_helpers_test.go

@@ -75,6 +75,29 @@ func TestRequestHelpers_post(t *testing.T) {
 	}
 }
 
+func TestRequestHelpers_postNoOptions(t *testing.T) {
+	client := testutil.CreateMockClient(t, NewClient)
+
+	httpmock.RegisterRegexpResponder(
+		"POST",
+		testutil.MockRequestURL("/foo/bar"),
+		testutil.MockRequestBodyValidateNoBody(t, testResponse),
+	)
+
+	result, err := doPOSTRequest[testResultType, any](
+		context.Background(),
+		client,
+		"/foo/bar",
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(*result, testResponse) {
+		t.Fatalf("actual response does not equal desired response: %s", cmp.Diff(result, testResponse))
+	}
+}
+
 func TestRequestHelpers_put(t *testing.T) {
 	client := testutil.CreateMockClient(t, NewClient)
 
@@ -96,6 +119,29 @@ func TestRequestHelpers_put(t *testing.T) {
 	}
 }
 
+func TestRequestHelpers_putNoOptions(t *testing.T) {
+	client := testutil.CreateMockClient(t, NewClient)
+
+	httpmock.RegisterRegexpResponder(
+		"PUT",
+		testutil.MockRequestURL("/foo/bar"),
+		testutil.MockRequestBodyValidateNoBody(t, testResponse),
+	)
+
+	result, err := doPUTRequest[testResultType, any](
+		context.Background(),
+		client,
+		"/foo/bar",
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(*result, testResponse) {
+		t.Fatalf("actual response does not equal desired response: %s", cmp.Diff(result, testResponse))
+	}
+}
+
 func TestRequestHelpers_delete(t *testing.T) {
 	client := testutil.CreateMockClient(t, NewClient)