Format code with gofmt

devblac · devblac · commit b564deda09e1 · 2025-12-29T21:27:37.000-03:00
diff --git a/internal/analyzer/analyzer.go b/internal/analyzer/analyzer.go
@@ -78,7 +78,6 @@ func (a *Analyzer) Analyze(dockerfile *ast.Dockerfile) []ast.Finding {
 	return allFindings
 }
 
-
 // isIgnoredByInlineComment checks if a finding should be ignored based on inline comments.
 // Inline ignore comments apply to the line immediately following the comment.
 func (a *Analyzer) isIgnoredByInlineComment(dockerfile *ast.Dockerfile, finding ast.Finding) bool {
diff --git a/internal/analyzer/analyzer_property_test.go b/internal/analyzer/analyzer_property_test.go
@@ -722,7 +722,6 @@ func genNonEmptyIgnoreRules() gopter.Gen {
 	}, reflect.TypeOf([]string{}))
 }
 
-
 // **Feature: docker-lint, Property 4: Inline Ignore Effectiveness**
 // **Validates: Requirements 8.3**
 //
diff --git a/internal/analyzer/analyzer_test.go b/internal/analyzer/analyzer_test.go
@@ -63,7 +63,6 @@ RUN apt-get update
 	}
 }
 
-
 func TestAnalyzer_Analyze_InlineIgnore(t *testing.T) {
 	// Dockerfile with inline ignore comment
 	dockerfile := `# docker-lint ignore: DL3006
diff --git a/internal/ast/ast.go b/internal/ast/ast.go
@@ -47,7 +47,6 @@ func (s Severity) String() string {
 	}
 }
 
-
 // Finding represents a lint finding from rule analysis.
 type Finding struct {
 	RuleID     string
@@ -81,9 +80,9 @@ type Stage struct {
 
 // Dockerfile represents a parsed Dockerfile.
 type Dockerfile struct {
-	Stages       []Stage
-	Instructions []Instruction
-	Comments     []Comment
+	Stages        []Stage
+	Instructions  []Instruction
+	Comments      []Comment
 	InlineIgnores map[int][]string // line -> rule IDs to ignore
 }
 
@@ -102,7 +101,6 @@ func (f *FromInstruction) Line() int             { return f.LineNum }
 func (f *FromInstruction) Raw() string           { return f.RawText }
 func (f *FromInstruction) Type() InstructionType { return InstrFROM }
 
-
 // RunInstruction represents a RUN instruction.
 type RunInstruction struct {
 	LineNum int
@@ -166,7 +164,6 @@ func (a *ArgInstruction) Line() int             { return a.LineNum }
 func (a *ArgInstruction) Raw() string           { return a.RawText }
 func (a *ArgInstruction) Type() InstructionType { return InstrARG }
 
-
 // ExposeInstruction represents an EXPOSE instruction.
 type ExposeInstruction struct {
 	LineNum int
@@ -223,7 +220,6 @@ func (v *VolumeInstruction) Line() int             { return v.LineNum }
 func (v *VolumeInstruction) Raw() string           { return v.RawText }
 func (v *VolumeInstruction) Type() InstructionType { return InstrVOLUME }
 
-
 // CmdInstruction represents a CMD instruction.
 type CmdInstruction struct {
 	LineNum int
diff --git a/internal/ast/ast_test.go b/internal/ast/ast_test.go
@@ -44,11 +44,11 @@ func TestFindingCreation(t *testing.T) {
 
 func TestFromInstructionMethods(t *testing.T) {
 	instr := &FromInstruction{
-		LineNum:  1,
-		RawText:  "FROM alpine:3.18 AS builder",
-		Image:    "alpine",
-		Tag:      "3.18",
-		Alias:    "builder",
+		LineNum: 1,
+		RawText: "FROM alpine:3.18 AS builder",
+		Image:   "alpine",
+		Tag:     "3.18",
+		Alias:   "builder",
 	}
 
 	if instr.Line() != 1 {
@@ -62,7 +62,6 @@ func TestFromInstructionMethods(t *testing.T) {
 	}
 }
 
-
 func TestRunInstructionMethods(t *testing.T) {
 	instr := &RunInstruction{
 		LineNum: 5,
@@ -147,7 +146,6 @@ func TestArgInstructionMethods(t *testing.T) {
 	}
 }
 
-
 func TestExposeInstructionMethods(t *testing.T) {
 	instr := &ExposeInstruction{
 		LineNum: 8,
@@ -256,7 +254,6 @@ func TestEntrypointInstructionMethods(t *testing.T) {
 	}
 }
 
-
 func TestHealthcheckInstructionMethods(t *testing.T) {
 	instr := &HealthcheckInstruction{
 		LineNum:  18,
diff --git a/internal/formatter/formatter_test.go b/internal/formatter/formatter_test.go
@@ -136,7 +136,6 @@ func TestTextFormatter_Format(t *testing.T) {
 	}
 }
 
-
 func TestJSONFormatter_Format(t *testing.T) {
 	tests := []struct {
 		name     string
diff --git a/internal/formatter/json.go b/internal/formatter/json.go
@@ -48,7 +48,6 @@ func NewJSONFormatter(filename string, quiet bool) *JSONFormatter {
 	}
 }
 
-
 // Format writes the findings to the given writer as valid JSON.
 func (f *JSONFormatter) Format(findings []ast.Finding, w io.Writer) error {
 	output := JSONOutput{
diff --git a/internal/parser/formatter.go b/internal/parser/formatter.go
@@ -71,7 +71,6 @@ func formatInstruction(instr ast.Instruction) string {
 	}
 }
 
-
 // formatFrom formats a FROM instruction.
 func formatFrom(f *ast.FromInstruction) string {
 	var parts []string
@@ -185,7 +184,6 @@ func formatUser(u *ast.UserInstruction) string {
 	return "USER " + u.User
 }
 
-
 // formatLabel formats a LABEL instruction.
 func formatLabel(l *ast.LabelInstruction) string {
 	if len(l.Labels) == 0 {
diff --git a/internal/parser/formatter_test.go b/internal/parser/formatter_test.go
@@ -65,7 +65,6 @@ func TestFormatFromInstruction(t *testing.T) {
 	}
 }
 
-
 func TestFormatRunInstruction(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -211,7 +210,6 @@ func TestFormatHealthcheckInstruction(t *testing.T) {
 	}
 }
 
-
 func TestFormatFullDockerfile(t *testing.T) {
 	df := &ast.Dockerfile{
 		Instructions: []ast.Instruction{
diff --git a/internal/parser/lexer.go b/internal/parser/lexer.go
@@ -163,7 +163,6 @@ func (l *Lexer) scanToken() Token {
 	return Token{Type: TokenArgument, Value: arg, Line: l.line, Column: startCol}
 }
 
-
 // readNextLine reads the next line from the input, handling line continuations.
 func (l *Lexer) readNextLine() bool {
 	var fullLine strings.Builder
@@ -314,7 +313,6 @@ func (l *Lexer) scanArgument() string {
 	return strings.TrimSpace(result.String())
 }
 
-
 // Reset resets the lexer to read from a new reader.
 func (l *Lexer) Reset(r io.Reader) {
 	l.reader = bufio.NewReader(r)
diff --git a/internal/parser/lexer_test.go b/internal/parser/lexer_test.go
@@ -54,7 +54,6 @@ func TestIsValidInstruction(t *testing.T) {
 	}
 }
 
-
 func TestLexerBasicInstructions(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -241,7 +240,6 @@ func TestLexerBasicInstructions(t *testing.T) {
 	}
 }
 
-
 func TestLexerMultiLineHandling(t *testing.T) {
 	tests := []struct {
 		name              string
@@ -377,7 +375,6 @@ FROM alpine`
 	}
 }
 
