From 5477afe4f43f27e4880bde87d2fe066e1362f7dd Mon Sep 17 00:00:00 2001
From: Andrew Nester <andrew.nester@databricks.com>
Date: Mon, 28 Aug 2023 19:05:55 +0200
Subject: [PATCH] Fixed --environment flag (#705)

## Changes
Fixed --environment flag

Fixes https://github.com/databricks/setup-cli/issues/35

## Tests
Added regression test
---
 cmd/root/bundle.go      |  2 +-
 cmd/root/bundle_test.go | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cmd/root/bundle.go b/cmd/root/bundle.go
index ba7a5dfd..fe97fbf2 100644
--- a/cmd/root/bundle.go
+++ b/cmd/root/bundle.go
@@ -26,7 +26,7 @@ func getTarget(cmd *cobra.Command) (value string) {
 
 	oldFlag := cmd.Flag("environment")
 	if oldFlag != nil {
-		value = flag.Value.String()
+		value = oldFlag.Value.String()
 		if value != "" {
 			return
 		}
diff --git a/cmd/root/bundle_test.go b/cmd/root/bundle_test.go
index 8aff9018..09b33d58 100644
--- a/cmd/root/bundle_test.go
+++ b/cmd/root/bundle_test.go
@@ -138,7 +138,7 @@ func TestTargetFlagFull(t *testing.T) {
 	err := cmd.ExecuteContext(ctx)
 	assert.NoError(t, err)
 
-	assert.Equal(t, cmd.Flag("target").Value.String(), "development")
+	assert.Equal(t, getTarget(cmd), "development")
 }
 
 func TestTargetFlagShort(t *testing.T) {
@@ -150,5 +150,19 @@ func TestTargetFlagShort(t *testing.T) {
 	err := cmd.ExecuteContext(ctx)
 	assert.NoError(t, err)
 
-	assert.Equal(t, cmd.Flag("target").Value.String(), "production")
+	assert.Equal(t, getTarget(cmd), "production")
+}
+
+// TODO: remove when environment flag is fully deprecated
+func TestTargetEnvironmentFlag(t *testing.T) {
+	cmd := emptyCommand(t)
+	initTargetFlag(cmd)
+	initEnvironmentFlag(cmd)
+	cmd.SetArgs([]string{"version", "--environment", "development"})
+
+	ctx := context.Background()
+	err := cmd.ExecuteContext(ctx)
+	assert.NoError(t, err)
+
+	assert.Equal(t, getTarget(cmd), "development")
 }