Refactor error handling in MCP tools to reduce code duplication

Extract duplicated OCM error handling logic into a reusable utility function handleOCMError(). This consolidates 36 lines of repeated error handling across 4 tool handlers into a single 14-line utility function, improving code maintainability and consistency.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: tiwillia

pkg/mcp/tools.go

@@ -68,16 +68,8 @@ func (s *Server) handleWhoami(ctx context.Context, ctr mcp.CallToolRequest) (*mc
 
 	// Call OCM client to get current account
 	account, err := client.GetCurrentAccount()
-	if err != nil {
-		// Handle OCM API errors with enhanced token expiration detection
-		if ocmErr, ok := err.(*ocm.OCMError); ok {
-			// Return specific error for token expiration
-			if ocm.IsAccessTokenExpiredError(ocmErr) {
-				return mcp.NewToolResultError("AUTHENTICATION_FAILED: " + ocmErr.Error()), nil
-			}
-			return NewTextResult("", errors.New("OCM API Error ["+ocmErr.Code+"]: "+ocmErr.Reason)), nil
-		}
-		return NewTextResult("", errors.New("failed to get account: "+err.Error())), nil
+	if errorResult := handleOCMError(err, "failed to get account"); errorResult != nil {
+		return errorResult, nil
 	}
 
 	// Format response using MCP layer formatter
@@ -105,16 +97,8 @@ func (s *Server) handleGetClusters(ctx context.Context, ctr mcp.CallToolRequest)
 
 	// Call OCM client to get clusters with state filter
 	clusters, err := client.GetClusters(state)
-	if err != nil {
-		// Handle OCM API errors with enhanced token expiration detection
-		if ocmErr, ok := err.(*ocm.OCMError); ok {
-			// Return specific error for token expiration
-			if ocm.IsAccessTokenExpiredError(ocmErr) {
-				return mcp.NewToolResultError("AUTHENTICATION_FAILED: " + ocmErr.Error()), nil
-			}
-			return NewTextResult("", errors.New("OCM API Error ["+ocmErr.Code+"]: "+ocmErr.Reason)), nil
-		}
-		return NewTextResult("", errors.New("failed to get clusters: "+err.Error())), nil
+	if errorResult := handleOCMError(err, "failed to get clusters"); errorResult != nil {
+		return errorResult, nil
 	}
 
 	// Format response using MCP layer formatter
@@ -142,16 +126,8 @@ func (s *Server) handleGetCluster(ctx context.Context, ctr mcp.CallToolRequest)
 
 	// Call OCM client to get cluster details
 	cluster, err := client.GetCluster(clusterID)
-	if err != nil {
-		// Handle OCM API errors with enhanced token expiration detection
-		if ocmErr, ok := err.(*ocm.OCMError); ok {
-			// Return specific error for token expiration
-			if ocm.IsAccessTokenExpiredError(ocmErr) {
-				return mcp.NewToolResultError("AUTHENTICATION_FAILED: " + ocmErr.Error()), nil
-			}
-			return NewTextResult("", errors.New("OCM API Error ["+ocmErr.Code+"]: "+ocmErr.Reason)), nil
-		}
-		return NewTextResult("", errors.New("failed to get cluster: "+err.Error())), nil
+	if errorResult := handleOCMError(err, "failed to get cluster"); errorResult != nil {
+		return errorResult, nil
 	}
 
 	// Format response using MCP layer formatter
@@ -271,16 +247,8 @@ func (s *Server) handleCreateROSAHCPCluster(ctx context.Context, ctr mcp.CallToo
 		subnetIDs, availabilityZones, region,
 		multiArchEnabled,
 	)
-	if err != nil {
-		// Handle OCM API errors with enhanced token expiration detection
-		if ocmErr, ok := err.(*ocm.OCMError); ok {
-			// Return specific error for token expiration
-			if ocm.IsAccessTokenExpiredError(ocmErr) {
-				return mcp.NewToolResultError("AUTHENTICATION_FAILED: " + ocmErr.Error()), nil
-			}
-			return NewTextResult("", errors.New("OCM API Error ["+ocmErr.Code+"]: "+ocmErr.Reason)), nil
-		}
-		return NewTextResult("", errors.New("cluster creation failed: "+err.Error())), nil
+	if errorResult := handleOCMError(err, "cluster creation"); errorResult != nil {
+		return errorResult, nil
 	}
 
 	// Format response using MCP layer formatter
@@ -310,3 +278,21 @@ func NewTextResult(content string, err error) *mcp.CallToolResult {
 		},
 	}
 }
+
+// handleOCMError processes OCM API errors with enhanced token expiration detection
+// Returns an appropriate MCP CallToolResult for the error, or nil if no error
+func handleOCMError(err error, operation string) *mcp.CallToolResult {
+	if err == nil {
+		return nil
+	}
+
+	// Handle OCM API errors with enhanced token expiration detection
+	if ocmErr, ok := err.(*ocm.OCMError); ok {
+		// Return specific error for token expiration
+		if ocm.IsAccessTokenExpiredError(ocmErr) {
+			return mcp.NewToolResultError("AUTHENTICATION_FAILED: " + ocmErr.Error())
+		}
+		return NewTextResult("", errors.New("OCM API Error ["+ocmErr.Code+"]: "+ocmErr.Reason))
+	}
+	return NewTextResult("", errors.New(operation+" failed: "+err.Error()))
+}