Add support to set the GC Stack the CLI should use by default

cloudapi/api.go

@@ -2,7 +2,9 @@ package cloudapi
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
+	"io"
 	"mime/multipart"
 	"net/http"
 	"strconv"
@@ -336,3 +338,95 @@ func (c *Client) ValidateToken() (*ValidateTokenResponse, error) {
 
 	return &vtr, nil
 }
+
+// Organization represents a Grafana Cloud k6 organization
+type Organization struct {
+	ID               int    `json:"id"`
+	GrafanaStackName string `json:"grafana_stack_name"`
+	GrafanaStackID   int    `json:"grafana_stack_id"`
+}
+
+// AccountMeResponse represents the response of the /account/me endpoint.
+type AccountMeResponse struct {
+	Organizations []Organization `json:"organizations"`
+}
+
+// AccountMe retrieves the current user's account information.
+func (c *Client) AccountMe() (*AccountMeResponse, error) {
+	// TODO: remove this hardcoded URL
+	req, err := c.NewRequest("GET", "https://api.k6.io/v3/account/me", nil)
+	if err != nil {
+		return nil, err
+	}
+
+	amr := AccountMeResponse{}
+	err = c.Do(req, &amr)
+	if err != nil {
+		return nil, err
+	}
+
+	return &amr, nil
+}
+
+// GetDefaultProject retrieves the default project for the given stack ID.
+func (c *Client) GetDefaultProject(stackID int64) (int64, string, error) {
+	// TODO: remove this hardcoded URL
+	req, err := c.NewRequest("GET", "https://api.k6.io/cloud/v6/projects", nil)
+	if err != nil {
+		return 0, "", err
+	}
+
+	q := req.URL.Query()
+	q.Add("$orderby", "created")
+	req.URL.RawQuery = q.Encode()
+
+	req.Header.Set("X-Stack-Id", fmt.Sprintf("%d", stackID))
+	// TODO: by default the client uses Token instead of Bearer
+	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.token))
+	req.Header.Set("User-Agent", "Go-http-client")
+
+	// TODO: Can't use c.Do bc it messes up the headers
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return 0, "", 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 resp.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(resp.Body)
+		return 0, "", fmt.Errorf("unexpected status %d: %s", resp.StatusCode, string(body))
+	}
+
+	var parsed struct {
+		Count int64 `json:"@count"`
+		Value []struct {
+			ID        int64  `json:"id"`
+			Name      string `json:"name"`
+			IsDefault bool   `json:"is_default"`
+			FolderUID string `json:"grafana_folder_uid"`
+		} `json:"value"`
+	}
+
+	if err := json.NewDecoder(resp.Body).Decode(&parsed); err != nil {
+		return 0, "", fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	if len(parsed.Value) == 0 {
+		return 0, "", fmt.Errorf("no projects found for stack ID %d", stackID)
+	}
+
+	for _, proj := range parsed.Value {
+		if proj.IsDefault {
+			return proj.ID, proj.Name, nil
+		}
+	}
+
+	return 0, "", fmt.Errorf("no default project found for stack ID %d", stackID)
+}

cloudapi/config.go

@@ -18,6 +18,8 @@ const LegacyCloudConfigKey = "loadimpact"
 //nolint:lll
 type Config struct {
 	// TODO: refactor common stuff between cloud execution and output
+	StackID   null.Int    `json:"stackID,omitempty" envconfig:"K6_CLOUD_STACK_ID"`
+	StackSlug null.String `json:"stackSlug,omitempty" envconfig:"K6_CLOUD_STACK_SLUG"`
 	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"`
@@ -103,6 +105,12 @@ func NewConfig() Config {
 //
 //nolint:cyclop
 func (c Config) Apply(cfg Config) Config {
+	if cfg.StackID.Valid {
+		c.StackID = cfg.StackID
+	}
+	if cfg.StackSlug.Valid {
+		c.StackSlug = cfg.StackSlug
+	}
 	if cfg.Token.Valid {
 		c.Token = cfg.Token
 	}
@@ -240,7 +248,8 @@ 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 take out the ProjectID, Name, Token and StackID from the options.cloud (or legacy loadimpact struct) map:
 	if tmpConfig.ProjectID.Valid {
 		conf.ProjectID = tmpConfig.ProjectID
 	}
@@ -250,6 +259,12 @@ func mergeFromCloudOptionAndExternal(
 	if tmpConfig.Token.Valid {
 		conf.Token = tmpConfig.Token
 	}
+	if tmpConfig.StackID.Valid {
+		conf.StackID = tmpConfig.StackID
+	}
+	if tmpConfig.StackSlug.Valid {
+		conf.StackSlug = tmpConfig.StackSlug
+	}
 
 	return nil
 }

cloudapi/config_test.go

@@ -25,6 +25,8 @@ func TestConfigApply(t *testing.T) {
 
 	full := Config{
 		Token:                 null.NewString("Token", true),
+		StackID:               null.NewInt(1, true),
+		StackSlug:             null.NewString("StackSlug", 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"
@@ -165,6 +166,34 @@ func (c *cmdCloud) run(cmd *cobra.Command, args []string) error {
 	modifyAndPrintBar(c.gs, progressBar, pb.WithConstProgress(0, "Validating script options"))
 	client := cloudapi.NewClient(
 		logger, cloudConfig.Token.String, cloudConfig.Host.String, build.Version, cloudConfig.Timeout.TimeDuration())
+
+	if cloudConfig.ProjectID.Int64 == 0 {
+		projectID, err := resolveDefaultProjectID(
+			c.gs,
+			client,
+			test.derivedConfig.Collectors["cloud"],
+			cloudConfig.Token.String,
+			cloudConfig.StackSlug,
+			&cloudConfig.StackID,
+			&cloudConfig.ProjectID.Int64,
+		)
+		if err != nil {
+			return err
+		}
+
+		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 err = client.ValidateOptions(arc.Options); err != nil {
 		return err
 	}