tools+golangci: update linter

Author: ellemouton

.golangci.yml

@@ -1,15 +1,12 @@
 run:
   # timeout for analysis
-  deadline: 4m
+  timeout: 4m
 
   # Linting uses a lot of memory. Keep it under control by only running a single
   # worker.
   concurrency: 1
 
 linters-settings:
-  govet:
-    # Don't report about shadowed variables
-    check-shadowing: false
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
     simplify: true
@@ -20,15 +17,14 @@ linters:
   # the latest linter includes many sub-linters which do not pass the codebase.
   enable:
     - bodyclose
+    - copyloopvar
     - dupl
     - errcheck
-    - exportloopref
     - goconst
     - gocritic
     - gocyclo
     - gofmt
     - goimports
-    - golint
     - gosimple
     - govet
     - ineffassign

aperture.go

@@ -202,7 +202,7 @@ func (a *Aperture) Start(errChan chan error) error {
 
 	// Enable http profiling and validate profile port number if requested.
 	if a.cfg.Profile != 0 {
-		if a.cfg.Profile < 1024 || a.cfg.Profile > 65535 {
+		if a.cfg.Profile < 1024 {
 			return fmt.Errorf("the profile port must be between " +
 				"1024 and 65535")
 		}

config.go

@@ -18,8 +18,6 @@ var (
 	defaultTLSCertFilename  = "tls.cert"
 	defaultLogLevel         = "info"
 	defaultLogFilename      = "aperture.log"
-	defaultMaxLogFiles      = 3
-	defaultMaxLogFileSize   = 10
 	defaultInvoiceBatchSize = 100000
 
 	defaultSqliteDatabaseFileName = "aperture.db"

hashmail_server_test.go

@@ -307,7 +307,6 @@ func TestStaleMailboxCleanup(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			ctx := context.Background()
 

l402/caveat_test.go

@@ -39,7 +39,6 @@ func TestCaveatSerialization(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		success := t.Run(test.name, func(t *testing.T) {
 			caveat, err := DecodeCaveat(test.caveatStr)
 			if !errors.Is(err, test.err) {
@@ -185,7 +184,6 @@ func TestVerifyCaveats(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		success := t.Run(test.name, func(t *testing.T) {
 			err := VerifyCaveats(test.caveats, test.satisfiers...)
 			if test.shouldFail && err == nil {

l402/client_interceptor_test.go

@@ -282,7 +282,6 @@ func TestUnaryInterceptor(t *testing.T) {
 
 	// Run through the test cases.
 	for _, tc := range testCases {
-		tc := tc
 		intercept := func() error {
 			return tc.interceptor.UnaryInterceptor(
 				ctx, "", nil, nil, nil, unaryInvoker, nil,
@@ -314,7 +313,6 @@ func TestStreamInterceptor(t *testing.T) {
 
 	// Run through the test cases.
 	for _, tc := range testCases {
-		tc := tc
 		intercept := func() error {
 			_, err := tc.interceptor.StreamInterceptor(
 				ctx, nil, nil, "", streamInvoker,

l402/identifier_test.go

@@ -44,7 +44,6 @@ func TestIdentifierSerialization(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		success := t.Run(test.name, func(t *testing.T) {
 			var buf bytes.Buffer
 			err := EncodeIdentifier(&buf, &test.id)

l402/satisfier_test.go

@@ -54,7 +54,6 @@ func TestTimeoutSatisfier(t *testing.T) {
 	)
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			var prev *Caveat
 			for _, timeout := range test.timeouts {

l402/service_test.go

@@ -58,7 +58,6 @@ func TestServicesCaveatSerialization(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		success := t.Run(test.name, func(t *testing.T) {
 			services, err := decodeServicesCaveatValue(test.value)
 			if !errors.Is(err, test.err) {

proxy/proxy_test.go

@@ -101,8 +101,6 @@ func TestProxyHTTP(t *testing.T) {
 	}}
 
 	for _, tc := range testCases {
-		tc := tc
-
 		t.Run(tc.name+" GET", func(t *testing.T) {
 			runHTTPTest(t, tc, "GET")
 		})
@@ -236,8 +234,6 @@ func TestProxyGRPC(t *testing.T) {
 	}}
 
 	for _, tc := range testCases {
-		tc := tc
-
 		t.Run(tc.name, func(t *testing.T) {
 			runGRPCTest(t, tc)
 		})