-
 func TestLexerEdgeCases(t *testing.T) {
 	t.Run("Empty input", func(t *testing.T) {
 		tokens := TokenizeString("")
@@ -535,7 +532,6 @@ func TestLexerEdgeCases(t *testing.T) {
 	})
 }
 
-
 func TestLexerMultipleInstructions(t *testing.T) {
 	input := `FROM alpine:3.18
 WORKDIR /app
diff --git a/internal/parser/parser.go b/internal/parser/parser.go
@@ -135,7 +135,6 @@ func (p *Parser) Parse(r io.Reader) (*ast.Dockerfile, error) {
 	}
 }
 
-
 // parseInlineIgnore extracts rule IDs from inline ignore comments.
 // Format: # docker-lint ignore: RULE_ID[, RULE_ID...]
 func (p *Parser) parseInlineIgnore(comment string, line int) {
@@ -406,7 +405,6 @@ func (p *Parser) parseAdd(line int, rawText, args string) (*ast.AddInstruction,
 	return instr, nil
 }
 
-
 // parseEnv parses an ENV instruction.
 // Format: ENV <key>=<value> ... or ENV <key> <value>
 func (p *Parser) parseEnv(line int, rawText, args string) (*ast.EnvInstruction, error) {
@@ -745,7 +743,6 @@ func (p *Parser) parseOnbuild(line int, rawText, args string) (*ast.OnbuildInstr
 	return instr, nil
 }
 
-
 // Helper functions
 
 // splitArgs splits arguments respecting quotes.
diff --git a/internal/parser/parser_property_test.go b/internal/parser/parser_property_test.go
@@ -111,7 +111,6 @@ func genInstruction() gopter.Gen {
 	)
 }
 
-
 // genFromInstruction generates a random FROM instruction.
 func genFromInstruction() gopter.Gen {
 	return gopter.CombineGens(
diff --git a/internal/parser/parser_test.go b/internal/parser/parser_test.go
@@ -408,7 +408,6 @@ func TestParseAllInstructionTypes(t *testing.T) {
 	}
 }
 
-
 // TestParseMultiStageDockerfile tests parsing of multi-stage Dockerfiles.
 // _Requirements: 1.3_
 func TestParseMultiStageDockerfile(t *testing.T) {
@@ -514,7 +513,6 @@ COPY --from=0 /app /app`
 	}
 }
 
