fix(lint): improve styling and fix lint errors

2026-04-01 06:33:18 +02:00 · 2026-02-10 16:57:41 +08:00
parent 978dd886c0
commit a0d0ad0958
42 changed files with 317 additions and 341 deletions
--- a/internal/serialization/reader.go
+++ b/internal/serialization/reader.go
@@ -15,8 +15,10 @@ func NewSubstituteEnvReader(reader io.Reader) *SubstituteEnvReader {
 	return &SubstituteEnvReader{reader: reader}
 }

-const peekSize = 4096
-const maxVarNameLength = 256
+const (
+	peekSize         = 4096
+	maxVarNameLength = 256
+)

 func (r *SubstituteEnvReader) Read(p []byte) (n int, err error) {
 	// Return buffered data first
@@ -66,6 +68,7 @@ func (r *SubstituteEnvReader) Read(p []byte) (n int, err error) {
 			if nMore > 0 {
 				incomplete = append(incomplete, more[:nMore]...)
 				// Check if pattern is now complete
+				//nolint:modernize
 				if idx := bytes.IndexByte(incomplete, '}'); idx >= 0 {
 					// Pattern complete, append the rest back to chunk
 					chunk = append(chunk, incomplete...)
--- a/internal/serialization/reader_bench_test.go
+++ b/internal/serialization/reader_bench_test.go
@@ -2,8 +2,8 @@ package serialization

 import (
 	"bytes"
+	"errors"
 	"io"
-	"os"
 	"strings"
 	"testing"
 )
@@ -11,17 +11,9 @@ import (
 // setupEnv sets up environment variables for benchmarks
 func setupEnv(b *testing.B) {
 	b.Helper()
-	os.Setenv("BENCH_VAR", "benchmark_value")
-	os.Setenv("BENCH_VAR_2", "second_value")
-	os.Setenv("BENCH_VAR_3", "third_value")
-}
-
-// cleanupEnv cleans up environment variables after benchmarks
-func cleanupEnv(b *testing.B) {
-	b.Helper()
-	os.Unsetenv("BENCH_VAR")
-	os.Unsetenv("BENCH_VAR_2")
-	os.Unsetenv("BENCH_VAR_3")
+	b.Setenv("BENCH_VAR", "benchmark_value")
+	b.Setenv("BENCH_VAR_2", "second_value")
+	b.Setenv("BENCH_VAR_3", "third_value")
 }

 // BenchmarkSubstituteEnvReader_NoSubstitution benchmarks reading without any env substitutions
@@ -44,7 +36,6 @@ data: some content here
 // BenchmarkSubstituteEnvReader_SingleSubstitution benchmarks reading with a single env substitution
 func BenchmarkSubstituteEnvReader_SingleSubstitution(b *testing.B) {
 	setupEnv(b)
-	defer cleanupEnv(b)

 	r := strings.NewReader(`key: ${BENCH_VAR}
 `)
@@ -62,7 +53,6 @@ func BenchmarkSubstituteEnvReader_SingleSubstitution(b *testing.B) {
 // BenchmarkSubstituteEnvReader_MultipleSubstitutions benchmarks reading with multiple env substitutions
 func BenchmarkSubstituteEnvReader_MultipleSubstitutions(b *testing.B) {
 	setupEnv(b)
-	defer cleanupEnv(b)

 	r := strings.NewReader(`key1: ${BENCH_VAR}
 key2: ${BENCH_VAR_2}
@@ -96,7 +86,6 @@ func BenchmarkSubstituteEnvReader_LargeInput_NoSubstitution(b *testing.B) {
 // BenchmarkSubstituteEnvReader_LargeInput_WithSubstitutions benchmarks large input with scattered substitutions
 func BenchmarkSubstituteEnvReader_LargeInput_WithSubstitutions(b *testing.B) {
 	setupEnv(b)
-	defer cleanupEnv(b)

 	var builder bytes.Buffer
 	for range 100 {
@@ -118,7 +107,6 @@ func BenchmarkSubstituteEnvReader_LargeInput_WithSubstitutions(b *testing.B) {
 // BenchmarkSubstituteEnvReader_SmallBuffer benchmarks reading with a small buffer size
 func BenchmarkSubstituteEnvReader_SmallBuffer(b *testing.B) {
 	setupEnv(b)
-	defer cleanupEnv(b)

 	r := strings.NewReader(`key: ${BENCH_VAR} and some more content here`)
 	buf := make([]byte, 16)
@@ -127,7 +115,7 @@ func BenchmarkSubstituteEnvReader_SmallBuffer(b *testing.B) {
 		reader := NewSubstituteEnvReader(r)
 		for {
 			_, err := reader.Read(buf)
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				break
 			}
 			if err != nil {
@@ -141,7 +129,6 @@ func BenchmarkSubstituteEnvReader_SmallBuffer(b *testing.B) {
 // BenchmarkSubstituteEnvReader_YAMLConfig benchmarks a realistic YAML config scenario
 func BenchmarkSubstituteEnvReader_YAMLConfig(b *testing.B) {
 	setupEnv(b)
-	defer cleanupEnv(b)

 	r := strings.NewReader(`database:
  host: ${BENCH_VAR}
@@ -170,7 +157,6 @@ server:
 // BenchmarkSubstituteEnvReader_BoundaryPattern benchmarks patterns at buffer boundaries (4096 bytes)
 func BenchmarkSubstituteEnvReader_BoundaryPattern(b *testing.B) {
 	setupEnv(b)
-	defer cleanupEnv(b)

 	// Pattern exactly at 4090 bytes, with ${VAR} crossing the 4096 boundary
 	prefix := strings.Repeat("x", 4090)
@@ -189,7 +175,6 @@ func BenchmarkSubstituteEnvReader_BoundaryPattern(b *testing.B) {
 // BenchmarkSubstituteEnvReader_MultipleBoundaries benchmarks multiple patterns crossing boundaries
 func BenchmarkSubstituteEnvReader_MultipleBoundaries(b *testing.B) {
 	setupEnv(b)
-	defer cleanupEnv(b)

 	var builder bytes.Buffer
 	for range 10 {
@@ -210,8 +195,7 @@ func BenchmarkSubstituteEnvReader_MultipleBoundaries(b *testing.B) {

 // BenchmarkSubstituteEnvReader_SpecialChars benchmarks substitution with special characters
 func BenchmarkSubstituteEnvReader_SpecialChars(b *testing.B) {
-	os.Setenv("SPECIAL_BENCH_VAR", `value with "quotes" and \backslash\`)
-	defer os.Unsetenv("SPECIAL_BENCH_VAR")
+	b.Setenv("SPECIAL_BENCH_VAR", `value with "quotes" and \backslash\`)

 	r := strings.NewReader(`key: ${SPECIAL_BENCH_VAR}
 `)
@@ -228,8 +212,7 @@ func BenchmarkSubstituteEnvReader_SpecialChars(b *testing.B) {

 // BenchmarkSubstituteEnvReader_EmptyValue benchmarks substitution with empty value
 func BenchmarkSubstituteEnvReader_EmptyValue(b *testing.B) {
-	os.Setenv("EMPTY_BENCH_VAR", "")
-	defer os.Unsetenv("EMPTY_BENCH_VAR")
+	b.Setenv("EMPTY_BENCH_VAR", "")

 	r := strings.NewReader(`key: ${EMPTY_BENCH_VAR}
 `)
@@ -246,8 +229,7 @@ func BenchmarkSubstituteEnvReader_EmptyValue(b *testing.B) {

 // BenchmarkSubstituteEnvReader_DollarWithoutBrace benchmarks $ without following {
 func BenchmarkSubstituteEnvReader_DollarWithoutBrace(b *testing.B) {
-	os.Setenv("BENCH_VAR", "benchmark_value")
-	defer os.Unsetenv("BENCH_VAR")
+	b.Setenv("BENCH_VAR", "benchmark_value")

 	r := strings.NewReader(`price: $100 and $200 for ${BENCH_VAR}`)

--- a/internal/serialization/reader_test.go
+++ b/internal/serialization/reader_test.go
@@ -2,8 +2,8 @@ package serialization

 import (
 	"bytes"
+	"errors"
 	"io"
-	"os"
 	"strings"
 	"testing"

@@ -11,8 +11,7 @@ import (
 )

 func TestSubstituteEnvReader_Basic(t *testing.T) {
-	os.Setenv("TEST_VAR", "hello")
-	defer os.Unsetenv("TEST_VAR")
+	t.Setenv("TEST_VAR", "hello")

 	input := []byte(`key: ${TEST_VAR}`)
 	reader := NewSubstituteEnvReader(bytes.NewReader(input))
@@ -23,10 +22,8 @@ func TestSubstituteEnvReader_Basic(t *testing.T) {
 }

 func TestSubstituteEnvReader_Multiple(t *testing.T) {
-	os.Setenv("VAR1", "first")
-	os.Setenv("VAR2", "second")
-	defer os.Unsetenv("VAR1")
-	defer os.Unsetenv("VAR2")
+	t.Setenv("VAR1", "first")
+	t.Setenv("VAR2", "second")

 	input := []byte(`a: ${VAR1}, b: ${VAR2}`)
 	reader := NewSubstituteEnvReader(bytes.NewReader(input))
@@ -46,8 +43,6 @@ func TestSubstituteEnvReader_NoSubstitution(t *testing.T) {
 }

 func TestSubstituteEnvReader_UnsetEnvError(t *testing.T) {
-	os.Unsetenv("UNSET_VAR_FOR_TEST")
-
 	input := []byte(`key: ${UNSET_VAR_FOR_TEST}`)
 	reader := NewSubstituteEnvReader(bytes.NewReader(input))

@@ -57,8 +52,7 @@ func TestSubstituteEnvReader_UnsetEnvError(t *testing.T) {
 }

 func TestSubstituteEnvReader_SmallBuffer(t *testing.T) {
-	os.Setenv("SMALL_BUF_VAR", "value")
-	defer os.Unsetenv("SMALL_BUF_VAR")
+	t.Setenv("SMALL_BUF_VAR", "value")

 	input := []byte(`key: ${SMALL_BUF_VAR}`)
 	reader := NewSubstituteEnvReader(bytes.NewReader(input))
@@ -70,7 +64,7 @@ func TestSubstituteEnvReader_SmallBuffer(t *testing.T) {
 		if n > 0 {
 			result = append(result, buf[:n]...)
 		}
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		}
 		require.NoError(t, err)
@@ -79,8 +73,7 @@ func TestSubstituteEnvReader_SmallBuffer(t *testing.T) {
 }

 func TestSubstituteEnvReader_SpecialChars(t *testing.T) {
-	os.Setenv("SPECIAL_VAR", `hello "world" \n`)
-	defer os.Unsetenv("SPECIAL_VAR")
+	t.Setenv("SPECIAL_VAR", `hello "world" \n`)

 	input := []byte(`key: ${SPECIAL_VAR}`)
 	reader := NewSubstituteEnvReader(bytes.NewReader(input))
@@ -91,8 +84,7 @@ func TestSubstituteEnvReader_SpecialChars(t *testing.T) {
 }

 func TestSubstituteEnvReader_EmptyValue(t *testing.T) {
-	os.Setenv("EMPTY_VAR", "")
-	defer os.Unsetenv("EMPTY_VAR")
+	t.Setenv("EMPTY_VAR", "")

 	input := []byte(`key: ${EMPTY_VAR}`)
 	reader := NewSubstituteEnvReader(bytes.NewReader(input))
@@ -103,8 +95,7 @@ func TestSubstituteEnvReader_EmptyValue(t *testing.T) {
 }

 func TestSubstituteEnvReader_LargeInput(t *testing.T) {
-	os.Setenv("LARGE_VAR", "replaced")
-	defer os.Unsetenv("LARGE_VAR")
+	t.Setenv("LARGE_VAR", "replaced")

 	prefix := strings.Repeat("x", 5000)
 	suffix := strings.Repeat("y", 5000)
@@ -119,8 +110,7 @@ func TestSubstituteEnvReader_LargeInput(t *testing.T) {
 }

 func TestSubstituteEnvReader_PatternAtBoundary(t *testing.T) {
-	os.Setenv("BOUNDARY_VAR", "boundary_value")
-	defer os.Unsetenv("BOUNDARY_VAR")
+	t.Setenv("BOUNDARY_VAR", "boundary_value")

 	prefix := strings.Repeat("a", 4090)
 	input := []byte(prefix + "${BOUNDARY_VAR}")
@@ -134,10 +124,8 @@ func TestSubstituteEnvReader_PatternAtBoundary(t *testing.T) {
 }

 func TestSubstituteEnvReader_MultiplePatternsBoundary(t *testing.T) {
-	os.Setenv("VAR_A", "aaa")
-	os.Setenv("VAR_B", "bbb")
-	defer os.Unsetenv("VAR_A")
-	defer os.Unsetenv("VAR_B")
+	t.Setenv("VAR_A", "aaa")
+	t.Setenv("VAR_B", "bbb")

 	prefix := strings.Repeat("x", 4090)
 	input := []byte(prefix + "${VAR_A} middle ${VAR_B}")
@@ -151,12 +139,9 @@ func TestSubstituteEnvReader_MultiplePatternsBoundary(t *testing.T) {
 }

 func TestSubstituteEnvReader_YAMLConfig(t *testing.T) {
-	os.Setenv("DB_HOST", "localhost")
-	os.Setenv("DB_PORT", "5432")
-	os.Setenv("DB_PASSWORD", "secret123")
-	defer os.Unsetenv("DB_HOST")
-	defer os.Unsetenv("DB_PORT")
-	defer os.Unsetenv("DB_PASSWORD")
+	t.Setenv("DB_HOST", "localhost")
+	t.Setenv("DB_PORT", "5432")
+	t.Setenv("DB_PASSWORD", "secret123")

 	input := []byte(`database:
  host: ${DB_HOST}
--- a/internal/serialization/serialization.go
+++ b/internal/serialization/serialization.go
@@ -87,7 +87,7 @@ func initPtr(dst reflect.Value) {
 	}
 }

-// Validate performs struct validation using go-playground/validator tags.
+// ValidateWithFieldTags performs struct validation using go-playground/validator tags.
 //
 // It collects all validation errors and returns them as a single error.
 // Field names in errors are prefixed with their namespace (e.g., "User.Email").
@@ -521,7 +521,6 @@ func ConvertSlice(src reflect.Value, dst reflect.Value, checkValidateTag bool) e
 //   - Returns true if conversion was handled (even with error), false if
 //     conversion is unsupported.
 func ConvertString(src string, dst reflect.Value) (convertible bool, convErr error) {
-	convertible = true
 	dstT := dst.Type()
 	if dst.Kind() == reflect.Pointer {
 		if dst.IsNil() {