update

Author: parthban-db

compute/v2/ext_utilities.go

@@ -141,6 +141,11 @@ func (a *ClustersClient) EnsureClusterIsRunning(ctx context.Context, clusterId s
 	})
 }
 
+// TODO: This method currently contains cloud-specific logic (AWS vs others) that requires
+// the client to be aware of the cloud provider. However, we don't want client to contain
+// information about the cloud. We're temporarily including this method, but need to
+// decide on a better approach for handling these mixins before the SDK-Mod release.
+//
 // GetOrCreateRunningCluster creates an autoterminating cluster if it doesn't exist
 func (a *ClustersClient) GetOrCreateRunningCluster(ctx context.Context, name string, custom ...CreateCluster) (c *ClusterDetails, err error) {
 	getOrCreateClusterMutex.Lock()

databricks/config/api_client.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/databricks/databricks-sdk-go/databricks/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/common/environment"
 	"github.com/databricks/databricks-sdk-go/databricks/config/credentials"
 	"github.com/databricks/databricks-sdk-go/databricks/httpclient"
 	"github.com/databricks/databricks-sdk-go/databricks/useragent"
@@ -26,12 +27,21 @@ func HTTPClientConfigFromConfig(cfg *Config) (httpclient.ClientConfig, error) {
 	if err != nil {
 		return httpclient.ClientConfig{}, err
 	}
-
+	var cloud environment.Cloud
+	switch {
+	case cfg.IsAzure():
+		cloud = environment.CloudAzure
+	case cfg.IsAws():
+		cloud = environment.CloudAWS
+	case cfg.IsGcp():
+		cloud = environment.CloudGCP
+	default:
+		return httpclient.ClientConfig{}, fmt.Errorf("unable to determine cloud from config")
+	}
 	return httpclient.ClientConfig{
 		AccountID:          cfg.AccountID,
 		Host:               cfg.Host,
-		AzureResourceID:    cfg.AzureResourceID,
-		Cloud:              cfg.Environment().Cloud,
+		Cloud:              cloud,
 		RetryTimeout:       time.Duration(cfg.RetryTimeoutSeconds) * time.Second,
 		HTTPTimeout:        time.Duration(cfg.HTTPTimeoutSeconds) * time.Second,
 		RateLimitPerSecond: cfg.RateLimitPerSecond,

databricks/httpclient/api_client.go

@@ -26,10 +26,12 @@ type ClientConfig struct {
 	AuthVisitor RequestVisitor
 	Visitors    []RequestVisitor
 
-	AccountID       string
-	Host            string
-	Cloud           environment.Cloud
-	AzureResourceID string
+	AccountID string
+	Host      string
+	// TODO: Ideally we should not have knowledge of the cloud in the client config.
+	// But `getOrCreateRunningCluster` in `compute/v2/ext_utilities.go` uses this to determine the cloud.
+	// So, we are keeping it for now. But we should reconsider this approach before finalizing the SDK-Mod release.
+	Cloud environment.Cloud
 
 	RetryTimeout       time.Duration
 	HTTPTimeout        time.Duration
@@ -81,9 +83,6 @@ func (apic *ApiClient) AccountID() string {
 
 // IsAzure returns if the client is configured for Azure Databricks.
 func (apic *ApiClient) IsAzure() bool {
-	if apic.config.AzureResourceID != "" {
-		return true
-	}
 	return apic.config.Cloud == environment.CloudAzure
 }
 
@@ -94,7 +93,7 @@ func (apic *ApiClient) IsGcp() bool {
 
 // IsAws returns if the client is configured for Databricks on AWS.
 func (apic *ApiClient) IsAws() bool {
-	return apic.config.Host != "" && !apic.IsAzure() && !apic.IsGcp()
+	return apic.config.Cloud == environment.CloudAWS
 }
 
 const (