[chore]: enable bool-compare rule from testifylint

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
open-telemetry · Sep 18, 2024 · 851cf74 · 851cf74
1 parent 7bd1c85
commit 851cf74
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 39 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,6 +25,7 @@ linters:
     - revive
     - staticcheck
     - tenv
+    - testifylint
     - typecheck
     - unconvert
     - unused
@@ -302,3 +303,16 @@ linters-settings:
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#waitgroup-by-value
       - name: waitgroup-by-value
         disabled: false
+  testifylint:
+    enable-all: true
+    disable:
+      - empty
+      - error-is-as
+      - error-nil
+      - expected-actual
+      - float-compare
+      - go-require
+      - len
+      - negative-positive
+      - require-error
+      - suite-extra-assert-call
diff --git a/Makefile b/Makefile
@@ -66,8 +66,11 @@ $(GORELEASE): PACKAGE=golang.org/x/exp/cmd/gorelease
 GOVULNCHECK = $(TOOLS)/govulncheck
 $(TOOLS)/govulncheck: PACKAGE=golang.org/x/vuln/cmd/govulncheck
 
+TESTIFYLINT = $(TOOLS)/testifylint
+$(TOOLS)/testifylint: PACKAGE=github.com/Antonboom/testifylint
+
 .PHONY: tools
-tools: $(CROSSLINK) $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(GOJQ) $(SEMCONVGEN) $(MULTIMOD) $(SEMCONVKIT) $(GOTMPL) $(GORELEASE)
+tools: $(CROSSLINK) $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(GOJQ) $(SEMCONVGEN) $(MULTIMOD) $(SEMCONVKIT) $(GOTMPL) $(GORELEASE) $(TESTIFYLINT)
 
 # Virtualized python tools via docker
 
@@ -199,6 +202,14 @@ golangci-lint/%: $(GOLANGCI_LINT)
 		&& cd $(DIR) \
 		&& $(GOLANGCI_LINT) run --allow-serial-runners $(ARGS)
 
+.PHONY: testifylint
+testifylint: $(OTEL_GO_MOD_DIRS:%=testifylint/%)
+testifylint/%: DIR=$*
+testifylint/%: $(TESTIFYLINT)
+	@echo 'testifylint -fix ./... in $(DIR)' \
+			&& cd $(DIR) \
+			&& $(TESTIFYLINT) --enable-all --disable=empty,error-is-as,error-nil,expected-actual,float-compare,go-require,len,negative-positive,require-error,suite-extra-assert-call -fix ./...
+
 .PHONY: crosslink
 crosslink: $(CROSSLINK)
 	@echo "Updating intra-repository dependencies in all go modules" \

diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options_test.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options_test.go
@@ -101,7 +101,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -112,7 +112,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -213,7 +213,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -223,7 +223,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -233,7 +233,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -244,7 +244,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_metrics_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 

diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options_test.go b/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options_test.go
@@ -101,7 +101,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -112,7 +112,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -213,7 +213,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -223,7 +223,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -233,7 +233,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -244,7 +244,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_metrics_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 

diff --git a/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options_test.go b/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options_test.go
@@ -99,7 +99,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -110,7 +110,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -211,7 +211,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -221,7 +221,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -231,7 +231,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -242,7 +242,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_traces_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 

diff --git a/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig/options_test.go b/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig/options_test.go
@@ -99,7 +99,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -110,7 +110,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -211,7 +211,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -221,7 +221,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -231,7 +231,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -242,7 +242,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_traces_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 

diff --git a/internal/shared/otlp/otlpmetric/oconf/options_test.go.tmpl b/internal/shared/otlp/otlpmetric/oconf/options_test.go.tmpl
@@ -101,7 +101,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -112,7 +112,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
 				assert.Equal(t, "/somepath", c.Metrics.URLPath)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -213,7 +213,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -223,7 +223,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -233,7 +233,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, false, c.Metrics.Insecure)
+				assert.False(t, c.Metrics.Insecure)
 			},
 		},
 		{
@@ -244,7 +244,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_metrics_endpoint", c.Metrics.Endpoint)
-				assert.Equal(t, true, c.Metrics.Insecure)
+				assert.True(t, c.Metrics.Insecure)
 			},
 		},
 

diff --git a/internal/shared/otlp/otlptrace/otlpconfig/options_test.go.tmpl b/internal/shared/otlp/otlptrace/otlpconfig/options_test.go.tmpl
@@ -99,7 +99,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -110,7 +110,7 @@ func TestConfigs(t *testing.T) {
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "someendpoint", c.Traces.Endpoint)
 				assert.Equal(t, "/somepath", c.Traces.URLPath)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -211,7 +211,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -221,7 +221,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -231,7 +231,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, false, c.Traces.Insecure)
+				assert.False(t, c.Traces.Insecure)
 			},
 		},
 		{
@@ -242,7 +242,7 @@ func TestConfigs(t *testing.T) {
 			},
 			asserts: func(t *testing.T, c *Config, grpcOption bool) {
 				assert.Equal(t, "env_traces_endpoint", c.Traces.Endpoint)
-				assert.Equal(t, true, c.Traces.Insecure)
+				assert.True(t, c.Traces.Insecure)
 			},
 		},
 

diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -3,6 +3,7 @@ module go.opentelemetry.io/otel/internal/tools
 go 1.22.1
 
 require (
+	github.com/Antonboom/testifylint v1.4.3
 	github.com/client9/misspell v0.3.4
 	github.com/gogo/protobuf v1.3.2
 	github.com/golangci/golangci-lint v1.61.0
@@ -26,7 +27,6 @@ require (
 	github.com/Abirdcfly/dupword v0.1.1 // indirect
 	github.com/Antonboom/errname v0.1.13 // indirect
 	github.com/Antonboom/nilnil v0.1.9 // indirect
-	github.com/Antonboom/testifylint v1.4.3 // indirect
 	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
 	github.com/Crocmagnon/fatcontext v0.5.2 // indirect
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect