CI: Linting adaptation for 1.16 (#237)

Anaethelion · Anaethelion · commit edeeaca94074 · 2021-03-08T18:15:53.000+01:00
* CI: Add lint to internal generate command dependencies * CI: Fix linting on tests As per https://tip.golang.org/doc/go1.16\#vet vet now detects Fatalf calls in goroutines
diff --git a/Makefile b/Makefile
@@ -150,7 +150,7 @@ lint:  ## Run lint on the package
 		set -e ; \
 		trap "test -d ../../../.git && git checkout --quiet go.mod" INT TERM EXIT; \
 		echo "cd internal/cmd/generate/ && go vet ./..."; \
-		cd "internal/cmd/generate/" && go vet ./...; \
+		cd "internal/cmd/generate/" && go mod download && go vet ./...; \
 	}
 
 
diff --git a/estransport/discovery_internal_test.go b/estransport/discovery_internal_test.go
@@ -32,12 +32,14 @@ func TestDiscovery(t *testing.T) {
 
 	go func() {
 		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			t.Fatalf("Unable to start server: %s", err)
+			t.Errorf("Unable to start server: %s", err)
+			return
 		}
 	}()
 	go func() {
 		if err := srvTLS.ListenAndServeTLS("testdata/cert.pem", "testdata/key.pem"); err != nil && err != http.ErrServerClosed {
-			t.Fatalf("Unable to start server: %s", err)
+			t.Errorf("Unable to start server: %s", err)
+			return
 		}
 	}()
 	defer func() { srv.Close() }()
diff --git a/estransport/logger_internal_test.go b/estransport/logger_internal_test.go
@@ -59,7 +59,8 @@ func TestTransportLogger(t *testing.T) {
 				req, _ := http.NewRequest("GET", "/abc", nil)
 				_, err := tp.Perform(req)
 				if err != nil {
-					t.Fatalf("Unexpected error: %s", err)
+					t.Errorf("Unexpected error: %s", err)
+					return
 				}
 			}()
 		}
diff --git a/esutil/bulk_indexer_internal_test.go b/esutil/bulk_indexer_internal_test.go
@@ -90,7 +90,8 @@ func TestBulkIndexer(t *testing.T) {
 					Body:       strings.NewReader(fmt.Sprintf(`{"title":"foo-%d"}`, i)),
 				})
 				if err != nil {
-					t.Fatalf("Unexpected error: %s", err)
+					t.Errorf("Unexpected error: %s", err)
+					return
 				}
 			}(i)
 		}
@@ -514,7 +515,8 @@ func TestBulkIndexer(t *testing.T) {
 					Body:   strings.NewReader(`{"title":"foo"}`),
 				})
 				if err != nil {
-					t.Fatalf("Unexpected error: %s", err)
+					t.Errorf("Unexpected error: %s", err)
+					return
 				}
 			}(i)
 		}
diff --git a/internal/cmd/generate/go.mod b/internal/cmd/generate/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.3 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
 	golang.org/x/tools v0.1.0
 	gopkg.in/yaml.v2 v2.2.2
 )
diff --git a/internal/cmd/generate/go.sum b/internal/cmd/generate/go.sum
@@ -37,6 +37,9 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqp
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
@@ -62,6 +65,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c h1:9WR4YuzLDuQMqEmLQrG0DiMmE2/HvX1dlrujzjmNVFg=
 golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200312194400-c312e98713c2 h1:6TB4+MaZlkcSsJDu+BS5yxSEuZIYhjWz+jhbSLEZylI=

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ lint: ## Run lint on the package`
`150`	`150`	`set -e ; \`
`151`	`151`	`trap "test -d ../../../.git && git checkout --quiet go.mod" INT TERM EXIT; \`
`152`	`152`	`echo "cd internal/cmd/generate/ && go vet ./..."; \`
`153`		`- cd "internal/cmd/generate/" && go vet ./...; \`
	`153`	`+ cd "internal/cmd/generate/" && go mod download && go vet ./...; \`
`154`	`154`	`}`
`155`	`155`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ func TestTransportLogger(t *testing.T) {`
`59`	`59`	`req, _ := http.NewRequest("GET", "/abc", nil)`
`60`	`60`	`_, err := tp.Perform(req)`
`61`	`61`	`if err != nil {`
`62`		`- t.Fatalf("Unexpected error: %s", err)`
	`62`	`+ t.Errorf("Unexpected error: %s", err)`
	`63`	`+ return`
`63`	`64`	`}`
`64`	`65`	`}()`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ func TestBulkIndexer(t *testing.T) {`
`90`	`90`	Body: strings.NewReader(fmt.Sprintf(`{"title":"foo-%d"}`, i)),
`91`	`91`	`})`
`92`	`92`	`if err != nil {`
`93`		`- t.Fatalf("Unexpected error: %s", err)`
	`93`	`+ t.Errorf("Unexpected error: %s", err)`
	`94`	`+ return`
`94`	`95`	`}`
`95`	`96`	`}(i)`
`96`	`97`	`}`
`@@ -514,7 +515,8 @@ func TestBulkIndexer(t *testing.T) {`
`514`	`515`	Body: strings.NewReader(`{"title":"foo"}`),
`515`	`516`	`})`
`516`	`517`	`if err != nil {`
`517`		`- t.Fatalf("Unexpected error: %s", err)`
	`518`	`+ t.Errorf("Unexpected error: %s", err)`
	`519`	`+ return`
`518`	`520`	`}`
`519`	`521`	`}(i)`
`520`	`522`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ require (`
`11`	`11`	`github.com/spf13/cobra v0.0.3`
`12`	`12`	`github.com/spf13/pflag v1.0.3 // indirect`
`13`	`13`	`golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9`
	`14`	`+ golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect`
`14`	`15`	`golang.org/x/tools v0.1.0`
`15`	`16`	`gopkg.in/yaml.v2 v2.2.2`
`16`	`17`	`)`