lint-monster: replace magic firewall status codes and collapse codemod helper args via options struct (#42049)

Author: Copilot

pkg/cli/codemod_engine_max_runs.go

@@ -16,13 +16,15 @@ func getEngineMaxRunsToTopLevelCodemod() Codemod {
 			return migrateEngineFieldToTopLevel(
 				content,
 				frontmatter,
-				"max-runs",
-				"max-turns",
-				[]string{"max-runs", "max-turns"},
-				engineMaxRunsCodemodLog,
-				"Skipping engine.max-runs migration for inline-map engine syntax; migrate to top-level max-turns manually",
-				"Removed deprecated engine.max-runs (top-level max-runs/max-turns already present)",
-				"Migrated engine.max-runs to top-level max-turns",
+				migrateEngineFieldToTopLevelOptions{
+					engineField:            "max-runs",
+					targetTopLevelField:    "max-turns",
+					preserveTopLevelFields: []string{"max-runs", "max-turns"},
+					log:                    engineMaxRunsCodemodLog,
+					skipInlineMessage:      "Skipping engine.max-runs migration for inline-map engine syntax; migrate to top-level max-turns manually",
+					removedMessage:         "Removed deprecated engine.max-runs (top-level max-runs/max-turns already present)",
+					migratedMessage:        "Migrated engine.max-runs to top-level max-turns",
+				},
 			)
 		},
 	}

pkg/cli/codemod_engine_max_turns.go

@@ -16,13 +16,15 @@ func getEngineMaxTurnsToTopLevelCodemod() Codemod {
 			return migrateEngineFieldToTopLevel(
 				content,
 				frontmatter,
-				"max-turns",
-				"max-turns",
-				[]string{"max-turns"},
-				engineMaxTurnsCodemodLog,
-				"Skipping engine.max-turns migration for inline-map engine syntax; migrate to top-level max-turns manually",
-				"Removed deprecated engine.max-turns (top-level max-turns already present)",
-				"Migrated engine.max-turns to top-level max-turns",
+				migrateEngineFieldToTopLevelOptions{
+					engineField:            "max-turns",
+					targetTopLevelField:    "max-turns",
+					preserveTopLevelFields: []string{"max-turns"},
+					log:                    engineMaxTurnsCodemodLog,
+					skipInlineMessage:      "Skipping engine.max-turns migration for inline-map engine syntax; migrate to top-level max-turns manually",
+					removedMessage:         "Removed deprecated engine.max-turns (top-level max-turns already present)",
+					migratedMessage:        "Migrated engine.max-turns to top-level max-turns",
+				},
 			)
 		},
 	}

pkg/cli/codemod_engine_to_top_level_helpers.go

@@ -6,16 +6,20 @@ import (
 	"github.com/github/gh-aw/pkg/logger"
 )
 
