golanci-lint: fixes for staticcheck

Author: mstoykov

internal/cmd/cloud.go

@@ -300,7 +300,7 @@ func (c *cmdCloud) run(cmd *cobra.Command, args []string) error {
 	}
 
 	if testProgress == nil {
-		//nolint:stylecheck,golint
+		//nolint:staticcheck
 		return errext.WithExitCodeIfNone(errors.New("Test progress error"), exitcodes.CloudFailedToGetProgress)
 	}
 
@@ -320,11 +320,12 @@ func (c *cmdCloud) run(cmd *cobra.Command, args []string) error {
 		// when thresholds have been crossed (failed). So, we report this situation as such.
 		if testProgress.RunStatus == cloudapi.RunStatusFinished ||
 			testProgress.RunStatus == cloudapi.RunStatusAbortedThreshold {
+			//nolint:staticcheck
 			return errext.WithExitCodeIfNone(errors.New("Thresholds have been crossed"), exitcodes.ThresholdsHaveFailed)
 		}
 
 		// TODO: use different exit codes for failed thresholds vs failed test (e.g. aborted by system/limit)
-		return errext.WithExitCodeIfNone(errors.New("The test has failed"), exitcodes.CloudTestRunFailed)
+		return errext.WithExitCodeIfNone(errors.New("The test has failed"), exitcodes.CloudTestRunFailed) //nolint:staticcheck
 	}
 
 	return nil

internal/cmd/scale.go

@@ -22,7 +22,7 @@ func getCmdScale(gs *state.GlobalState) *cobra.Command {
 			vus := getNullInt64(cmd.Flags(), "vus")
 			maxVUs := getNullInt64(cmd.Flags(), "max")
 			if !vus.Valid && !maxVUs.Valid {
-				return errors.New("Specify either -u/--vus or -m/--max") //nolint:golint,stylecheck
+				return errors.New("Specify either -u/--vus or -m/--max") //nolint:staticcheck
 			}
 
 			c, err := client.New(gs.Flags.Address)

internal/js/eventloop/eventloop.go

@@ -193,7 +193,7 @@ func (e *EventLoop) Start(firstCallback func() error) error {
 				}
 			}
 			// this is the de facto wording in both firefox and deno at least
-			return fmt.Errorf("Uncaught (in promise) %s", value) //nolint:stylecheck
+			return fmt.Errorf("Uncaught (in promise) %s", value) //nolint:stylecheck,staticcheck
 		}
 	}
 }

internal/js/modules/k6/experimental/streams/readable_stream_default_controller.go

@@ -220,7 +220,7 @@ func (controller *ReadableStreamDefaultController) pullSteps(readRequest ReadReq
 // [specification]: https://streams.spec.whatwg.org/#abstract-opdef-readablestreamdefaultcontroller-releasesteps
 func (controller *ReadableStreamDefaultController) releaseSteps() {
 	// 1.
-	return //nolint:gosimple
+	return //nolint:gosimple,staticcheck
 }
 
 // close implements the [ReadableStreamDefaultControllerClose] algorithm

internal/loader/loader.go

@@ -138,8 +138,7 @@ func Load(
 	scheme := moduleSpecifier.Scheme
 	if scheme == "" {
 		if moduleSpecifier.Opaque == "" {
-			//nolint:stylecheck
-			return nil, fmt.Errorf(fileSchemeCouldntBeLoadedMsg, originalModuleSpecifier)
+			return nil, fmt.Errorf(fileSchemeCouldntBeLoadedMsg, originalModuleSpecifier) //nolint:staticcheck
 		}
 		scheme = "https"
 	}
@@ -158,16 +157,15 @@ func Load(
 		return nil, err
 	}
 	if scheme != "https" {
-		//nolint:stylecheck
-		return nil, fmt.Errorf(fileSchemeCouldntBeLoadedMsg, originalModuleSpecifier)
+		return nil, fmt.Errorf(fileSchemeCouldntBeLoadedMsg, originalModuleSpecifier) //nolint:staticcheck
 	}
 
 	finalModuleSpecifierURL := moduleSpecifier
 
 	var result *SourceData
 	result, err = loadRemoteURL(logger, finalModuleSpecifierURL)
 	if err != nil {
-		//nolint:stylecheck
+		//nolint:staticcheck
 		return nil, fmt.Errorf(httpsSchemeCouldntBeLoadedMsg, originalModuleSpecifier, finalModuleSpecifierURL, err)
 	}
 	result.URL = moduleSpecifier

internal/loader/readsource.go

@@ -49,8 +49,7 @@ func ReadSource(
 	if err != nil {
 		var unresolvedError unresolvableURLError
 		if errors.As(err, &unresolvedError) {
-			//nolint:stylecheck
-			return nil, fmt.Errorf(fileSchemeCouldntBeLoadedMsg, (string)(unresolvedError))
+			return nil, fmt.Errorf(fileSchemeCouldntBeLoadedMsg, (string)(unresolvedError)) //nolint:staticcheck
 		}
 		return nil, err
 	}

metrics/registry.go

@@ -45,7 +45,7 @@ func (r *Registry) NewMetric(name string, typ MetricType, t ...ValueType) (*Metr
 	defer r.l.Unlock()
 
 	if !checkName(name) {
-		return nil, fmt.Errorf("Invalid metric name: '%s'. %s", name, badNameWarning) //nolint:golint,stylecheck
+		return nil, fmt.Errorf("Invalid metric name: '%s'. %s", name, badNameWarning) //nolint:staticcheck
 	}
 	oldMetric, ok := r.metrics[name]