-
 // TestParseErrorReporting tests error reporting for malformed Dockerfiles.
 // _Requirements: 1.4_
 func TestParseErrorReporting(t *testing.T) {
@@ -637,7 +635,6 @@ func TestParseCommentsOnly(t *testing.T) {
 	}
 }
 
-
 // TestParseInlineIgnoreComments tests extraction of inline ignore comments.
 // _Requirements: 8.3_
 func TestParseInlineIgnoreComments(t *testing.T) {
@@ -760,7 +757,6 @@ RUN apk add curl`
 	}
 }
 
-
 // TestParseLineNumbers tests that line numbers are correctly tracked.
 func TestParseLineNumbers(t *testing.T) {
 	input := `FROM alpine:3.18
diff --git a/internal/rules/base_image.go b/internal/rules/base_image.go
@@ -9,28 +9,28 @@ import (
 
 // largeBaseImages is a set of known large base images that have smaller alternatives.
 var largeBaseImages = map[string]string{
-	"ubuntu":       "ubuntu:*-slim or alpine",
-	"debian":       "debian:*-slim or alpine",
-	"centos":       "alpine or distroless",
-	"fedora":       "alpine or distroless",
-	"amazonlinux":  "alpine or distroless",
-	"oraclelinux":  "alpine or distroless",
-	"python":       "python:*-slim or python:*-alpine",
-	"node":         "node:*-slim or node:*-alpine",
-	"ruby":         "ruby:*-slim or ruby:*-alpine",
-	"golang":       "golang:*-alpine or distroless",
-	"openjdk":      "openjdk:*-slim or eclipse-temurin:*-alpine",
-	"java":         "eclipse-temurin:*-alpine or distroless",
-	"php":          "php:*-alpine",
-	"perl":         "perl:*-slim",
-	"rust":         "rust:*-slim or rust:*-alpine",
+	"ubuntu":      "ubuntu:*-slim or alpine",
+	"debian":      "debian:*-slim or alpine",
+	"centos":      "alpine or distroless",
+	"fedora":      "alpine or distroless",
+	"amazonlinux": "alpine or distroless",
+	"oraclelinux": "alpine or distroless",
+	"python":      "python:*-slim or python:*-alpine",
+	"node":        "node:*-slim or node:*-alpine",
+	"ruby":        "ruby:*-slim or ruby:*-alpine",
+	"golang":      "golang:*-alpine or distroless",
+	"openjdk":     "openjdk:*-slim or eclipse-temurin:*-alpine",
+	"java":        "eclipse-temurin:*-alpine or distroless",
+	"php":         "php:*-alpine",
+	"perl":        "perl:*-slim",
+	"rust":        "rust:*-slim or rust:*-alpine",
 }
 
 // MissingTagRule checks for FROM instructions without explicit image tags (DL3006).
 type MissingTagRule struct{}
 
-func (r *MissingTagRule) ID() string          { return RuleMissingTag }
-func (r *MissingTagRule) Name() string        { return "Missing explicit image tag" }
+func (r *MissingTagRule) ID() string             { return RuleMissingTag }
+func (r *MissingTagRule) Name() string           { return "Missing explicit image tag" }
 func (r *MissingTagRule) Severity() ast.Severity { return ast.SeverityWarning }
 
 func (r *MissingTagRule) Description() string {
@@ -72,12 +72,11 @@ func (r *MissingTagRule) Check(dockerfile *ast.Dockerfile) []ast.Finding {
 	return findings
 }
 
-
 // LatestTagRule checks for FROM instructions using the 'latest' tag (DL3007).
 type LatestTagRule struct{}
 
-func (r *LatestTagRule) ID() string          { return RuleLatestTag }
-func (r *LatestTagRule) Name() string        { return "Using 'latest' tag" }
+func (r *LatestTagRule) ID() string             { return RuleLatestTag }
+func (r *LatestTagRule) Name() string           { return "Using 'latest' tag" }
 func (r *LatestTagRule) Severity() ast.Severity { return ast.SeverityWarning }
 
 func (r *LatestTagRule) Description() string {
@@ -122,8 +121,8 @@ func (r *LatestTagRule) Check(dockerfile *ast.Dockerfile) []ast.Finding {
 // LargeBaseImageRule checks for large base images without slim variants (DL3008).
 type LargeBaseImageRule struct{}
 
-func (r *LargeBaseImageRule) ID() string          { return RuleLargeBaseImage }
-func (r *LargeBaseImageRule) Name() string        { return "Large base image" }
+func (r *LargeBaseImageRule) ID() string             { return RuleLargeBaseImage }
+func (r *LargeBaseImageRule) Name() string           { return "Large base image" }
 func (r *LargeBaseImageRule) Severity() ast.Severity { return ast.SeverityWarning }
 
 func (r *LargeBaseImageRule) Description() string {
diff --git a/internal/rules/bestpractice.go b/internal/rules/bestpractice.go
@@ -53,7 +53,6 @@ func (r *MultipleCMDRule) Check(dockerfile *ast.Dockerfile) []ast.Finding {
 	return findings
 }
 
-
 // MultipleEntrypointRule checks for multiple ENTRYPOINT instructions in a Dockerfile (DL3002).
 type MultipleEntrypointRule struct{}
 
@@ -159,7 +158,6 @@ func isAbsolutePath(path string) bool {
 	return false
 }
 
-
 // MissingHealthcheckRule checks for Dockerfiles without HEALTHCHECK instruction (DL5000).
 type MissingHealthcheckRule struct{}
 
diff --git a/internal/rules/bestpractice_test.go b/internal/rules/bestpractice_test.go
@@ -72,7 +72,6 @@ func TestMultipleCMDRule(t *testing.T) {
 	}
 }
 
-
 func TestMultipleEntrypointRule(t *testing.T) {
 	rule := &MultipleEntrypointRule{}
 
diff --git a/internal/rules/layer_property_test.go b/internal/rules/layer_property_test.go
@@ -249,5 +249,3 @@ func genRunCommands() gopter.Gen {
 		})
 	}, reflect.TypeOf([]string{}))
 }
-
-
diff --git a/internal/rules/registry.go b/internal/rules/registry.go
diff --git a/internal/rules/security.go b/internal/rules/security.go

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ func (a Analyzer) Analyze(dockerfile ast.Dockerfile) []ast.Finding {`
`78`	`78`	`return allFindings`
`79`	`79`	`}`
`80`	`80`
`81`		`-`
`82`	`81`	`// isIgnoredByInlineComment checks if a finding should be ignored based on inline comments.`
`83`	`82`	`// Inline ignore comments apply to the line immediately following the comment.`
`84`	`83`	`func (a Analyzer) isIgnoredByInlineComment(dockerfile ast.Dockerfile, finding ast.Finding) bool {`
Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,6 @@ func genNonEmptyIgnoreRules() gopter.Gen {`
`722`	`722`	`}, reflect.TypeOf([]string{}))`
`723`	`723`	`}`
`724`	`724`
`725`		`-`
`726`	`725`	`// Feature: docker-lint, Property 4: Inline Ignore Effectiveness`
`727`	`726`	`// Validates: Requirements 8.3`
`728`	`727`	`//`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ RUN apt-get update`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`-`
`67`	`66`	`func TestAnalyzer_Analyze_InlineIgnore(t *testing.T) {`
`68`	`67`	`// Dockerfile with inline ignore comment`
`69`	`68`	dockerfile := `# docker-lint ignore: DL3006
Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,11 @@ func TestFindingCreation(t *testing.T) {`
`44`	`44`
`45`	`45`	`func TestFromInstructionMethods(t *testing.T) {`
`46`	`46`	`instr := &FromInstruction{`
`47`		`- LineNum: 1,`
`48`		`- RawText: "FROM alpine:3.18 AS builder",`
`49`		`- Image: "alpine",`
`50`		`- Tag: "3.18",`
`51`		`- Alias: "builder",`
	`47`	`+ LineNum: 1,`
	`48`	`+ RawText: "FROM alpine:3.18 AS builder",`
	`49`	`+ Image: "alpine",`
	`50`	`+ Tag: "3.18",`
	`51`	`+ Alias: "builder",`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`if instr.Line() != 1 {`
`@@ -62,7 +62,6 @@ func TestFromInstructionMethods(t *testing.T) {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`-`
`66`	`65`	`func TestRunInstructionMethods(t *testing.T) {`
`67`	`66`	`instr := &RunInstruction{`
`68`	`67`	`LineNum: 5,`
`@@ -147,7 +146,6 @@ func TestArgInstructionMethods(t *testing.T) {`
`147`	`146`	`}`
`148`	`147`	`}`
`149`	`148`
`150`		`-`
`151`	`149`	`func TestExposeInstructionMethods(t *testing.T) {`
`152`	`150`	`instr := &ExposeInstruction{`
`153`	`151`	`LineNum: 8,`
`@@ -256,7 +254,6 @@ func TestEntrypointInstructionMethods(t *testing.T) {`
`256`	`254`	`}`
`257`	`255`	`}`
`258`	`256`
`259`		`-`
`260`	`257`	`func TestHealthcheckInstructionMethods(t *testing.T) {`
`261`	`258`	`instr := &HealthcheckInstruction{`
`262`	`259`	`LineNum: 18,`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,6 @@ func TestTextFormatter_Format(t *testing.T) {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`-`
`140`	`139`	`func TestJSONFormatter_Format(t *testing.T) {`
`141`	`140`	`tests := []struct {`
`142`	`141`	`name string`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ func NewJSONFormatter(filename string, quiet bool) *JSONFormatter {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-`
`52`	`51`	`// Format writes the findings to the given writer as valid JSON.`
`53`	`52`	`func (f *JSONFormatter) Format(findings []ast.Finding, w io.Writer) error {`
`54`	`53`	`output := JSONOutput{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ func formatInstruction(instr ast.Instruction) string {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`-`
`75`	`74`	`// formatFrom formats a FROM instruction.`
`76`	`75`	`func formatFrom(f *ast.FromInstruction) string {`
`77`	`76`	`var parts []string`
`@@ -185,7 +184,6 @@ func formatUser(u *ast.UserInstruction) string {`
`185`	`184`	`return "USER " + u.User`
`186`	`185`	`}`
`187`	`186`
`188`		`-`
`189`	`187`	`// formatLabel formats a LABEL instruction.`
`190`	`188`	`func formatLabel(l *ast.LabelInstruction) string {`
`191`	`189`	`if len(l.Labels) == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ func TestFormatFromInstruction(t *testing.T) {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`-`
`69`	`68`	`func TestFormatRunInstruction(t *testing.T) {`
`70`	`69`	`tests := []struct {`
`71`	`70`	`name string`
`@@ -211,7 +210,6 @@ func TestFormatHealthcheckInstruction(t *testing.T) {`
`211`	`210`	`}`
`212`	`211`	`}`
`213`	`212`
`214`		`-`
`215`	`213`	`func TestFormatFullDockerfile(t *testing.T) {`
`216`	`214`	`df := &ast.Dockerfile{`
`217`	`215`	`Instructions: []ast.Instruction{`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,6 @@ func (l *Lexer) scanToken() Token {`
`163`	`163`	`return Token{Type: TokenArgument, Value: arg, Line: l.line, Column: startCol}`
`164`	`164`	`}`
`165`	`165`
`166`		`-`
`167`	`166`	`// readNextLine reads the next line from the input, handling line continuations.`
`168`	`167`	`func (l *Lexer) readNextLine() bool {`
`169`	`168`	`var fullLine strings.Builder`
`@@ -314,7 +313,6 @@ func (l *Lexer) scanArgument() string {`
`314`	`313`	`return strings.TrimSpace(result.String())`
`315`	`314`	`}`
`316`	`315`
`317`		`-`
`318`	`316`	`// Reset resets the lexer to read from a new reader.`
`319`	`317`	`func (l *Lexer) Reset(r io.Reader) {`
`320`	`318`	`l.reader = bufio.NewReader(r)`