Add support to configure the default stack used by Cloud commands

cloudapi/api.go

@@ -2,7 +2,9 @@ package cloudapi
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
+	"io"
 	"mime/multipart"
 	"net/http"
 	"strconv"
@@ -70,6 +72,12 @@ type ValidateTokenResponse struct {
 	Token   string `json:"token-info"`
 }
 
+// AuthenticationResponse represents the response from the /cloud/v6/auth endpoint.
+type AuthenticationResponse struct {
+	StackID          int64 `json:"stack_id"`
+	DefaultProjectID int64 `json:"default_project_id"`
+}
+
 func (c *Client) handleLogEntriesFromCloud(ctrr CreateTestRunResponse) {
 	logger := c.logger.WithField("source", "grafana-k6-cloud")
 	for _, logEntry := range ctrr.Logs {
@@ -85,7 +93,7 @@ func (c *Client) handleLogEntriesFromCloud(ctrr CreateTestRunResponse) {
 // CreateTestRun is used when a test run is being executed locally, while the
 // results are streamed to the cloud, i.e. `k6 cloud run --local-execution` or `k6 run --out cloud script.js`.
 func (c *Client) CreateTestRun(testRun *TestRun) (*CreateTestRunResponse, error) {
-	url := fmt.Sprintf("%s/tests", c.baseURL)
+	url := fmt.Sprintf("%s/tests", c.BaseURL(c.apiVersion))
 
 	// Because the kind of request we make can vary depending on the test run configuration, we delegate
 	// its creation to a helper.
@@ -186,7 +194,7 @@ func (c *Client) UploadTestOnly(name string, projectID int64, arc *lib.Archive)
 }
 
 func (c *Client) uploadArchive(fields [][2]string, arc *lib.Archive) (*CreateTestRunResponse, error) {
-	requestURL := fmt.Sprintf("%s/archive-upload", c.baseURL)
+	requestURL := fmt.Sprintf("%s/archive-upload", c.BaseURL(c.apiVersion))
 
 	var buf bytes.Buffer
 	mp := multipart.NewWriter(&buf)
@@ -228,7 +236,7 @@ func (c *Client) uploadArchive(fields [][2]string, arc *lib.Archive) (*CreateTes
 // TestFinished sends the result and run status values to the cloud, along with
 // information for the test thresholds, and marks the test run as finished.
 func (c *Client) TestFinished(referenceID string, thresholds ThresholdResult, tained bool, runStatus RunStatus) error {
-	url := fmt.Sprintf("%s/tests/%s", c.baseURL, referenceID)
+	url := fmt.Sprintf("%s/tests/%s", c.BaseURL(c.apiVersion), referenceID)
 
 	resultStatus := ResultStatusPassed
 	if tained {
@@ -255,7 +263,7 @@ func (c *Client) TestFinished(referenceID string, thresholds ThresholdResult, ta
 
 // GetTestProgress for the provided referenceID.
 func (c *Client) GetTestProgress(referenceID string) (*TestProgressResponse, error) {
-	req, err := c.NewRequest(http.MethodGet, c.baseURL+"/test-progress/"+referenceID, nil)
+	req, err := c.NewRequest(http.MethodGet, c.BaseURL(c.apiVersion)+"/test-progress/"+referenceID, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -271,7 +279,7 @@ func (c *Client) GetTestProgress(referenceID string) (*TestProgressResponse, err
 
 // StopCloudTestRun tells the cloud to stop the test with the provided referenceID.
 func (c *Client) StopCloudTestRun(referenceID string) error {
-	req, err := c.NewRequest("POST", c.baseURL+"/tests/"+referenceID+"/stop", nil)
+	req, err := c.NewRequest("POST", c.BaseURL(c.apiVersion)+"/tests/"+referenceID+"/stop", nil)
 	if err != nil {
 		return err
 	}
@@ -286,7 +294,7 @@ type validateOptionsRequest struct {
 // ValidateOptions sends the provided options to the cloud for validation.
 func (c *Client) ValidateOptions(options lib.Options) error {
 	data := validateOptionsRequest{Options: options}
-	req, err := c.NewRequest("POST", c.baseURL+"/validate-options", data)
+	req, err := c.NewRequest("POST", c.BaseURL(c.apiVersion)+"/validate-options", data)
 	if err != nil {
 		return err
 	}
@@ -302,7 +310,7 @@ type loginRequest struct {
 // Login the user with the specified email and password.
 func (c *Client) Login(email string, password string) (*LoginResponse, error) {
 	data := loginRequest{Email: email, Password: password}
-	req, err := c.NewRequest("POST", c.baseURL+"/login", data)
+	req, err := c.NewRequest("POST", c.BaseURL(c.apiVersion)+"/login", data)
 	if err != nil {
 		return nil, err
 	}
@@ -323,7 +331,7 @@ type validateTokenRequest struct {
 // ValidateToken calls the endpoint to validate the Client's token and returns the result.
 func (c *Client) ValidateToken() (*ValidateTokenResponse, error) {
 	data := validateTokenRequest{Token: c.token}
-	req, err := c.NewRequest("POST", c.baseURL+"/validate-token", data)
+	req, err := c.NewRequest("POST", c.BaseURL(c.apiVersion)+"/validate-token", data)
 	if err != nil {
 		return nil, err
 	}
@@ -336,3 +344,41 @@ func (c *Client) ValidateToken() (*ValidateTokenResponse, error) {
 
 	return &vtr, nil
 }
+
+// ValidateAuth validates a token and stack URL, returning the stack ID and default project ID.
+// The stackURL must be a normalized full URL (e.g., https://my-team.grafana.net).
+func (c *Client) ValidateAuth(stackURL string) (*AuthenticationResponse, error) {
+	authURL := fmt.Sprintf("%s/auth", c.BaseURL(APIVersion6))
+	req, err := http.NewRequest(http.MethodGet, authURL, nil) //nolint:noctx
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("X-Stack-Url", stackURL)
+	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.token))
+	req.Header.Set("User-Agent", "k6cloud/"+c.version)
+
+	resp, err := c.client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("request failed: %w", err)
+	}
+	defer func() {
+		if resp != nil {
+			_, _ = io.Copy(io.Discard, resp.Body)
+			if cerr := resp.Body.Close(); cerr != nil && err == nil {
+				err = cerr
+			}
+		}
+	}()
+
+	if err := CheckResponse(resp); err != nil {
+		return nil, err
+	}
+
+	authResp := AuthenticationResponse{}
+	if err := json.NewDecoder(resp.Body).Decode(&authResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	return &authResp, nil
+}

cloudapi/client.go

@@ -23,12 +23,23 @@ const (
 	k6IdempotencyKeyHeader = "K6-Idempotency-Key"
 )
 
+// APIVersion represents the Cloud API version.
+type APIVersion string
+
+const (
+	// APIVersion1 represents the v1 API.
+	APIVersion1 APIVersion = "v1"
+	// APIVersion6 represents the v6 API.
+	APIVersion6 APIVersion = "v6"
+)
+
 // Client handles communication with the k6 Cloud API.
 type Client struct {
-	client  *http.Client
-	token   string
-	baseURL string
-	version string
+	client     *http.Client
+	token      string
+	host       string
+	apiVersion APIVersion
+	version    string
 
 	logger logrus.FieldLogger
 
@@ -38,10 +49,16 @@ type Client struct {
 
 // NewClient return a new client for the cloud API
 func NewClient(logger logrus.FieldLogger, token, host, version string, timeout time.Duration) *Client {
+	return NewClientWithAPIVersion(logger, token, host, version, APIVersion1, timeout)
+}
+
+// NewClientWithAPIVersion returns a new client for the cloud API with a specific API version.
+func NewClientWithAPIVersion(logger logrus.FieldLogger, token, host, version string, apiVersion APIVersion, timeout time.Duration) *Client {
 	c := &Client{
 		client:        &http.Client{Timeout: timeout},
 		token:         token,
-		baseURL:       fmt.Sprintf("%s/v1", host),
+		host:          host,
+		apiVersion:    apiVersion,
 		version:       version,
 		retries:       MaxRetries,
 		retryInterval: RetryInterval,
@@ -50,9 +67,17 @@ func NewClient(logger logrus.FieldLogger, token, host, version string, timeout t
 	return c
 }
 
-// BaseURL returns configured host.
-func (c *Client) BaseURL() string {
-	return c.baseURL
+// BaseURL returns the fully qualified base URL for the specified API version.
+// It returns:
+//   - "{client.host}/v1" for APIVersion1
+//   - "https://api.k6.io/cloud/v6" for APIVersion6
+func (c *Client) BaseURL(apiVersion APIVersion) string {
+	switch apiVersion {
+	case APIVersion6:
+		return "https://api.k6.io/cloud/v6"
+	default:
+		return fmt.Sprintf("%s/v1", c.host)
+	}
 }
 
 // NewRequest creates new HTTP request.

cloudapi/config.go

@@ -18,9 +18,12 @@ const LegacyCloudConfigKey = "loadimpact"
 //nolint:lll
 type Config struct {
 	// TODO: refactor common stuff between cloud execution and output
-	Token     null.String `json:"token" envconfig:"K6_CLOUD_TOKEN"`
-	ProjectID null.Int    `json:"projectID" envconfig:"K6_CLOUD_PROJECT_ID"`
-	Name      null.String `json:"name" envconfig:"K6_CLOUD_NAME"`
+	StackID          null.Int    `json:"stackID,omitempty" envconfig:"K6_CLOUD_STACK_ID"`
+	StackURL         null.String `json:"stackURL,omitempty" envconfig:"K6_CLOUD_STACK"`
+	DefaultProjectID null.Int    `json:"defaultProjectID,omitempty"`
+	Token            null.String `json:"token" envconfig:"K6_CLOUD_TOKEN"`
+	ProjectID        null.Int    `json:"projectID" envconfig:"K6_CLOUD_PROJECT_ID"`
+	Name             null.String `json:"name" envconfig:"K6_CLOUD_NAME"`
 
 	Host    null.String        `json:"host" envconfig:"K6_CLOUD_HOST"`
 	Timeout types.NullDuration `json:"timeout" envconfig:"K6_CLOUD_TIMEOUT"`
@@ -103,6 +106,15 @@ func NewConfig() Config {
 //
 //nolint:cyclop
 func (c Config) Apply(cfg Config) Config {
+	if cfg.StackID.Valid {
+		c.StackID = cfg.StackID
+	}
+	if cfg.StackURL.Valid && !c.StackURL.Valid {
+		c.StackURL = cfg.StackURL
+	}
+	if cfg.DefaultProjectID.Valid {
+		c.DefaultProjectID = cfg.DefaultProjectID
+	}
 	if cfg.Token.Valid {
 		c.Token = cfg.Token
 	}
@@ -240,7 +252,9 @@ func mergeFromCloudOptionAndExternal(
 	if err := json.Unmarshal(source, &tmpConfig); err != nil {
 		return err
 	}
-	// Only take out the ProjectID, Name and Token from the options.cloud (or legacy loadimpact struct) map:
+
+	// Only merge ProjectID, Name, Token, and StackID from options.
+	// StackURL and DefaultProjectID can only be set via login.
 	if tmpConfig.ProjectID.Valid {
 		conf.ProjectID = tmpConfig.ProjectID
 	}
@@ -250,6 +264,9 @@ func mergeFromCloudOptionAndExternal(
 	if tmpConfig.Token.Valid {
 		conf.Token = tmpConfig.Token
 	}
+	if tmpConfig.StackID.Valid {
+		conf.StackID = tmpConfig.StackID
+	}
 
 	return nil
 }

cloudapi/config_test.go

@@ -25,6 +25,7 @@ func TestConfigApply(t *testing.T) {
 
 	full := Config{
 		Token:                 null.NewString("Token", true),
+		StackID:               null.NewInt(1, true),
 		ProjectID:             null.NewInt(1, true),
 		Name:                  null.NewString("Name", true),
 		Host:                  null.NewString("Host", true),

internal/cmd/cloud.go

@@ -19,6 +19,7 @@ import (
 	"go.k6.io/k6/internal/build"
 	"go.k6.io/k6/internal/ui/pb"
 	"go.k6.io/k6/lib"
+	"gopkg.in/guregu/null.v3"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
@@ -174,6 +175,12 @@ func (c *cmdCloud) run(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	if cloudConfig.ProjectID.Int64 == 0 {
+		if err := resolveAndSetProjectID(c.gs, &cloudConfig, tmpCloudConfig, arc); err != nil {
+			return err
+		}
+	}
+
 	modifyAndPrintBar(c.gs, progressBar, pb.WithConstProgress(0, "Uploading archive"))
 
 	var cloudTestRun *cloudapi.CreateTestRunResponse
@@ -407,6 +414,36 @@ service. Be sure to run the "k6 cloud login" command prior to authenticate with
 	return cloudCmd
 }
 
+func resolveAndSetProjectID(
+	gs *state.GlobalState,
+	cloudConfig *cloudapi.Config,
+	tmpCloudConfig map[string]interface{},
+	arc *lib.Archive,
+) error {
+	projectID, err := resolveDefaultProjectID(gs, cloudConfig)
+	if err != nil {
+		return err
+	}
+	if projectID > 0 {
+		tmpCloudConfig["projectID"] = projectID
+
+		b, err := json.Marshal(tmpCloudConfig)
+		if err != nil {
+			return err
+		}
+
+		arc.Options.Cloud = b
+		arc.Options.External[cloudapi.LegacyCloudConfigKey] = b
+
+		cloudConfig.ProjectID = null.IntFrom(projectID)
+	}
+	if projectID == 0 && (!cloudConfig.StackID.Valid || cloudConfig.StackID.Int64 == 0) {
+		gs.Logger.Warn("Warning: no projectID or default stack specified. Falling back to the first available stack.")
+		gs.Logger.Warn("Consider setting a default stack via the `k6 cloud login` command.")
+	}
+	return nil
+}
+
 func exactCloudArgs() cobra.PositionalArgs {
 	return func(_ *cobra.Command, args []string) error {
 		const baseErrMsg = `the "k6 cloud" command expects either a subcommand such as "run" or "login", or ` +