migrate audit.go and authorization.go

Emyrk · Emyrk · commit 6437a3f50db7 · 2024-11-14T14:05:56.000-06:00
diff --git a/codersdk/audit.go b/codersdk/audit.go
@@ -179,45 +179,33 @@ type CreateTestAuditLogRequest struct {
 
 // AuditLogs retrieves audit logs from the given page.
 func (c *Client) AuditLogs(ctx context.Context, req AuditLogsRequest) (AuditLogResponse, error) {
-	res, err := c.Request(ctx, http.MethodGet, "/api/v2/audit", nil, req.Pagination.asRequestOption(), func(r *http.Request) {
-		q := r.URL.Query()
-		var params []string
-		if req.SearchQuery != "" {
-			params = append(params, req.SearchQuery)
-		}
-		q.Set("q", strings.Join(params, " "))
-		r.URL.RawQuery = q.Encode()
+	return makeSDKRequest[AuditLogResponse](ctx, c, sdkRequestArgs{
+		Method: http.MethodGet,
+		URL:    "/api/v2/audit",
+		ReqOpts: []RequestOption{
+			req.Pagination.asRequestOption(),
+			func(r *http.Request) {
+				q := r.URL.Query()
+				var params []string
+				if req.SearchQuery != "" {
+					params = append(params, req.SearchQuery)
+				}
+				q.Set("q", strings.Join(params, " "))
+				r.URL.RawQuery = q.Encode()
+			},
+		},
+		ExpectCode: http.StatusOK,
 	})
-	if err != nil {
-		return AuditLogResponse{}, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != http.StatusOK {
-		return AuditLogResponse{}, ReadBodyAsError(res)
-	}
-
-	var logRes AuditLogResponse
-	err = json.NewDecoder(res.Body).Decode(&logRes)
-	if err != nil {
-		return AuditLogResponse{}, err
-	}
-
-	return logRes, nil
 }
 
 // CreateTestAuditLog creates a fake audit log. Only owners of the organization
 // can perform this action. It's used for testing purposes.
 func (c *Client) CreateTestAuditLog(ctx context.Context, req CreateTestAuditLogRequest) error {
-	res, err := c.Request(ctx, http.MethodPost, "/api/v2/audit/testgenerate", req)
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != http.StatusNoContent {
-		return err
-	}
-
-	return nil
+	_, err := makeSDKRequest[noResponse](ctx, c, sdkRequestArgs{
+		Method:     http.MethodPost,
+		URL:        "/api/v2/audit/testgenerate",
+		Body:       req,
+		ExpectCode: http.StatusNoContent,
+	})
+	return err
 }
diff --git a/codersdk/authorization.go b/codersdk/authorization.go
@@ -2,7 +2,6 @@ package codersdk
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 )
 
@@ -62,14 +61,10 @@ type AuthorizationObject struct {
 // AuthCheck allows the authenticated user to check if they have the given permissions
 // to a set of resources.
 func (c *Client) AuthCheck(ctx context.Context, req AuthorizationRequest) (AuthorizationResponse, error) {
-	res, err := c.Request(ctx, http.MethodPost, "/api/v2/authcheck", req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
-		return AuthorizationResponse{}, ReadBodyAsError(res)
-	}
-	var resp AuthorizationResponse
-	return resp, json.NewDecoder(res.Body).Decode(&resp)
+	return makeSDKRequest[AuthorizationResponse](ctx, c, sdkRequestArgs{
+		Method:     http.MethodPost,
+		URL:        "/api/v2/authcheck",
+		Body:       req,
+		ExpectCode: http.StatusOK,
+	})
 }
