Enforce stack info for cloud commands by codebien · Pull Request #5833 · grafana/k6

codebien · 2026-04-10T19:15:44Z

What?

This PR makes Stack mandatory value for all cloud commands (k6 cloud run, k6 cloud upload, k6 cloud run --local-execution), completing the deprecation warning introduced in #5420.

Note about differences from the original proposal

The original issue (#5650) proposed making stack input consistent across all input methods — accepting slug, full URL, or numeric ID interchangeably in all contexts. This PR does not fully unify the input formats: K6_CLOUD_STACK_ID and the stackID script option still accept a numeric ID only, while k6 cloud login --stack accepts a slug or full URL. Full input-format unification is left for a following dedicated work (probably after v2 release).

Note about implementation details

k6 cloud login now requires both token and stack — passing -t without --stack (or vice versa) fails with an explicit error. The previous behavior of accepting a token-only login and falling back to v1 token validation has been removed.
Token masking in --show output: the stored token is now partially masked to avoid accidental credential exposure.
Interactive login no longer offers None as a valid nor default stack option — both fields are required.
Removed the v1 token-only validation path (/v1/validate-token). All authentication now goes through the v6 API (/cloud/v6/auth), which validates both token and stack together.

mstoykov

LGTM!

On second pass through that it seems that the print only happens on show, so I guess it was already verified , so you can ignore it.

inancgumus

Clean work 👍 Some nits only.

inancgumus · 2026-04-17T20:45:38Z

+var errUserUnauthenticated = errors.New("You must first authenticate to run tests in Grafana Cloud." +
+	" Run the `k6 cloud login` command providing the stack and token, or check the docs" +
 	" https://grafana.com/docs/grafana-cloud/testing/k6/author-run/tokens-and-cli-authentication" +
-	" for additional authentication methods.")
+	" for additional methods.")
+
+// checkCloudLogin verifies that both a token and a stack are configured.
+// Together they represent a complete Grafana Cloud login.
+func checkCloudLogin(conf cloudapi.Config) error {
+	if !conf.Token.Valid || conf.Token.String == "" {
+		return errUserUnauthenticated
+	}
+	if !conf.StackID.Valid || conf.StackID.Int64 == 0 {
+		return errUserUnauthenticated
+	}
+	return nil
+}


checkCloudLogin() collapses “missing token” and “missing stack” into the same errUserUnauthenticated, so users with only a token get only a generic authentication message. Would be nicer to return distinct errors, or at least include the specific missing piece in the message.

This is now handled by #5869.

Co-authored-by: Inanc Gumus <inanc.gumus@grafana.com>

codebien · 2026-04-22T12:55:40Z

Hey @inancgumus, I've addressed your request changes in a specific pull request so we avoid to block the merge of this pull request. Please, take a look there #5869.

Can you review the current pull request again, please?

codebien self-assigned this Apr 10, 2026

codebien added cloud breaking change for PRs that need to be mentioned in the breaking changes section of the release notes labels Apr 10, 2026

codebien force-pushed the 5651-make-stack-required branch from 26feb10 to bb5cb4a Compare April 10, 2026 19:16

codebien added this to the v2.0.0 milestone Apr 10, 2026

codebien temporarily deployed to azure-trusted-signing April 10, 2026 19:22 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 10, 2026 19:24 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 14, 2026 16:07 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 14, 2026 16:14 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 14, 2026 16:16 — with GitHub Actions Inactive

codebien force-pushed the 5651-make-stack-required branch from 9554623 to ae67d6d Compare April 14, 2026 16:21

codebien temporarily deployed to azure-trusted-signing April 14, 2026 16:27 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 14, 2026 16:29 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 14, 2026 19:45 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 14, 2026 19:47 — with GitHub Actions Inactive

codebien force-pushed the 5651-make-stack-required branch from 4878029 to 367ec92 Compare April 15, 2026 10:03

codebien temporarily deployed to azure-trusted-signing April 15, 2026 10:08 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 15, 2026 10:10 — with GitHub Actions Inactive

codebien marked this pull request as ready for review April 15, 2026 11:31

codebien requested a review from a team as a code owner April 15, 2026 11:31

codebien requested review from inancgumus and mstoykov and removed request for a team April 15, 2026 11:31