+type migrateEngineFieldToTopLevelOptions struct {
+	engineField            string
+	targetTopLevelField    string
+	preserveTopLevelFields []string
+	log                    *logger.Logger
+	skipInlineMessage      string
+	removedMessage         string
+	migratedMessage        string
+}
+
 func migrateEngineFieldToTopLevel(
 	content string,
 	frontmatter map[string]any,
-	engineField string,
-	targetTopLevelField string,
-	preserveTopLevelFields []string,
-	log *logger.Logger,
-	skipInlineMessage string,
-	removedMessage string,
-	migratedMessage string,
+	opts migrateEngineFieldToTopLevelOptions,
 ) (string, bool, error) {
 	engineValue, hasEngine := frontmatter["engine"]
 	if !hasEngine {
@@ -25,12 +29,12 @@ func migrateEngineFieldToTopLevel(
 	if !ok {
 		return content, false, nil
 	}
-	if _, hasEngineField := engineMap[engineField]; !hasEngineField {
+	if _, hasEngineField := engineMap[opts.engineField]; !hasEngineField {
 		return content, false, nil
 	}
 
 	hasPreservedTopLevelField := false
-	for _, field := range preserveTopLevelFields {
+	for _, field := range opts.preserveTopLevelFields {
 		if _, exists := frontmatter[field]; exists {
 			hasPreservedTopLevelField = true
 			break
@@ -44,9 +48,9 @@ func migrateEngineFieldToTopLevel(
 				continue
 			}
 			inlineValue := strings.TrimSpace(strings.TrimPrefix(trimmed, "engine:"))
-			if strings.HasPrefix(inlineValue, "{") && strings.Contains(inlineValue, engineField+":") {
-				if log != nil {
-					log.Print(skipInlineMessage)
+			if strings.HasPrefix(inlineValue, "{") && strings.Contains(inlineValue, opts.engineField+":") {
+				if opts.log != nil {
+					opts.log.Print(opts.skipInlineMessage)
 				}
 				return lines, false
 			}
@@ -55,7 +59,7 @@ func migrateEngineFieldToTopLevel(
 		fieldSuffix := ""
 		inEngineBlock := false
 		engineIndent := ""
-		engineFieldPrefix := engineField + ":"
+		engineFieldPrefix := opts.engineField + ":"
 		for _, line := range lines {
 			trimmed := strings.TrimSpace(line)
 			if isTopLevelKey(line) && strings.HasPrefix(trimmed, "engine:") {
@@ -75,14 +79,14 @@ func migrateEngineFieldToTopLevel(
 			}
 		}
 
-		result, removed := removeFieldFromBlock(lines, engineField, "engine")
+		result, removed := removeFieldFromBlock(lines, opts.engineField, "engine")
 		if !removed {
 			return lines, false
 		}
 
 		if hasPreservedTopLevelField {
-			if log != nil {
-				log.Print(removedMessage)
+			if opts.log != nil {
+				opts.log.Print(opts.removedMessage)
 			}
 			return result, true
 		}
@@ -95,14 +99,14 @@ func migrateEngineFieldToTopLevel(
 			}
 		}
 
-		topLevelLine := targetTopLevelField + ":" + fieldSuffix
+		topLevelLine := opts.targetTopLevelField + ":" + fieldSuffix
 		withTopLevel := make([]string, 0, len(result)+1)
 		withTopLevel = append(withTopLevel, result[:insertAt]...)
 		withTopLevel = append(withTopLevel, topLevelLine)
 		withTopLevel = append(withTopLevel, result[insertAt:]...)
 
-		if log != nil {
-			log.Print(migratedMessage)
+		if opts.log != nil {
+			opts.log.Print(opts.migratedMessage)
 		}
 		return withTopLevel, true
 	})

pkg/cli/firewall_log.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"bufio"
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -243,10 +244,10 @@ func parseFirewallLogLine(line string) *FirewallLogEntry {
 func isRequestAllowed(decision, status string) bool {
 	// Check status code first
 	if statusCode, err := strconv.Atoi(status); err == nil {
-		if statusCode == 200 || statusCode == 206 || statusCode == 304 {
+		if statusCode == http.StatusOK || statusCode == http.StatusPartialContent || statusCode == http.StatusNotModified {
 			return true
 		}
-		if statusCode == 403 || statusCode == 407 {
+		if statusCode == http.StatusForbidden || statusCode == http.StatusProxyAuthRequired {
 			return false
 		}
 	}

pkg/cli/firewall_policy.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -234,10 +235,10 @@ func isEntryHTTPS(entry AuditLogEntry) bool {
 // This mirrors the classification logic used by the firewall log parser.
 func isEntryAllowed(entry AuditLogEntry) bool {
 	status := entry.Status
-	if status == 200 || status == 206 || status == 304 {
+	if status == http.StatusOK || status == http.StatusPartialContent || status == http.StatusNotModified {
 		return true
 	}
-	if status == 403 || status == 407 {
+	if status == http.StatusForbidden || status == http.StatusProxyAuthRequired {
 		return false
 	}
 	decision := entry.Decision