Clean up code

Author: michaeljacholke

pkg/github/issue_fields.go

@@ -4,10 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 
-	ghErrors "github.com/github/github-mcp-server/pkg/errors"
 	"github.com/github/github-mcp-server/pkg/inventory"
 	"github.com/github/github-mcp-server/pkg/scopes"
 	"github.com/github/github-mcp-server/pkg/translations"
@@ -87,15 +85,6 @@ func ListOrgIssueFields(t translations.TranslationHelperFunc) inventory.ServerTo
 				}
 				return utils.NewToolResultErrorFromErr("failed to list issue fields", err), nil, nil
 			}
-			defer func() { _ = resp.Body.Close() }()
-
-			if resp.StatusCode != http.StatusOK {
-				body, readErr := io.ReadAll(resp.Body)
-				if readErr != nil {
-					return utils.NewToolResultErrorFromErr("failed to read response body", readErr), nil, nil
-				}
-				return ghErrors.NewGitHubAPIStatusErrorResponse(ctx, "failed to list issue fields", resp, body), nil, nil
-			}
 
 			r, err := json.Marshal(fields)
 			if err != nil {

pkg/github/issue_fields_test.go

@@ -92,6 +92,28 @@ func Test_ListOrgIssueFields(t *testing.T) {
 			expectError:    false,
 			expectedErrMsg: "missing required parameter: org",
 		},
+		{
+			name: "forbidden returns error",
+			mockedClient: MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+				"GET /orgs/testorg/issue-fields": mockResponse(t, http.StatusForbidden, `{"message": "Forbidden"}`),
+			}),
+			requestArgs: map[string]any{
+				"org": "testorg",
+			},
+			expectError:    false,
+			expectedErrMsg: "failed to list issue fields",
+		},
+		{
+			name: "internal server error returns error",
+			mockedClient: MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+				"GET /orgs/testorg/issue-fields": mockResponse(t, http.StatusInternalServerError, `{"message": "Internal Server Error"}`),
+			}),
+			requestArgs: map[string]any{
+				"org": "testorg",
+			},
+			expectError:    false,
+			expectedErrMsg: "failed to list issue fields",
+		},
 	}
 
 	for _, tc := range tests {