Always set string to request body to avoid resty logger base64 encode…

… []byte
magodo · Jan 17, 2025 · e594b62 · e594b62
1 parent b1cfe07
commit e594b62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/internal/client/client.go b/internal/client/client.go
@@ -164,7 +164,7 @@ type CreateOption struct {
 	Header Header
 }
 
-func (c *Client) Create(ctx context.Context, path string, body interface{}, opt CreateOption) (*resty.Response, error) {
+func (c *Client) Create(ctx context.Context, path string, body string, opt CreateOption) (*resty.Response, error) {
 	req := c.R().SetContext(ctx).SetBody(body)
 	req.SetQueryParamsFromValues(url.Values(opt.Query))
 	req.SetHeaders(opt.Header)
@@ -202,7 +202,7 @@ type UpdateOption struct {
 	Header             Header
 }
 
-func (c *Client) Update(ctx context.Context, path string, body interface{}, opt UpdateOption) (*resty.Response, error) {
+func (c *Client) Update(ctx context.Context, path string, body string, opt UpdateOption) (*resty.Response, error) {
 	req := c.R().SetContext(ctx).SetBody(body)
 	req.SetQueryParamsFromValues(url.Values(opt.Query))
 	req.SetHeaders(opt.Header)
@@ -226,9 +226,9 @@ type DeleteOption struct {
 	Header Header
 }
 
-func (c *Client) Delete(ctx context.Context, path string, body interface{}, opt DeleteOption) (*resty.Response, error) {
+func (c *Client) Delete(ctx context.Context, path string, body string, opt DeleteOption) (*resty.Response, error) {
 	req := c.R().SetContext(ctx)
-	if body != nil {
+	if body != "" {
 		req = req.SetHeader("Content-Type", "application/json")
 		req.SetBody(body)
 	}
@@ -272,7 +272,7 @@ func (c *Client) Operation(ctx context.Context, path string, body basetypes.Dyna
 				return nil, fmt.Errorf("convert body from dynamic to json: %v", err)
 			}
 
-			req.SetBody(b)
+			req.SetBody(string(b))
 		case "application/x-www-form-urlencoded":
 			ov, ok := body.UnderlyingValue().(types.Object)
 			if !ok {

diff --git a/internal/provider/resource.go b/internal/provider/resource.go
@@ -1133,7 +1133,7 @@ func (r Resource) Update(ctx context.Context, req resource.UpdateRequest, resp *
 			}
 		}
 
-		response, err := c.Update(ctx, path, planBody, *opt)
+		response, err := c.Update(ctx, path, string(planBody), *opt)
 		if err != nil {
 			resp.Diagnostics.AddError(
 				"Error to call update",
@@ -1251,16 +1251,16 @@ func (r Resource) Delete(ctx context.Context, req resource.DeleteRequest, resp *
 		}
 	}
 
-	var body interface{}
+	var body string
 	if db := state.DeleteBody; !db.IsNull() {
-		var err error
-		body, err = dynamic.ToJSON(db)
+		b, err := dynamic.ToJSON(db)
 		if err != nil {
 			resp.Diagnostics.AddError(
 				"Failed to marshal `delete_body`",
 				err.Error(),
 			)
 		}
+		body = string(b)
 	}
 
 	response, err := c.Delete(ctx, path, body, *opt)