Skip to content

Commit 14f45e3

Browse files
committed
Fix all errcheck linting errors in tests and document linting rules
1 parent a1d0c8c commit 14f45e3

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

confkit_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,8 +1271,8 @@ func TestFromYAMLFilesNestedMerge(t *testing.T) {
12711271

12721272
file1 := writeTempYAML(t, "port: 8080\ndatabase:\n host: db1.local\n port: 5432")
12731273
file2 := writeTempYAML(t, "port: 9000\ndatabase:\n host: db2.local")
1274-
defer os.Remove(file1)
1275-
defer os.Remove(file2)
1274+
defer func() { _ = os.Remove(file1) }()
1275+
defer func() { _ = os.Remove(file2) }()
12761276

12771277
cfg, err := Load[Config](FromYAMLFiles(file1, file2))
12781278
if err != nil {
@@ -1325,7 +1325,7 @@ func TestFromJSONFilesSingle(t *testing.T) {
13251325
}
13261326

13271327
tmpFile := writeTempJSON(t, `{"port":8080,"host":"localhost"}`)
1328-
defer os.Remove(tmpFile)
1328+
defer func() { _ = os.Remove(tmpFile) }()
13291329

13301330
cfg, err := Load[Config](FromJSONFiles(tmpFile))
13311331
if err != nil {
@@ -1349,8 +1349,8 @@ func TestFromJSONFilesMultiple(t *testing.T) {
13491349

13501350
file1 := writeTempJSON(t, `{"port":8080,"host":"localhost","mode":"dev"}`)
13511351
file2 := writeTempJSON(t, `{"port":9000,"mode":"prod"}`)
1352-
defer os.Remove(file1)
1353-
defer os.Remove(file2)
1352+
defer func() { _ = os.Remove(\1) }()
1353+
defer func() { _ = os.Remove(\1) }()
13541354

13551355
cfg, err := Load[Config](FromJSONFiles(file1, file2))
13561356
if err != nil {
@@ -1380,8 +1380,8 @@ func TestFromJSONFilesNestedMerge(t *testing.T) {
13801380

13811381
file1 := writeTempJSON(t, `{"port":8080,"database":{"host":"db1.local","port":5432}}`)
13821382
file2 := writeTempJSON(t, `{"port":9000,"database":{"host":"db2.local"}}`)
1383-
defer os.Remove(file1)
1384-
defer os.Remove(file2)
1383+
defer func() { _ = os.Remove(\1) }()
1384+
defer func() { _ = os.Remove(\1) }()
13851385

13861386
cfg, err := Load[Config](FromJSONFiles(file1, file2))
13871387
if err != nil {
@@ -1406,7 +1406,7 @@ func TestFromTOMLFilesSingle(t *testing.T) {
14061406
}
14071407

14081408
tmpFile := writeTempTOML(t, "port = 8080\nhost = \"localhost\"")
1409-
defer os.Remove(tmpFile)
1409+
defer func() { _ = os.Remove(\1) }()
14101410

14111411
cfg, err := Load[Config](FromTOMLFiles(tmpFile))
14121412
if err != nil {
@@ -1430,8 +1430,8 @@ func TestFromTOMLFilesMultiple(t *testing.T) {
14301430

14311431
file1 := writeTempTOML(t, "port = 8080\nhost = \"localhost\"\nmode = \"dev\"")
14321432
file2 := writeTempTOML(t, "port = 9000\nmode = \"prod\"")
1433-
defer os.Remove(file1)
1434-
defer os.Remove(file2)
1433+
defer func() { _ = os.Remove(\1) }()
1434+
defer func() { _ = os.Remove(\1) }()
14351435

14361436
cfg, err := Load[Config](FromTOMLFiles(file1, file2))
14371437
if err != nil {
@@ -1461,8 +1461,8 @@ func TestFromTOMLFilesNestedMerge(t *testing.T) {
14611461

14621462
file1 := writeTempTOML(t, "port = 8080\n[database]\nhost = \"db1.local\"\nport = 5432")
14631463
file2 := writeTempTOML(t, "port = 9000\n[database]\nhost = \"db2.local\"")
1464-
defer os.Remove(file1)
1465-
defer os.Remove(file2)
1464+
defer func() { _ = os.Remove(\1) }()
1465+
defer func() { _ = os.Remove(\1) }()
14661466

14671467
cfg, err := Load[Config](FromTOMLFiles(file1, file2))
14681468
if err != nil {
@@ -1490,9 +1490,9 @@ func TestMultipleYAMLFilesPrecedence(t *testing.T) {
14901490
file1 := writeTempYAML(t, "a: from-file1\nb: from-file1\nc: from-file1")
14911491
file2 := writeTempYAML(t, "b: from-file2\nc: from-file2")
14921492
file3 := writeTempYAML(t, "c: from-file3")
1493-
defer os.Remove(file1)
1494-
defer os.Remove(file2)
1495-
defer os.Remove(file3)
1493+
defer func() { _ = os.Remove(\1) }()
1494+
defer func() { _ = os.Remove(\1) }()
1495+
defer func() { _ = os.Remove(\1) }()
14961496

14971497
cfg, err := Load[Config](FromYAMLFiles(file1, file2, file3))
14981498
if err != nil {
@@ -1517,7 +1517,7 @@ func TestFromYAMLFilesMalformed(t *testing.T) {
15171517
}
15181518

15191519
tmpFile := writeTempYAML(t, "port: [invalid yaml: here:")
1520-
defer os.Remove(tmpFile)
1520+
defer func() { _ = os.Remove(\1) }()
15211521

15221522
_, err := Load[Config](FromYAMLFiles(tmpFile))
15231523
if err == nil {
@@ -1532,7 +1532,7 @@ func TestFromJSONFilesMalformed(t *testing.T) {
15321532
}
15331533

15341534
tmpFile := writeTempJSON(t, `{"port": [invalid json}`)
1535-
defer os.Remove(tmpFile)
1535+
defer func() { _ = os.Remove(\1) }()
15361536

15371537
_, err := Load[Config](FromJSONFiles(tmpFile))
15381538
if err == nil {
@@ -1547,7 +1547,7 @@ func TestFromTOMLFilesMalformed(t *testing.T) {
15471547
}
15481548

15491549
tmpFile := writeTempTOML(t, "port = [invalid toml")
1550-
defer os.Remove(tmpFile)
1550+
defer func() { _ = os.Remove(\1) }()
15511551

15521552
_, err := Load[Config](FromTOMLFiles(tmpFile))
15531553
if err == nil {

0 commit comments

Comments
 (0)