chore: fixes reported by nolint

linhtch90 · Jul 10, 2023 · a5f0540 · a5f0540
1 parent 3fa7275
commit a5f0540
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 26 deletions.
diff --git a/cloudapi/insights/proto/gen.go b/cloudapi/insights/proto/gen.go
@@ -2,7 +2,6 @@
 // by the k6 Insights.
 package proto
 
-//nolint:lll
 //go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative ./v1/common/common.proto
 //go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative ./v1/ingester/ingester.proto
 //go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative ./v1/k6/labels.proto

diff --git a/js/compiler/compiler.go b/js/compiler/compiler.go
@@ -19,7 +19,7 @@ import (
 )
 
 //go:embed lib/babel.min.js
-var babelSrc string //nolint:gochecknoglobals
+var babelSrc string
 
 var (
 	DefaultOpts = map[string]interface{}{

diff --git a/js/init_and_modules_test.go b/js/init_and_modules_test.go
@@ -27,15 +27,15 @@ type CheckModule struct {
 	vuCtxCalled   int
 }
 
-func (cm *CheckModule) InitCtx(ctx context.Context) {
+func (cm *CheckModule) InitCtx(_ context.Context) {
 	cm.initCtxCalled++
 }
 
-func (cm *CheckModule) VuCtx(ctx context.Context) {
+func (cm *CheckModule) VuCtx(_ context.Context) {
 	cm.vuCtxCalled++
 }
 
-var uniqueModuleNumber int64 //nolint // we need this so multiple test can register differently named modules
+var uniqueModuleNumber int64 //nolint:gochecknoglobals // we need this so multiple test can register differently named modules
 
 func TestNewJSRunnerWithCustomModule(t *testing.T) {
 	t.Parallel()

diff --git a/js/modules/k6/http/response_test.go b/js/modules/k6/http/response_test.go
@@ -190,13 +190,11 @@ func TestResponse(t *testing.T) {
 
 		t.Run("Invalid", func(t *testing.T) {
 			_, err := rt.RunString(sr(`http.request("GET", "HTTPBIN_URL/html").json();`))
-			//nolint:lll
 			assert.Contains(t, err.Error(), "cannot parse json due to an error at line 1, character 2 , error: invalid character '<' looking for beginning of value")
 		})
 
 		t.Run("Invalid", func(t *testing.T) {
 			_, err := rt.RunString(sr(`http.request("GET", "HTTPBIN_URL/invalidjson").json();`))
-			//nolint:lll
 			assert.Contains(t, err.Error(), "cannot parse json due to an error at line 3, character 9 , error: invalid character 'e' in literal true (expecting 'r')")
 		})
 

diff --git a/js/modules/k6/k6.go b/js/modules/k6/k6.go
@@ -148,8 +148,6 @@ func (mi *K6) Group(name string, val goja.Value) (goja.Value, error) {
 }
 
 // Check will emit check metrics for the provided checks.
-//
-//nolint:cyclop
 func (mi *K6) Check(arg0, checks goja.Value, extras ...goja.Value) (bool, error) {
 	state := mi.vu.State()
 	if state == nil {

diff --git a/js/summary.go b/js/summary.go
@@ -16,10 +16,10 @@ import (
 // Copied from https://github.com/k6io/jslib.k6.io/tree/master/lib/k6-summary
 //
 //go:embed summary.js
-var jslibSummaryCode string //nolint:gochecknoglobals
+var jslibSummaryCode string
 
 //go:embed summary-wrapper.js
-var summaryWrapperLambdaCode string //nolint:gochecknoglobals
+var summaryWrapperLambdaCode string
 
 // TODO: figure out something saner... refactor the sinks and how we deal with
 // metrics in general... so much pain and misery... :sob:

diff --git a/js/tc39/tc39_test.go b/js/tc39/tc39_test.go
@@ -284,7 +284,7 @@ func parseTC39File(name string) (*tc39Meta, string, error) {
 	if err != nil {
 		return nil, "", err
 	}
-	defer f.Close() //nolint:errcheck,gosec
+	defer f.Close() //nolint:errcheck
 
 	b, err := io.ReadAll(f)
 	if err != nil {
@@ -586,7 +586,7 @@ func (ctx *tc39TestCtx) compile(base, name string) (*goja.Program, error) {
 		if err != nil {
 			return nil, err
 		}
-		defer f.Close() //nolint:gosec,errcheck
+		defer f.Close() //nolint:errcheck
 
 		b, err := io.ReadAll(f)
 		if err != nil {

diff --git a/lib/executor/base_config.go b/lib/executor/base_config.go
@@ -18,7 +18,8 @@ import (
 // TODO?: Discard? Or make this actually user-configurable somehow? hello #883...
 var DefaultGracefulStopValue = 30 * time.Second //nolint:gochecknoglobals
 
-var executorNameWhitelist = regexp.MustCompile(`^[0-9a-zA-Z_-]+$`) //nolint:gochecknoglobals
+var executorNameWhitelist = regexp.MustCompile(`^[0-9a-zA-Z_-]+$`)
+
 const executorNameErr = "the executor name should contain only numbers, latin letters, underscores, and dashes"
 
 // BaseConfig contains the common config fields for all executors

diff --git a/lib/executor/common_test.go b/lib/executor/common_test.go
@@ -87,7 +87,7 @@ type executorTest struct {
 	options lib.Options
 	state   *lib.ExecutionState
 
-	ctx      context.Context //nolint
+	ctx      context.Context
 	cancel   context.CancelFunc
 	executor lib.Executor
 	logHook  *testutils.SimpleLogrusHook

diff --git a/lib/executor/constant_arrival_rate.go b/lib/executor/constant_arrival_rate.go
@@ -191,7 +191,7 @@ func (car *ConstantArrivalRate) Init(ctx context.Context) error {
 // This will allow us to implement https://github.com/k6io/k6/issues/1386
 // and things like all of the TODOs below in one place only.
 //
-//nolint:funlen,cyclop
+//nolint:funlen
 func (car ConstantArrivalRate) Run(parentCtx context.Context, out chan<- metrics.SampleContainer) (err error) {
 	gracefulStop := car.config.GetGracefulStop()
 	duration := car.config.Duration.TimeDuration()

diff --git a/lib/executor/constant_arrival_rate_test.go b/lib/executor/constant_arrival_rate_test.go
@@ -107,7 +107,7 @@ func TestConstantArrivalRateRunCorrectRate(t *testing.T) {
 	require.Empty(t, test.logHook.Drain())
 }
 
-//nolint:tparallel,paralleltest // this is flaky if ran with other tests
+//nolint:paralleltest // this is flaky if ran with other tests
 func TestConstantArrivalRateRunCorrectTiming(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Skipf("this test is very flaky on the Windows GitHub Action runners...")

diff --git a/lib/executor/ramping_arrival_rate.go b/lib/executor/ramping_arrival_rate.go
@@ -301,7 +301,7 @@ func noNegativeSqrt(f float64) float64 {
 // This will allow us to implement https://github.com/k6io/k6/issues/1386
 // and things like all of the TODOs below in one place only.
 //
-//nolint:funlen,cyclop
+//nolint:funlen
 func (varr RampingArrivalRate) Run(parentCtx context.Context, out chan<- metrics.SampleContainer) (err error) {
 	segment := varr.executionState.ExecutionTuple.Segment
 	gracefulStop := varr.config.GetGracefulStop()

diff --git a/lib/netext/httpext/response.go b/lib/netext/httpext/response.go
@@ -9,7 +9,6 @@ import (
 // ResponseType is used in the request to specify how the response body should be treated
 // The conversion and validation methods are auto-generated with https://github.com/alvaroloes/enumer:
 //
-//nolint:lll
 //go:generate enumer -type=ResponseType -transform=snake -json -text -trimprefix ResponseType -output response_type_gen.go
 type ResponseType uint
 

diff --git a/lib/netext/httpext/transport.go b/lib/netext/httpext/transport.go
@@ -72,7 +72,7 @@ func newTransport(
 // Helper method to finish the tracer trail, assemble the tag values and emits
 // the metric samples for the supplied unfinished request.
 //
-//nolint:nestif,funlen
+//nolint:funlen
 func (t *transport) measureAndEmitMetrics(unfReq *unfinishedRequest) *finishedRequest {
 	trail := unfReq.tracer.Done()
 

diff --git a/lib/runtime_options.go b/lib/runtime_options.go
@@ -9,7 +9,6 @@ import (
 
 // CompatibilityMode specifies the JS compatibility mode
 //
-//nolint:lll
 //go:generate enumer -type=CompatibilityMode -transform=snake -trimprefix CompatibilityMode -output compatibility_mode_gen.go
 type CompatibilityMode uint8
 

diff --git a/metrics/thresholds_parser_test.go b/metrics/thresholds_parser_test.go
@@ -66,7 +66,7 @@ func TestParseThresholdExpression(t *testing.T) {
 
 func BenchmarkParseThresholdExpression(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		parseThresholdExpression("count>20") // nolint
+		_, _ = parseThresholdExpression("count>20")
 	}
 }
 
@@ -203,7 +203,7 @@ func TestParseThresholdAggregationMethod(t *testing.T) {
 
 func BenchmarkParseThresholdAggregationMethod(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		parseThresholdAggregationMethod("p(99.9)") // nolint
+		_, _, _ = parseThresholdAggregationMethod("p(99.9)")
 	}
 }
 
@@ -336,6 +336,6 @@ func TestScanThresholdExpression(t *testing.T) {
 
 func BenchmarkScanThresholdExpression(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		scanThresholdExpression("foo<=bar") // nolint
+		_, _, _, _ = scanThresholdExpression("foo<=bar")
 	}
 }
diff --git a/metrics/thresholds_test.go b/metrics/thresholds_test.go
@@ -176,7 +176,7 @@ func BenchmarkRunNoTaint(b *testing.B) {
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
-		threshold.runNoTaint(sinks) // nolint
+		_, _ = threshold.runNoTaint(sinks)
 	}
 }
 

diff --git a/output/statsd/helper_test.go b/output/statsd/helper_test.go
@@ -21,7 +21,6 @@ type getOutputFn func(
 	pushInterval types.NullDuration,
 ) (*Output, error)
 
-//nolint:funlen
 func baseTest(t *testing.T,
 	getOutput getOutputFn,
 	checkResult func(t *testing.T, samples []metrics.SampleContainer, expectedOutput, output string),