[Internal] Refactor WorkspaceId to WorkspaceID in config

Author: tanmay-db

account_functions.go

@@ -36,7 +36,7 @@ func (c *AccountClient) GetWorkspaceClient(ws provisioning.Workspace) (*Workspac
 		return nil, err
 	}
 	cfg.AzureResourceID = ws.AzureResourceId()
-	cfg.WorkspaceId = fmt.Sprintf("%d", ws.WorkspaceId)
+	cfg.WorkspaceID = fmt.Sprintf("%d", ws.WorkspaceId)
 	w, err := NewWorkspaceClient((*Config)(cfg))
 	if err != nil {
 		return nil, err

config/cli_token_source.go

@@ -54,8 +54,8 @@ func buildCliCommand(cliPath string, cfg *Config) []string {
 		if cfg.AccountID != "" {
 			cmd = append(cmd, "--account-id", cfg.AccountID)
 		}
-		if cfg.WorkspaceId != "" {
-			cmd = append(cmd, "--workspace-id", cfg.WorkspaceId)
+		if cfg.WorkspaceID != "" {
+			cmd = append(cmd, "--workspace-id", cfg.WorkspaceID)
 		}
 	case AccountHost:
 		cmd = append(cmd, "--account-id", cfg.AccountID)

config/cli_token_source_test.go

@@ -156,7 +156,7 @@ func TestBuildCliCommand(t *testing.T) {
 				Host:                       unifiedHost,
 				Experimental_IsUnifiedHost: true,
 				AccountID:                  accountID,
-				WorkspaceId:                workspaceID,
+				WorkspaceID:                workspaceID,
 			},
 			wantCmd: []string{cliPath, "auth", "token", "--host", unifiedHost, "--experimental-is-unified-host", "--account-id", accountID, "--workspace-id", workspaceID},
 		},
@@ -174,7 +174,7 @@ func TestBuildCliCommand(t *testing.T) {
 			cfg: &Config{
 				Host:                       unifiedHost,
 				Experimental_IsUnifiedHost: true,
-				WorkspaceId:                workspaceID,
+				WorkspaceID:                workspaceID,
 			},
 			wantCmd: []string{cliPath, "auth", "token", "--host", unifiedHost, "--experimental-is-unified-host", "--workspace-id", workspaceID},
 		},

config/config.go

@@ -86,7 +86,7 @@ type Config struct {
 	AccountID string `name:"account_id" env:"DATABRICKS_ACCOUNT_ID"`
 
 	// Databricks Workspace ID for Workspace clients when working with unified hosts
-	WorkspaceId string `name:"workspace_id" env:"DATABRICKS_WORKSPACE_ID"`
+	WorkspaceID string `name:"workspace_id" env:"DATABRICKS_WORKSPACE_ID"`
 
 	Token    string `name:"token" env:"DATABRICKS_TOKEN" auth:"pat,sensitive"`
 	Username string `name:"username" env:"DATABRICKS_USERNAME" auth:"basic"`
@@ -407,7 +407,7 @@ func (c *Config) ConfigType() ConfigType {
 			// All unified host configs must have an account ID
 			return InvalidConfig
 		}
-		if c.WorkspaceId != "" {
+		if c.WorkspaceID != "" {
 			return WorkspaceConfig
 		}
 		return AccountConfig