fix(cli): consider env variables when running tracetest start (#3322)

kubeshop · Oct 30, 2023 · 1a827f6 · 1a827f6
1 parent e289cae
commit 1a827f6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/cli/cmd/start_cmd.go b/cli/cmd/start_cmd.go
@@ -11,9 +11,11 @@ import (
 )
 
 var (
-	start        = starter.NewStarter(configurator, resources)
-	defaultToken = os.Getenv("TRACETEST_TOKEN")
-	saveParams   = &saveParameters{}
+	start           = starter.NewStarter(configurator, resources)
+	defaultToken    = os.Getenv("TRACETEST_TOKEN")
+	defaultEndpoint = os.Getenv("TRACETEST_SERVER_URL")
+	defaultAPIKey   = os.Getenv("TRACETEST_API_KEY")
+	saveParams      = &saveParameters{}
 )
 
 var startCmd = &cobra.Command{
@@ -51,9 +53,9 @@ var startCmd = &cobra.Command{
 func init() {
 	startCmd.Flags().StringVarP(&saveParams.organizationID, "organization", "", "", "organization id")
 	startCmd.Flags().StringVarP(&saveParams.environmentID, "environment", "", "", "environment id")
-	startCmd.Flags().StringVarP(&saveParams.agentApiKey, "api-key", "", "", "agent api key")
+	startCmd.Flags().StringVarP(&saveParams.agentApiKey, "api-key", "", defaultAPIKey, "agent api key")
 	startCmd.Flags().StringVarP(&saveParams.token, "token", "", defaultToken, "token api key")
-	startCmd.Flags().StringVarP(&saveParams.endpoint, "endpoint", "e", config.DefaultCloudEndpoint, "set the value for the endpoint, so the CLI won't ask for this value")
+	startCmd.Flags().StringVarP(&saveParams.endpoint, "endpoint", "e", defaultEndpoint, "set the value for the endpoint, so the CLI won't ask for this value")
 	rootCmd.AddCommand(startCmd)
 }
 

diff --git a/cli/config/config.go b/cli/config/config.go
@@ -16,7 +16,7 @@ import (
 var (
 	Version              = "dev"
 	Env                  = "dev"
-	DefaultCloudEndpoint = "http://localhost:3000/"
+	DefaultCloudEndpoint = "http://app.tracetest.io"
 	DefaultCloudDomain   = "tracetest.io"
 	DefaultCloudPath     = "/"
 )

diff --git a/cli/config/configurator.go b/cli/config/configurator.go
@@ -40,12 +40,8 @@ func (c Configurator) WithOnFinish(onFinish onFinishFn) Configurator {
 
 func (c Configurator) Start(ctx context.Context, prev Config, flags ConfigFlags) error {
 	c.flags = flags
-	var serverURL string
-	if flags.Endpoint != "" {
-		serverURL = flags.Endpoint
-	} else if prev.UIEndpoint != "" {
-		serverURL = prev.UIEndpoint
-	} else {
+	serverURL := getFirstValidString(flags.Endpoint, prev.UIEndpoint, DefaultCloudEndpoint)
+	if serverURL == "" {
 		path := ""
 		if prev.ServerPath != nil {
 			path = *prev.ServerPath
@@ -142,6 +138,16 @@ func (c Configurator) Start(ctx context.Context, prev Config, flags ConfigFlags)
 		GetAuthJWT()
 }
 
+func getFirstValidString(values ...string) string {
+	for _, v := range values {
+		if v != "" {
+			return v
+		}
+	}
+
+	return ""
+}
+
 func (c Configurator) onOAuthSuccess(ctx context.Context, cfg Config) func(token, jwt string) {
 	return func(token, jwt string) {
 		cfg.Jwt = jwt