Addressed linter issues

Author: codebien

internal/cmd/cloud_login.go

@@ -103,10 +103,10 @@ func (c *cmdCloudLogin) run(cmd *cobra.Command, _ []string) error {
 		return nil
 	case tokenInput.Valid || stackInput.Valid:
 		if !stackInput.Valid || stackInput.String == "" {
-			return errors.New("Stack value is required but it was not passed or is empty")
+			return errors.New("stack value is required but it was not passed or is empty")
 		}
 		if !tokenInput.Valid || tokenInput.String == "" {
-			return errors.New("Token value is required but it was not passed or is empty")
+			return errors.New("token value is required but it was not passed or is empty")
 		}
 		err := authenticateUserToken(c.globalState, &newCloudConf, currentJSONConfigRaw, tokenInput.String, stackInput.String)
 		if err != nil {
@@ -179,7 +179,7 @@ func promptUserAuthForm(gs *state.GlobalState) (userAuthForm, error) {
 	}
 	token := strings.TrimSpace(tokenVals["Token"])
 	if token == "" {
-		return userAuthForm{}, errors.New("Token cannot be empty")
+		return userAuthForm{}, errors.New("token cannot be empty")
 	}
 
 	/* Stack form */
@@ -199,7 +199,7 @@ func promptUserAuthForm(gs *state.GlobalState) (userAuthForm, error) {
 	}
 	stack := strings.TrimSpace(stackVals["Stack"])
 	if stack == "" {
-		return userAuthForm{}, errors.New("Stack cannot be empty")
+		return userAuthForm{}, errors.New("stack cannot be empty")
 	}
 
 	return userAuthForm{token: token, stack: stack}, nil
@@ -254,7 +254,7 @@ func authenticateUserToken(
 	stackURL, stackID, defaultProjectID, err := validateTokenV6(
 		gs, consolidatedCurrentConfig, token, stack)
 	if err != nil {
-		return fmt.Errorf(
+		return fmt.Errorf( //nolint:staticcheck // ST1005: this is a user-facing error
 			"Authentication failed as provided token or stack might not be valid."+
 				" Learn more: https://grafana.com/docs/grafana-cloud/testing/k6/author-run/tokens-and-cli-authentication."+
 				" Server error for details: %w",

internal/cmd/outputs_cloud.go

@@ -33,7 +33,7 @@ const (
 // and to populate the Cloud configuration back in case the Cloud API returned some overrides,
 // as expected by the Cloud output.
 //
-//nolint:funlen,gocognit,cyclop
+//nolint:funlen
 func createCloudTest(gs *state.GlobalState, test *loadedAndConfiguredTest) error {
 	// Otherwise, we continue normally with the creation of the test run in the k6 Cloud backend services.
 	conf, warn, err := cloudapi.GetConsolidatedConfig(

internal/cmd/tests/cmd_cloud_login_test.go

@@ -48,15 +48,15 @@ func TestCloudLoginWithArgs(t *testing.T) {
 			token:   validToken,
 			wantErr: true,
 			wantStdoutContains: []string{
-				"Stack value is required",
+				"stack value is required",
 			},
 		},
 		{
 			name:    "valid stack without token fails",
 			stack:   validStack,
 			wantErr: true,
 			wantStdoutContains: []string{
-				"Token value is required",
+				"token value is required",
 			},
 		},
 		{

internal/cmd/tests/cmd_cloud_run_test.go

@@ -88,7 +88,7 @@ export const options = {
 
 export default function() {};`
 
-		ts := makeTestState(t, script, []string{"--local-execution"}, 0)
+		ts := makeTestState(t, script, []string{"--local-execution"})
 
 		testServerHandlerFunc := http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
 			// When using the local execution mode, the test archive should be uploaded to the cloud
@@ -141,7 +141,7 @@ export const options = {
 
 export default function() {};`
 
-		ts := makeTestState(t, script, []string{"--local-execution", "--no-archive-upload"}, 0)
+		ts := makeTestState(t, script, []string{"--local-execution", "--no-archive-upload"})
 
 		testServerHandlerFunc := http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
 			body, err := io.ReadAll(req.Body)
@@ -198,7 +198,7 @@ export default function() {
 	` + "console.log(`The test run id is ${__ENV.K6_CLOUDRUN_TEST_RUN_ID}`);" + `
 };`
 
-		ts := makeTestState(t, script, []string{"--local-execution", "--log-output=stdout"}, 0)
+		ts := makeTestState(t, script, []string{"--local-execution", "--log-output=stdout"})
 
 		const testRunID = 1337
 		srv := getCloudTestEndChecker(t, testRunID, nil, cloudapi.RunStatusFinished, cloudapi.ResultStatusPassed)
@@ -226,7 +226,7 @@ export const options = {
 
 export default function() {};`
 
-		ts := makeTestState(t, script, []string{"--local-execution", "--log-output=stdout"}, 0)
+		ts := makeTestState(t, script, []string{"--local-execution", "--log-output=stdout"})
 		ts.ExpectedExitCode = -1
 		delete(ts.Env, "K6_CLOUD_STACK_ID")
 
@@ -238,15 +238,14 @@ export default function() {};`
 	})
 }
 
-func makeTestState(tb testing.TB, script string, cliFlags []string, expExitCode exitcodes.ExitCode) *GlobalTestState {
+func makeTestState(tb testing.TB, script string, cliFlags []string) *GlobalTestState {
 	if cliFlags == nil {
 		cliFlags = []string{"-v", "--log-output=stdout"}
 	}
 
 	ts := NewGlobalTestState(tb)
 	require.NoError(tb, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, "test.js"), []byte(script), 0o644))
 	ts.CmdArgs = append(append([]string{"k6", "cloud", "run"}, cliFlags...), "test.js")
-	ts.ExpectedExitCode = int(expExitCode)
 	ts.Env["K6_CLOUD_TOKEN"] = "foo"     // doesn't matter, we mock the cloud
 	ts.Env["K6_CLOUD_STACK_ID"] = "1234" // doesn't matter, we mock the cloud
 

internal/cmd/tests/cmd_cloud_upload_test.go

@@ -133,10 +133,10 @@ func TestK6CloudUpload(t *testing.T) {
 		require.NoError(t, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, "archive.tar"), data, 0o644))
 
 		ts.CmdArgs = []string{"k6", "cloud", "upload", "archive.tar"}
-		ts.Env["K6_SHOW_CLOUD_LOGS"] = "false"  // no mock for the logs yet
+		ts.Env["K6_SHOW_CLOUD_LOGS"] = "false" // no mock for the logs yet
 		ts.Env["K6_CLOUD_HOST"] = srv.URL
-		ts.Env["K6_CLOUD_TOKEN"] = "foo"        // doesn't matter, we mock the cloud
-		ts.Env["K6_CLOUD_STACK_ID"] = "1234"    // doesn't matter, we mock the cloud
+		ts.Env["K6_CLOUD_TOKEN"] = "foo"
+		ts.Env["K6_CLOUD_STACK_ID"] = "1234"
 
 		cmd.ExecuteWithGlobalState(ts.GlobalState)