From cbbe3f98cc8ad0c2a2a262448e082de3f78b364b Mon Sep 17 00:00:00 2001 From: Pablo Chacin Date: Tue, 11 Feb 2025 13:38:32 +0100 Subject: [PATCH] fix-default-build-service-url Signed-off-by: Pablo Chacin --- cmd/state.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cmd/state.go b/cmd/state.go index 3187926..dca6e24 100644 --- a/cmd/state.go +++ b/cmd/state.go @@ -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