mstoykov previously approved these changes Apr 15, 2026

View reviewed changes

Comment thread internal/cmd/cloud_login.go

codebien dismissed mstoykov’s stale review via 11919b8 April 15, 2026 16:20

codebien force-pushed the 5651-make-stack-required branch from 367ec92 to 11919b8 Compare April 15, 2026 16:20

codebien added 4 commits April 15, 2026 18:21

Enforce stack in k6 cloud run command

81d1f60

Enforce stack in cloud --local-execution command

f1a76b5

Use stdout assertion in missing-stack test for consistency

28cb3ca

Require stack in k6 cloud login, remove v1 token validation fallback

02b4ae4

codebien added 5 commits April 15, 2026 18:21

Refined the unautheticated error on cloud run

d864201

Migrated a few additional tests

473f762

Refactor to reduce the Cognitive complexity

0b604df

Addressed linter issues

335f923

Refined the token mask logic

78d3cfe

codebien force-pushed the 5651-make-stack-required branch from 11919b8 to 78d3cfe Compare April 15, 2026 16:21

codebien temporarily deployed to azure-trusted-signing April 15, 2026 16:27 — with GitHub Actions Inactive

mstoykov previously approved these changes Apr 15, 2026

View reviewed changes

Reduce again the cognitive complexity after rebase

36b0253

codebien dismissed mstoykov’s stale review via 36b0253 April 15, 2026 16:36

codebien temporarily deployed to azure-trusted-signing April 15, 2026 16:42 — with GitHub Actions Inactive

mstoykov previously approved these changes Apr 15, 2026

View reviewed changes

codebien temporarily deployed to azure-trusted-signing April 15, 2026 16:44 — with GitHub Actions Inactive

joanlopez mentioned this pull request Apr 16, 2026

Add k6 cloud project and k6 cloud project list commands #5650

Merged

4 of 8 tasks

inancgumus reviewed Apr 17, 2026

View reviewed changes

Fixes authenticateUserToken func comment

e533383

Co-authored-by: Inanc Gumus <inanc.gumus@grafana.com>

codebien dismissed mstoykov’s stale review via e533383 April 21, 2026 07:45

codebien temporarily deployed to azure-trusted-signing April 21, 2026 07:51 — with GitHub Actions Inactive

codebien temporarily deployed to azure-trusted-signing April 21, 2026 07:53 — with GitHub Actions Inactive

mstoykov approved these changes Apr 22, 2026

View reviewed changes

codebien requested a review from inancgumus April 22, 2026 12:55

inancgumus approved these changes Apr 22, 2026

View reviewed changes

codebien merged commit 76b1cce into master Apr 22, 2026
52 checks passed

codebien deleted the 5651-make-stack-required branch April 22, 2026 13:51

szkiba mentioned this pull request Apr 22, 2026

make stack info mandatory for cloud commands #5737

Closed

inancgumus mentioned this pull request Apr 23, 2026

Add a dedicated cloud auth error type #5869

Merged

mstoykov modified the milestones: v2.0.0, v2.0.0-rc1 Apr 28, 2026

BrewTestBot mentioned this pull request May 11, 2026

k6 2.0.0 Homebrew/homebrew-core#281992

Merged

Navigation Menu

Repository navigation

Enforce stack info for cloud commands - #5833

Enforce stack info for cloud commands#5833
codebien merged 17 commits into
masterfrom
5651-make-stack-required

codebien commented Apr 10, 2026 •

edited

Loading

Uh oh!

mstoykov left a comment

Uh oh!

Uh oh!

inancgumus left a comment •

edited

Loading

Uh oh!

inancgumus Apr 17, 2026 •

edited

Loading

Uh oh!

inancgumus Apr 22, 2026

Uh oh!

Uh oh!

codebien commented Apr 22, 2026

Uh oh!

Uh oh!

This branch was previously deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

codebien commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What?

Note about differences from the original proposal

Note about implementation details

Uh oh!

mstoykov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

inancgumus left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

inancgumus Apr 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

inancgumus Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codebien commented Apr 22, 2026

Uh oh!

Uh oh!

This branch was previously deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codebien commented Apr 10, 2026 •

edited

Loading

inancgumus left a comment •

edited

Loading

inancgumus Apr 17, 2026 •

edited

Loading