From 72a9e3dbac38eaccb4b2182120ca8740f95b4a80 Mon Sep 17 00:00:00 2001
From: Daniel Baptista Dias <danielbdias@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:22:21 -0300
Subject: [PATCH] feat: adding flags for token, environment and organization
 (#3337)

adding flags for environment and organization
---
 cli/cmd/configure_cmd.go   | 25 ++++++++++++++++++++++---
 cli/config/configurator.go | 11 +++++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/cli/cmd/configure_cmd.go b/cli/cmd/configure_cmd.go
index 68c6f93455..23545d09e1 100644
--- a/cli/cmd/configure_cmd.go
+++ b/cli/cmd/configure_cmd.go
@@ -34,6 +34,18 @@ var configureCmd = &cobra.Command{
 			flags.Endpoint = configParams.Endpoint
 		}
 
+		if flagProvided(cmd, "token") {
+			flags.Token = configParams.Token
+		}
+
+		if flagProvided(cmd, "environment") {
+			flags.EnvironmentID = configParams.EnvironmentID
+		}
+
+		if flagProvided(cmd, "organization") {
+			flags.OrganizationID = configParams.OrganizationID
+		}
+
 		err = configurator.Start(ctx, config, flags)
 		return "", err
 	})),
@@ -48,14 +60,21 @@ func init() {
 	configureCmd.PersistentFlags().BoolVarP(&configParams.Global, "global", "g", false, "configuration will be saved in your home dir")
 	configureCmd.PersistentFlags().StringVarP(&configParams.Endpoint, "endpoint", "e", "", "set the value for the endpoint, so the CLI won't ask for this value")
 
+	configureCmd.PersistentFlags().StringVarP(&configParams.Token, "token", "t", "", "set authetication with token, so the CLI won't ask you for authentication")
+	configureCmd.PersistentFlags().StringVarP(&configParams.EnvironmentID, "environment", "", "", "set environmentID, so the CLI won't ask you for it")
+	configureCmd.PersistentFlags().StringVarP(&configParams.OrganizationID, "organization", "", "", "set organizationID, so the CLI won't ask you for it")
+
 	configureCmd.PersistentFlags().BoolVarP(&configParams.CI, "ci", "", false, "if cloud is used, don't ask for authentication")
 	rootCmd.AddCommand(configureCmd)
 }
 
 type configureParameters struct {
-	Endpoint string
-	Global   bool
-	CI       bool
+	Endpoint       string
+	Global         bool
+	CI             bool
+	Token          string
+	OrganizationID string
+	EnvironmentID  string
 }
 
 func (p configureParameters) Validate(cmd *cobra.Command, args []string) []error {
diff --git a/cli/config/configurator.go b/cli/config/configurator.go
index 52236e04a8..808b697b8c 100644
--- a/cli/config/configurator.go
+++ b/cli/config/configurator.go
@@ -117,8 +117,15 @@ func (c Configurator) Start(ctx context.Context, prev Config, flags ConfigFlags)
 			return err
 		}
 
-		flags.OrganizationID = claims["organization_id"].(string)
-		flags.EnvironmentID = claims["environment_id"].(string)
+		organizationId := claims["organization_id"].(string)
+		environmentId := claims["environment_id"].(string)
+
+		if organizationId != "" {
+			flags.OrganizationID = organizationId
+		}
+		if environmentId != "" {
+			flags.EnvironmentID = environmentId
+		}
 	}
 
 	if flags.AgentApiKey != "" {