Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 10 additions & 29 deletions cmd/state/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package state

import (
"context"
"fmt"
"io"
"os"
"os/signal"
Expand All @@ -28,9 +27,6 @@ const (
// AutoExtensionResolution defines the environment variable that enables using extensions natively
AutoExtensionResolution = "K6_AUTO_EXTENSION_RESOLUTION"

// communityExtensionsCatalog defines the catalog for community extensions
communityExtensionsCatalog = "oss"

// defaultBuildServiceURL defines the URL to the default (grafana hosted) build service
defaultBuildServiceURL = "https://ingest.k6.io/builder/api/v1"

Expand Down Expand Up @@ -181,23 +177,21 @@ type GlobalFlags struct {
LogFormat string
Verbose bool

AutoExtensionResolution bool
BuildServiceURL string
BinaryCache string
EnableCommunityExtensions bool
AutoExtensionResolution bool
BuildServiceURL string
BinaryCache string
}

// GetDefaultFlags returns the default global flags.
func GetDefaultFlags(homeDir string, cacheDir string) GlobalFlags {
return GlobalFlags{
Address: "localhost:6565",
ProfilingEnabled: false,
ConfigFilePath: filepath.Join(homeDir, "k6", defaultConfigFileName),
LogOutput: "stderr",
AutoExtensionResolution: true,
BuildServiceURL: defaultBuildServiceURL,
EnableCommunityExtensions: false,
BinaryCache: filepath.Join(cacheDir, "k6", defaultBinaryCacheDir),
Address: "localhost:6565",
ProfilingEnabled: false,
ConfigFilePath: filepath.Join(homeDir, "k6", defaultConfigFileName),
LogOutput: "stderr",
AutoExtensionResolution: true,
BuildServiceURL: defaultBuildServiceURL,
BinaryCache: filepath.Join(cacheDir, "k6", defaultBinaryCacheDir),
}
}

Expand Down Expand Up @@ -244,19 +238,6 @@ func getFlags(defaultFlags GlobalFlags, env map[string]string, args []string) Gl
if val, ok := env["K6_BUILD_SERVICE_URL"]; ok {
result.BuildServiceURL = val
}
if v, ok := env["K6_ENABLE_COMMUNITY_EXTENSIONS"]; ok {
vb, err := strconv.ParseBool(v)
if err == nil {
result.EnableCommunityExtensions = vb
}
}

// adjust BuildServiceURL if community extensions are enable
// community extensions flag only takes effect if the default build service is used
// for custom build service URLs it has no effect (because the /oss path may not be implemented)
if result.EnableCommunityExtensions && result.BuildServiceURL == defaultBuildServiceURL {
result.BuildServiceURL = fmt.Sprintf("%s/%s", defaultBuildServiceURL, communityExtensionsCatalog)
}

// check if verbose flag is set
if slices.Contains(args, "-v") || slices.Contains(args, "--verbose") {
Expand Down
Loading