build: fix Phase 1 lint failures from PR #174 CI

CI's golangci-lint flagged 7 issues. All addressed:

- gofmt drift in 4 files (struct-tag alignment): key.go, manifest.go,
  builder_test.go, validate_test.go. Plus a few pre-existing e2e
  test files the formatter touched along the way. `make fmt`-clean.
- errcheck: `defer r.Close()` on zip.OpenReader return — wrap in a
  func literal that discards the error (we're past success at that
  point; nothing to do with a close failure).
- deferInLoop: extracted the per-MANIFEST.MF `f.Open()` + scan into
  a helper (`readManifestMainClass`) so the defer is scoped to one
  call, not a loop iteration. Behaviour unchanged.
- exitAfterDefer in cmd/build.go: previous code called `os.Exit` after
  a `defer cancel()` — the cancel would never run. Removed the inline
  os.Exit; structured errors now flow through cobra RunE return value
  and `cmd/root.go::Execute` renders + sets exit code (the canonical
  path the rest of trond uses).

`make lint` is now clean. `go test ./...` still green.

Author: barbatos2011

cmd/build.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"os/signal"
@@ -115,18 +114,15 @@ func runBuild(cmd *cobra.Command, _ []string) error {
 	ctx, cancel := signal.NotifyContext(cmd.Context(), os.Interrupt, syscall.SIGTERM)
 	defer cancel()
 
-	outputFmt, _ := cmd.Flags().GetString("output")
-
 	res, err := build.Run(ctx, req)
 	if err != nil {
-		var se *output.StructuredError
-		if errors.As(err, &se) {
-			output.WriteError(os.Stderr, se, outputFmt)
-			os.Exit(se.ExitCode)
-		}
+		// StructuredError propagates through cobra RunE; cmd.Execute
+		// renders it and sets the exit code (see cmd/root.go::Execute).
+		// Returning here lets `defer cancel()` run normally.
 		return err
 	}
 
+	outputFmt, _ := cmd.Flags().GetString("output")
 	if outputFmt == "json" {
 		return output.WriteJSON(os.Stdout, res)
 	}

cmd/recipe_matrix_e2e_test.go

@@ -38,8 +38,8 @@ func TestE2E_Recipe_DryRunMatrix(t *testing.T) {
 		expectSteps []string
 	}{
 		{
-			recipe: "nile-test-fullnode",
-			params: []string{"intent_path=" + intentPath},
+			recipe:      "nile-test-fullnode",
+			params:      []string{"intent_path=" + intentPath},
 			expectSteps: []string{"validate", "preflight", "apply", "verify"},
 		},
 		{
@@ -52,13 +52,13 @@ func TestE2E_Recipe_DryRunMatrix(t *testing.T) {
 			expectSteps: []string{"validate", "preflight"},
 		},
 		{
-			recipe: "destroy-private-network-cleanly",
-			params: []string{"network=private-dev"},
+			recipe:      "destroy-private-network-cleanly",
+			params:      []string{"network=private-dev"},
 			expectSteps: []string{"status-check", "destroy"},
 		},
 		{
-			recipe: "recover-failed-upgrade",
-			params: []string{"node=my-fullnode"},
+			recipe:      "recover-failed-upgrade",
+			params:      []string{"node=my-fullnode"},
 			expectSteps: []string{"diagnose", "rollback"},
 		},
 		{

cmd/schema_manifest_e2e_test.go

@@ -33,8 +33,8 @@ func TestE2E_SchemaManifestReverse(t *testing.T) {
 	out := runTrondCtx(ctx, t, env, "schema", "--output", "json")
 
 	var manifest struct {
-		SchemaVersion string `json:"schema_version"`
-		Tool          string `json:"tool"`
+		SchemaVersion string            `json:"schema_version"`
+		Tool          string            `json:"tool"`
 		Commands      []manifestCommand `json:"commands"`
 	}
 	if err := json.Unmarshal(out, &manifest); err != nil {
@@ -59,12 +59,12 @@ func TestE2E_SchemaManifestReverse(t *testing.T) {
 }
 
 type manifestCommand struct {
-	Name        string             `json:"name"`
-	FullName    string             `json:"full_name"`
-	Use         string             `json:"use"`
-	Aliases     []string           `json:"aliases"`
-	Flags       []manifestFlag     `json:"flags"`
-	Subcommands []manifestCommand  `json:"subcommands"`
+	Name        string            `json:"name"`
+	FullName    string            `json:"full_name"`
+	Use         string            `json:"use"`
+	Aliases     []string          `json:"aliases"`
+	Flags       []manifestFlag    `json:"flags"`
+	Subcommands []manifestCommand `json:"subcommands"`
 }
 
 type manifestFlag struct {

cmd/statedir_e2e_test.go

@@ -36,8 +36,8 @@ func TestE2E_StateDirPriority(t *testing.T) {
 		wantNot  []string
 	}{
 		{
-			name:    "flag-beats-env",
-			args:    []string{"--state-dir", flagDir},
+			name: "flag-beats-env",
+			args: []string{"--state-dir", flagDir},
 			extraEnv: []string{
 				"TROND_STATE_DIR=" + envDir,
 			},

internal/build/builder_test.go

@@ -20,10 +20,10 @@ type recordingRunner struct {
 	resolved *resolved
 	outTmp   string
 	// behavior knobs:
-	plantArtifact   string // if non-empty, write this content as the .tmp on Run
-	returnErr       error
-	delayBeforeRun  time.Duration
-	respectCancel   bool
+	plantArtifact  string // if non-empty, write this content as the .tmp on Run
+	returnErr      error
+	delayBeforeRun time.Duration
+	respectCancel  bool
 }
 
 func (r *recordingRunner) RunDockerBuild(ctx context.Context, res *resolved, outDir, outTmp string) error {

internal/build/key.go

@@ -18,9 +18,9 @@ import (
 // GradleArgs (also pass 2) means `--offline` builds don't collide
 // with networked builds.
 type CacheKey struct {
-	GitRevision        string   // full sha
-	PatchHash          string   // sha256 hex if dirty, else ""
-	BuilderImageDigest string   // "sha256:abc..." or override ref
+	GitRevision        string // full sha
+	PatchHash          string // sha256 hex if dirty, else ""
+	BuilderImageDigest string // "sha256:abc..." or override ref
 	JDKVersion         string
 	ArtifactKind       string // "jar" | "image"
 	GradleTask         string

internal/build/manifest.go

@@ -12,24 +12,24 @@ import (
 //
 // Output schema: schemas/output/build.schema.json.
 type Manifest struct {
-	CacheKey         string    `json:"cache_key"`
-	SourcePath       string    `json:"source_path"`
-	SourceRevision   string    `json:"source_revision"`
-	PatchHash        string    `json:"patch_hash,omitempty"`
-	Dirty            bool      `json:"dirty"`
-	BuilderImage     string    `json:"builder_image"`
-	BuilderImageDigest string  `json:"builder_image_digest"`
-	JDKVersion       string    `json:"jdk_version"`
-	ArtifactKind     string    `json:"artifact_kind"` // "jar" | "image"
-	ArtifactPath     string    `json:"artifact_path,omitempty"` // for jar
-	ImageTag         string    `json:"image_tag,omitempty"`     // for image
-	ImageID          string    `json:"image_id,omitempty"`      // for image
-	SHA256           string    `json:"sha256,omitempty"`        // for jar
-	GradleTask       string    `json:"gradle_task"`
-	GradleArgs       []string  `json:"gradle_args,omitempty"`
-	Builder          string    `json:"builder"` // "docker" | "host"
-	DurationMs       int64     `json:"duration_ms"`
-	CreatedAt        time.Time `json:"created_at"`
+	CacheKey           string    `json:"cache_key"`
+	SourcePath         string    `json:"source_path"`
+	SourceRevision     string    `json:"source_revision"`
+	PatchHash          string    `json:"patch_hash,omitempty"`
+	Dirty              bool      `json:"dirty"`
+	BuilderImage       string    `json:"builder_image"`
+	BuilderImageDigest string    `json:"builder_image_digest"`
+	JDKVersion         string    `json:"jdk_version"`
+	ArtifactKind       string    `json:"artifact_kind"`           // "jar" | "image"
+	ArtifactPath       string    `json:"artifact_path,omitempty"` // for jar
+	ImageTag           string    `json:"image_tag,omitempty"`     // for image
+	ImageID            string    `json:"image_id,omitempty"`      // for image
+	SHA256             string    `json:"sha256,omitempty"`        // for jar
+	GradleTask         string    `json:"gradle_task"`
+	GradleArgs         []string  `json:"gradle_args,omitempty"`
+	Builder            string    `json:"builder"` // "docker" | "host"
+	DurationMs         int64     `json:"duration_ms"`
+	CreatedAt          time.Time `json:"created_at"`
 }
 
 // CacheHit is the body returned to callers when a previous build

internal/build/validate.go

@@ -145,17 +145,12 @@ func ValidateJARMainClass(path, expected string) error {
 	if err != nil {
 		return fmt.Errorf("open jar: %w", err)
 	}
-	defer r.Close()
+	defer func() { _ = r.Close() }()
 	for _, f := range r.File {
 		if f.Name != "META-INF/MANIFEST.MF" {
 			continue
 		}
-		rc, err := f.Open()
-		if err != nil {
-			return fmt.Errorf("read manifest: %w", err)
-		}
-		defer rc.Close()
-		got, err := scanManifestMainClass(rc)
+		got, err := readManifestMainClass(f)
 		if err != nil {
 			return err
 		}
@@ -167,6 +162,18 @@ func ValidateJARMainClass(path, expected string) error {
 	return fmt.Errorf("jar has no META-INF/MANIFEST.MF")
 }
 
+// readManifestMainClass scopes the open+close to one function call so
+// the linter sees a clean defer rather than `defer` inside the for
+// loop (deferInLoop) of the caller.
+func readManifestMainClass(f *zip.File) (string, error) {
+	rc, err := f.Open()
+	if err != nil {
+		return "", fmt.Errorf("read manifest: %w", err)
+	}
+	defer func() { _ = rc.Close() }()
+	return scanManifestMainClass(rc)
+}
+
 // scanManifestMainClass extracts the Main-Class value from a JAR
 // manifest. Honors the JAR-manifest spec's line-continuation rule:
 // values longer than 72 bytes wrap to the next line with a leading

internal/build/validate_test.go

@@ -117,9 +117,9 @@ func TestValidateImageTag(t *testing.T) {
 		{"UPPER:case", false},
 		{"foo bar:baz", false},
 		{"foo:bar baz", false},
-		{"foo", false},   // missing tag
-		{"foo:", false},  // empty tag
-		{":bar", false},  // empty repo
+		{"foo", false},  // missing tag
+		{"foo:", false}, // empty tag
+		{":bar", false}, // empty repo
 	}
 	for _, tc := range tests {
 		t.Run(tc.tag, func(t *testing.T) {