Ignore environment variables for auth profiles

cmd/auth/profiles.go

@@ -29,8 +29,10 @@ func (c *profileMetadata) IsEmpty() bool {
 }
 
 func (c *profileMetadata) Load(ctx context.Context, skipValidate bool) {
-	// TODO: disable config loaders other than configfile
-	cfg := &config.Config{Profile: c.Name}
+	cfg := &config.Config{
+		Loaders: []config.Loader{config.ConfigFile},
+		Profile: c.Name,
+	}
 	_ = cfg.EnsureResolved()
 	if cfg.IsAws() {
 		c.Cloud = "aws"
@@ -47,6 +49,7 @@ func (c *profileMetadata) Load(ctx context.Context, skipValidate bool) {
 		if err != nil {
 			return
 		}
+		c.Host = cfg.Host
 		c.AuthType = cfg.AuthType
 		return
 	}
@@ -57,6 +60,7 @@ func (c *profileMetadata) Load(ctx context.Context, skipValidate bool) {
 			return
 		}
 		_, err = a.Workspaces.List(ctx)
+		c.Host = cfg.Host
 		c.AuthType = cfg.AuthType
 		if err != nil {
 			return
@@ -68,14 +72,13 @@ func (c *profileMetadata) Load(ctx context.Context, skipValidate bool) {
 			return
 		}
 		_, err = w.CurrentUser.Me(ctx)
+		c.Host = cfg.Host
 		c.AuthType = cfg.AuthType
 		if err != nil {
 			return
 		}
 		c.Valid = true
 	}
-	// set host again, this time normalized
-	c.Host = cfg.Host
 }
 
 func newProfilesCommand() *cobra.Command {

cmd/auth/profiles_test.go

@@ -0,0 +1,41 @@
+package auth
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+
+	"github.com/databricks/cli/libs/databrickscfg"
+	"github.com/databricks/databricks-sdk-go/config"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestProfiles(t *testing.T) {
+	ctx := context.Background()
+	dir := t.TempDir()
+	configFile := filepath.Join(dir, ".databrickscfg")
+
+	// Create a config file with a profile
+	err := databrickscfg.SaveToProfile(ctx, &config.Config{
+		ConfigFile: configFile,
+		Profile:    "profile1",
+		Host:       "https://abc.cloud.databricks.com",
+		Token:      "token1",
+	})
+	require.NoError(t, err)
+
+	// Let the environment think we're using another profile
+	t.Setenv("DATABRICKS_HOST", "https://def.cloud.databricks.com")
+	t.Setenv("HOME", dir)
+
+	// Load the profile
+	profile := &profileMetadata{Name: "profile1"}
+	profile.Load(ctx, true)
+
+	// Check the profile
+	assert.Equal(t, "profile1", profile.Name)
+	assert.Equal(t, "https://abc.cloud.databricks.com", profile.Host)
+	assert.Equal(t, "aws", profile.Cloud)
+	assert.Equal(t, "pat", profile.AuthType)
+}