fix: resolve all golangci-lint errors

Fixes 15 pre-existing lint issues:

errcheck (6 issues):
- mol_distill.go: Add _ = for f.Close() and os.Remove()
- routed.go: Add _ = for routedStorage.Close() (4 locations)

gosec (8 issues):
- maintenance.go, routes.go: Add nolint for G304 (file paths from known dirs)
- mol_distill.go: Add nolint for G304 (file creation in known search paths)
- formula.go: Change WriteFile permissions from 0644 to 0600 (G306)
- gate.go: Add nolint for G204 (exec.Command with trusted AwaitID fields)

misspell (1 issue):
- gate.go: Fix "cancelled" -> "canceled" in comment

unparam (2 issues):
- cook.go, controlflow.go: Add nolint for functions returning always-nil error

Also:
- Update pre-commit-hooks to v6.0.0
- Add lint step to "Landing the Plane" session-end protocol
This commit is contained in:
Ryan Snodgrass
2025-12-26 19:20:03 -05:00
parent b977c1f947
commit 350a78f1ba
10 changed files with 25 additions and 18 deletions

View File

@@ -6,7 +6,7 @@ repos:
args: [--timeout=5m] args: [--timeout=5m]
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0 rev: v6.0.0
hooks: hooks:
- id: trailing-whitespace - id: trailing-whitespace
- id: end-of-file-fixer - id: end-of-file-fixer

View File

@@ -99,7 +99,10 @@ The 30-second debounce provides a **transaction window** for batch operations -
**MANDATORY WORKFLOW - COMPLETE ALL STEPS:** **MANDATORY WORKFLOW - COMPLETE ALL STEPS:**
1. **File beads issues for any remaining work** that needs follow-up 1. **File beads issues for any remaining work** that needs follow-up
2. **Ensure all quality gates pass** (only if code changes were made) - run tests, linters, builds (file P0 issues if broken) 2. **Ensure all quality gates pass** (only if code changes were made):
- Run `make lint` or `golangci-lint run ./...` (if pre-commit installed: `pre-commit run --all-files`)
- Run `make test` or `go test ./...`
- File P0 issues if quality gates are broken
3. **Update beads issues** - close finished work, update status 3. **Update beads issues** - close finished work, update status
4. **PUSH TO REMOTE - NON-NEGOTIABLE** - This step is MANDATORY. Execute ALL commands below: 4. **PUSH TO REMOTE - NON-NEGOTIABLE** - This step is MANDATORY. Execute ALL commands below:
```bash ```bash

View File

