Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build service URL precendece order #101

Merged
merged 1 commit into from
Feb 11, 2025
Merged
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
13 changes: 10 additions & 3 deletions cmd/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,18 @@ func newState(levelVar *slog.LevelVar) *state {
func (s *state) persistentPreRunE(cmd *cobra.Command, _ []string) error {
var err error

s.Options.BuildServiceURL = defaultBuildServiceURL
if len(s.buildServiceURL) > 0 {
s.Options.BuildServiceURL = s.buildServiceURL
// get URL to build service: first provided from flag, then from environment variable, then default
buildServiceURL := s.buildServiceURL

if len(buildServiceURL) == 0 {
buildServiceURL = os.Getenv("K6_BUILD_SERVICE_URL") //nolint:forbidigo
}
if len(buildServiceURL) == 0 {
buildServiceURL = defaultBuildServiceURL
}

s.Options.BuildServiceURL = buildServiceURL

// get authorization token for the build service
auth := os.Getenv("K6_CLOUD_TOKEN") //nolint:forbidigo

Expand Down
Loading