Refactoring of tests with comments

Author: alyssa-db

cmd/auth/login.go

@@ -136,6 +136,14 @@ depends on the existing profiles you have set in your configuration file
 			return err
 		}
 
+		// Bug fix: Preserve cluster_id from existing profile during login
+		// Prior to v0.233.0, the login command would overwrite the entire profile configuration,
+		// causing loss of cluster_id and other settings. Now we first retrieve the existing
+		// cluster_id before saving the new configuration to ensure it's preserved.
+		cfg.ClusterID, err = getClusterID(ctx, profileName, defaultConfigPath)
+		if err != nil {
+			return err
+		}
 		if configureCluster {
 			w, err := databricks.NewWorkspaceClient((*databricks.Config)(&cfg))
 			if err != nil {
@@ -148,12 +156,6 @@ depends on the existing profiles you have set in your configuration file
 				return err
 			}
 			cfg.ClusterID = clusterID
-		} else {
-			cfg.ClusterID, err = getClusterID(ctx, profileName, defaultConfigPath)
-			if err != nil {
-				return err
-			}
-
 		}
 
 		if profileName != "" {

cmd/auth/login_test.go

@@ -85,23 +85,36 @@ func TestSetAccountId(t *testing.T) {
 	assert.EqualError(t, err, "the command is being run in a non-interactive environment, please specify an account ID using --account-id")
 }
 
-func TestLoginPreservesClusterID(t *testing.T) {
-	t.Setenv("DATABRICKS_CONFIG_FILE", "./testdata/.databrickscfg")
-	clusterID, err := getClusterID(context.Background(), "cluster-profile", "./testdata/.databrickscfg")
-	require.NoError(t, err)
-	assert.Equal(t, "cluster-from-config", clusterID)
-}
+func TestLoginGetClusterID(t *testing.T) {
+	testCases := []struct {
+		name     string
+		profile  string
+		expected string
+	}{
+		{
+			name:     "existing cluster profile",
+			profile:  "cluster-profile",
+			expected: "cluster-from-config",
+		},
+		{
+			name:     "empty profile",
+			profile:  "no-profile",
+			expected: "",
+		},
+		{
+			name:     "account profile",
+			profile:  "account-profile",
+			expected: "",
+		},
+	}
 
-func TestLoginPreservesClusterIDWithEmptyHostAndAccountID(t *testing.T) {
 	t.Setenv("DATABRICKS_CONFIG_FILE", "./testdata/.databrickscfg")
-	clusterID, err := getClusterID(context.Background(), "no-profile", "./testdata/.databrickscfg")
-	require.NoError(t, err)
-	assert.Equal(t, "", clusterID)
-}
 
-func TestLoginNoClusterIDWithAccountProfile(t *testing.T) {
-	t.Setenv("DATABRICKS_CONFIG_FILE", "./testdata/.databrickscfg")
-	clusterID, err := getClusterID(context.Background(), "account-profile", "./testdata/.databrickscfg")
-	require.NoError(t, err)
-	assert.Equal(t, "", clusterID)
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			clusterID, err := getClusterID(context.Background(), tc.profile, "./testdata/.databrickscfg")
+			require.NoError(t, err)
+			assert.Equal(t, tc.expected, clusterID)
+		})
+	}
 }

cmd/auth/testdata/.databrickscfg

@@ -8,7 +8,6 @@ host = https://www.host2.com
 host = https://accounts.cloud.databricks.com
 account_id = id-from-profile
 
-
 [cluster-profile]
 host = https://www.host2.com
 cluster_id = cluster-from-config