@@ -365,6 +365,8 @@ type cookFormulaResult struct {
// cookFormulaToSubgraph creates an in-memory TemplateSubgraph from a resolved formula. // cookFormulaToSubgraph creates an in-memory TemplateSubgraph from a resolved formula.
// This is the ephemeral proto implementation - no database storage. // This is the ephemeral proto implementation - no database storage.
// The returned subgraph can be passed directly to cloneSubgraph for instantiation. // The returned subgraph can be passed directly to cloneSubgraph for instantiation.
//
//nolint:unparam // error return kept for API consistency with future error handling
func cookFormulaToSubgraph(f *formula.Formula, protoID string) (*TemplateSubgraph, error) { func cookFormulaToSubgraph(f *formula.Formula, protoID string) (*TemplateSubgraph, error) {
// Map step ID -> created issue // Map step ID -> created issue
issueMap := make(map[string]*types.Issue) issueMap := make(map[string]*types.Issue)

View File

@@ -312,7 +312,7 @@ func CheckCompactionCandidates(path string) DoctorCheck {
// the actual beads directory location. // the actual beads directory location.
func resolveBeadsDir(beadsDir string) string { func resolveBeadsDir(beadsDir string) string {
redirectFile := filepath.Join(beadsDir, "redirect") redirectFile := filepath.Join(beadsDir, "redirect")
data, err := os.ReadFile(redirectFile) data, err := os.ReadFile(redirectFile) //nolint:gosec // redirect file path is constructed from known beadsDir
if err != nil { if err != nil {
// No redirect file - use original path // No redirect file - use original path
return beadsDir return beadsDir

View File

@@ -564,7 +564,7 @@ func runFormulaConvert(cmd *cobra.Command, args []string) {
tomlPath := strings.TrimSuffix(jsonPath, formula.FormulaExtJSON) + formula.FormulaExtTOML tomlPath := strings.TrimSuffix(jsonPath, formula.FormulaExtJSON) + formula.FormulaExtTOML
// Write the TOML file // Write the TOML file
if err := os.WriteFile(tomlPath, tomlData, 0644); err != nil { if err := os.WriteFile(tomlPath, tomlData, 0600); err != nil {
fmt.Fprintf(os.Stderr, "Error writing %s: %v\n", tomlPath, err) fmt.Fprintf(os.Stderr, "Error writing %s: %v\n", tomlPath, err)
os.Exit(1) os.Exit(1)
} }
@@ -623,7 +623,7 @@ func convertAllFormulas() {
continue continue
} }
if err := os.WriteFile(tomlPath, tomlData, 0644); err != nil { if err := os.WriteFile(tomlPath, tomlData, 0600); err != nil {
fmt.Fprintf(os.Stderr, "✗ Error writing %s: %v\n", tomlPath, err) fmt.Fprintf(os.Stderr, "✗ Error writing %s: %v\n", tomlPath, err)
errors++ errors++
continue continue

View File

@@ -870,7 +870,7 @@ func evalTimerGate(gate *types.Issue, now time.Time) (bool, string) {
// ghRunStatus represents the JSON output of `gh run view --json` // ghRunStatus represents the JSON output of `gh run view --json`
type ghRunStatus struct { type ghRunStatus struct {
Status string `json:"status"` // queued, in_progress, completed Status string `json:"status"` // queued, in_progress, completed
Conclusion string `json:"conclusion"` // success, failure, cancelled, skipped, etc. Conclusion string `json:"conclusion"` // success, failure, canceled, skipped, etc.
} }
// evalGHRunGate checks if a GitHub Actions run has completed. // evalGHRunGate checks if a GitHub Actions run has completed.
@@ -882,7 +882,7 @@ func evalGHRunGate(gate *types.Issue) (bool, string) {
} }
// Run gh CLI to get run status // Run gh CLI to get run status
cmd := exec.Command("gh", "run", "view", runID, "--json", "status,conclusion") cmd := exec.Command("gh", "run", "view", runID, "--json", "status,conclusion") //nolint:gosec // runID is from trusted issue.AwaitID field
output, err := cmd.Output() output, err := cmd.Output()
if err != nil { if err != nil {
// gh CLI failed - could be network issue, invalid run ID, or gh not installed // gh CLI failed - could be network issue, invalid run ID, or gh not installed
@@ -924,7 +924,7 @@ func evalGHPRGate(gate *types.Issue) (bool, string) {
} }
// Run gh CLI to get PR status // Run gh CLI to get PR status
cmd := exec.Command("gh", "pr", "view", prNumber, "--json", "state,mergedAt") cmd := exec.Command("gh", "pr", "view", prNumber, "--json", "state,mergedAt") //nolint:gosec // prNumber is from trusted issue.AwaitID field
output, err := cmd.Output() output, err := cmd.Output()
if err != nil { if err != nil {
// gh CLI failed - could be network issue, invalid PR, or gh not installed // gh CLI failed - could be network issue, invalid PR, or gh not installed

View File

@@ -254,9 +254,9 @@ func findWritableFormulaDir(formulaName string) string {
if err := os.MkdirAll(dir, 0755); err == nil { if err := os.MkdirAll(dir, 0755); err == nil {
// Check if we can write to it // Check if we can write to it
testPath := filepath.Join(dir, ".write-test") testPath := filepath.Join(dir, ".write-test")
if f, err := os.Create(testPath); err == nil { if f, err := os.Create(testPath); err == nil { //nolint:gosec // testPath is constructed from known search paths
f.Close() _ = f.Close()
os.Remove(testPath) _ = os.Remove(testPath)
return filepath.Join(dir, formulaName+formula.FormulaExt) return filepath.Join(dir, formulaName+formula.FormulaExt)
} }
} }

View File

@@ -50,14 +50,14 @@ func resolveAndGetIssueWithRouting(ctx context.Context, localStore storage.Stora
// Step 2: Resolve and get from routed store // Step 2: Resolve and get from routed store
result, err := resolveAndGetFromStore(ctx, routedStorage.Storage, id, true) result, err := resolveAndGetFromStore(ctx, routedStorage.Storage, id, true)
if err != nil { if err != nil {
routedStorage.Close() _ = routedStorage.Close()
return nil, err return nil, err
} }
if result != nil { if result != nil {
result.closeFn = func() { routedStorage.Close() } result.closeFn = func() { _ = routedStorage.Close() }
return result, nil return result, nil
} }
routedStorage.Close() _ = routedStorage.Close()
} }
// Step 3: Fall back to local store // Step 3: Fall back to local store
@@ -133,7 +133,7 @@ func getIssueWithRouting(ctx context.Context, localStore storage.Storage, id str
// Step 3: Try the routed storage // Step 3: Try the routed storage
routedIssue, routedErr := routedStorage.Storage.GetIssue(ctx, id) routedIssue, routedErr := routedStorage.Storage.GetIssue(ctx, id)
if routedErr != nil || routedIssue == nil { if routedErr != nil || routedIssue == nil {
routedStorage.Close() _ = routedStorage.Close()
// Return the original error if routing also failed // Return the original error if routing also failed
if err != nil { if err != nil {
return nil, err return nil, err
@@ -148,7 +148,7 @@ func getIssueWithRouting(ctx context.Context, localStore storage.Storage, id str
Routed: true, Routed: true,
ResolvedID: id, ResolvedID: id,
closeFn: func() { closeFn: func() {
routedStorage.Close() _ = routedStorage.Close()
}, },
}, nil }, nil
} }

View File

@@ -212,6 +212,8 @@ func expandLoopWithVars(step *Step, vars map[string]string) ([]*Step, error) {
// expandLoopIteration expands a single iteration of a loop. // expandLoopIteration expands a single iteration of a loop.
// The iteration index is used to generate unique step IDs. // The iteration index is used to generate unique step IDs.
// The iterVars map contains loop variable bindings for this iteration (gt-8tmz.27). // The iterVars map contains loop variable bindings for this iteration (gt-8tmz.27).
//
//nolint:unparam // error return kept for API consistency with future error handling
func expandLoopIteration(step *Step, iteration int, iterVars map[string]string) ([]*Step, error) { func expandLoopIteration(step *Step, iteration int, iterVars map[string]string) ([]*Step, error) {
result := make([]*Step, 0, len(step.Loop.Body)) result := make([]*Step, 0, len(step.Loop.Body))

View File

@@ -26,7 +26,7 @@ type Route struct {
// Returns an empty slice if the file doesn't exist. // Returns an empty slice if the file doesn't exist.
func LoadRoutes(beadsDir string) ([]Route, error) { func LoadRoutes(beadsDir string) ([]Route, error) {
routesPath := filepath.Join(beadsDir, RoutesFileName) routesPath := filepath.Join(beadsDir, RoutesFileName)
file, err := os.Open(routesPath) file, err := os.Open(routesPath) //nolint:gosec // routesPath is constructed from known beadsDir
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil // No routes file is not an error return nil, nil // No routes file is not an error
@@ -116,7 +116,7 @@ func ResolveBeadsDirForID(ctx context.Context, id, currentBeadsDir string) (stri
// and resolves the redirect path if present. // and resolves the redirect path if present.
func resolveRedirect(beadsDir string) string { func resolveRedirect(beadsDir string) string {
redirectFile := filepath.Join(beadsDir, "redirect") redirectFile := filepath.Join(beadsDir, "redirect")
data, err := os.ReadFile(redirectFile) data, err := os.ReadFile(redirectFile) //nolint:gosec // redirectFile is constructed from known beadsDir
if err != nil { if err != nil {
if os.Getenv("BD_DEBUG_ROUTING") != "" { if os.Getenv("BD_DEBUG_ROUTING") != "" {
fmt.Fprintf(os.Stderr, "[routing] No redirect file at %s: %v\n", redirectFile, err) fmt.Fprintf(os.Stderr, "[routing] No redirect file at %s: %v\n", redirectFile, err)