Merge pull request #71 from nginxinc/fix-library-dependency

Make linter happy again

Author: jjngx

.golangci.yml

@@ -34,7 +34,6 @@ linters-settings:
 linters:
     enable:
     - asciicheck
-    - deadcode
     - errcheck
     - gocyclo
     - errorlint
@@ -52,13 +51,10 @@ linters:
     - predeclared
     - revive
     - staticcheck
-    - structcheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
-    - wastedassign
     disable-all: true
 issues:
   max-issues-per-linter: 0

Makefile

@@ -14,7 +14,7 @@ ifeq (${TARGET},local)
 endif
 
 test:
-	go test ./...
+	go test ./... -race -shuffle=on
 
 lint:
 	docker run --pull always --rm -v $(shell pwd):/nginx-ns1-gslb -w /nginx-ns1-gslb -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest golangci-lint --color always run

go.mod

@@ -1,6 +1,6 @@
 module github.com/nginxinc/nginx-ns1-gslb
 
-go 1.18
+go 1.19
 
 require (
 	github.com/nginxinc/nginx-plus-go-client v0.10.0

internal/agent/configurator.go

@@ -2,7 +2,7 @@ package agent
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/nginxinc/nginx-ns1-gslb/internal/input"
 	"github.com/nginxinc/nginx-ns1-gslb/internal/output"
@@ -27,7 +27,7 @@ type Config struct {
 
 // ParseConfig reads the configuration file and return a Config object ready to configure agent and resources
 func ParseConfig(path *string) (*Config, error) {
-	data, err := ioutil.ReadFile(*path)
+	data, err := os.ReadFile(*path)
 	if err != nil {
 		return nil, fmt.Errorf("error reading file at %v: %w", path, err)
 	}

internal/agent/configurator_test.go

@@ -111,13 +111,16 @@ func TestValidateServicesCfg(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		err := validateServicesCfg(testCase.cfg)
-		if err == nil && testCase.wantErr {
-			t.Errorf("validateServicesCfg err returned <nil>, but err expected an error for case %v", testCase.msg)
-		}
-		if err != nil && !testCase.wantErr {
-			t.Errorf("validateServicesCfg returned an err: %v for case %v", err, testCase.msg)
-		}
+		t.Run(testCase.msg, func(t *testing.T) {
+			t.Parallel()
+			err := validateServicesCfg(testCase.cfg)
+			if err == nil && testCase.wantErr {
+				t.Errorf("validateServicesCfg err returned <nil>, but err expected an error for case %v", testCase.msg)
+			}
+			if err != nil && !testCase.wantErr {
+				t.Errorf("validateServicesCfg returned an err: %v for case %v", err, testCase.msg)
+			}
+		})
 	}
 }
 
@@ -149,12 +152,15 @@ func TestParseExampleConfigs(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		_, err := ParseConfig(&testCase.path)
-		if err == nil && testCase.wantErr {
-			t.Errorf("ParseConfig err returned <nil>, but err expected an error for case %v", testCase.msg)
-		}
-		if err != nil && !testCase.wantErr {
-			t.Errorf("ParseConfig returned an err: %v for case %v", err, testCase.msg)
-		}
+		t.Run(testCase.msg, func(t *testing.T) {
+			t.Parallel()
+			_, err := ParseConfig(&testCase.path)
+			if err == nil && testCase.wantErr {
+				t.Errorf("ParseConfig err returned <nil>, but err expected an error for case %v", testCase.msg)
+			}
+			if err != nil && !testCase.wantErr {
+				t.Errorf("ParseConfig returned an err: %v for case %v", err, testCase.msg)
+			}
+		})
 	}
 }