section from config logic

Author: alyssa-db

cmd/auth/login.go

@@ -140,7 +140,7 @@ depends on the existing profiles you have set in your configuration file
 		// 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)
+		cfg.ClusterID, err = getClusterID(ctx, profileName)
 		if err != nil {
 			return err
 		}
@@ -254,20 +254,28 @@ func getProfileName(authArguments *auth.AuthArguments) string {
 	return split[0]
 }
 
-func getClusterID(ctx context.Context, profileName, configPath string) (string, error) {
-	configFile, err := config.LoadFile(configPath)
+func getClusterID(ctx context.Context, profileName string) (string, error) {
+	file, err := profile.DefaultProfiler.Get(ctx)
 	if err != nil {
-		return "", err
-	}
-
-	if !configFile.HasSection(profileName) {
-		return "", nil
+		// If no configuration file exists, return empty string (no error)
+		if errors.Is(err, profile.ErrNoConfiguration) {
+			return "", nil
+		}
+		return "", fmt.Errorf("cannot load Databricks config file: %w", err)
 	}
 
-	section, err := configFile.GetSection(profileName)
-	if err != nil {
-		return "", err
+	for _, v := range file.Sections() {
+		if v.Name() != profileName {
+			continue
+		}
+		all := v.KeysHash()
+		_, ok := all["host"]
+		if !ok {
+			// invalid profile, skip
+			continue
+		}
+		return all["cluster_id"], nil
 	}
 
-	return section.Key("cluster_id").String(), nil
+	return "", nil
 }

cmd/auth/login_test.go

@@ -87,34 +87,52 @@ func TestSetAccountId(t *testing.T) {
 
 func TestLoginGetClusterID(t *testing.T) {
 	testCases := []struct {
-		name     string
-		profile  string
-		expected string
+		name          string
+		profile       string
+		configFileEnv string
+		expected      string
 	}{
 		{
-			name:     "existing cluster profile",
-			profile:  "cluster-profile",
-			expected: "cluster-from-config",
+			name:          "cluster profile",
+			profile:       "cluster-profile",
+			configFileEnv: "./testdata/.databrickscfg",
+			expected:      "cluster-from-config",
 		},
 		{
-			name:     "empty profile",
-			profile:  "no-profile",
-			expected: "",
+			name:          "empty profile",
+			profile:       "no-profile",
+			configFileEnv: "./testdata/.databrickscfg",
+			expected:      "",
 		},
 		{
-			name:     "account profile",
-			profile:  "account-profile",
-			expected: "",
+			name:          "account profile",
+			profile:       "account-profile",
+			configFileEnv: "./testdata/.databrickscfg",
+			expected:      "",
+		},
+		{
+			name:          "config doesn't exist",
+			profile:       "any-profile",
+			configFileEnv: "./nonexistent/.databrickscfg",
+			expected:      "",
+		},
+		{
+			name:          "invalid profile (missing host)",
+			profile:       "invalid-profile",
+			configFileEnv: "./testdata/.databrickscfg",
+			expected:      "",
 		},
 	}
 
-	t.Setenv("DATABRICKS_CONFIG_FILE", "./testdata/.databrickscfg")
-
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			clusterID, err := getClusterID(context.Background(), tc.profile, "./testdata/.databrickscfg")
+			t.Setenv("DATABRICKS_CONFIG_FILE", tc.configFileEnv)
+
+			clusterID, err := getClusterID(context.Background(), tc.profile)
 			require.NoError(t, err)
-			assert.Equal(t, tc.expected, clusterID)
+			assert.Equal(t, tc.expected, clusterID,
+				"Test case '%s' failed: expected cluster ID '%s', but got '%s' (profile: %s, config file: %s)",
+				tc.name, tc.expected, clusterID, tc.profile, tc.configFileEnv)
 		})
 	}
 }

cmd/auth/testdata/.databrickscfg

@@ -11,3 +11,7 @@ account_id = id-from-profile
 [cluster-profile]
 host = https://www.host2.com
 cluster_id = cluster-from-config
+
+[invalid-profile]
+# This profile is missing the required 'host' field
+cluster_id = some-cluster-id