From 7855d9159783b70f21a54e0dcce6b6cddf61d192 Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Tue, 21 Jan 2025 16:49:51 +0100
Subject: [PATCH] modify approach

---
 bundle/bundle.go   | 31 +++++++++++++++++--------------
 cmd/root/auth.go   |  2 +-
 cmd/root/bundle.go |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/bundle/bundle.go b/bundle/bundle.go
index 3bf4ffb62..acbefc19a 100644
--- a/bundle/bundle.go
+++ b/bundle/bundle.go
@@ -72,6 +72,7 @@ type Bundle struct {
 	// It can be initialized on demand after loading the configuration.
 	clientOnce sync.Once
 	client     *databricks.WorkspaceClient
+	clientErr  error
 
 	// Files that are synced to the workspace.file_path
 	Files []fileset.File
@@ -134,23 +135,25 @@ func TryLoad(ctx context.Context) (*Bundle, error) {
 	return Load(ctx, root)
 }
 
-func (b *Bundle) InitializeWorkspaceClient() (*databricks.WorkspaceClient, error) {
-	client, err := b.Config.Workspace.Client()
-	if err != nil {
-		return nil, fmt.Errorf("cannot resolve bundle auth configuration: %w", err)
-	}
-	return client, nil
+func (b *Bundle) WorkspaceClientE() (*databricks.WorkspaceClient, error) {
+	b.clientOnce.Do(func() {
+		var err error
+		b.client, err = b.WorkspaceClientE()
+		if err != nil {
+			b.clientErr = fmt.Errorf("cannot resolve bundle auth configuration: %w", err)
+		}
+	})
+
+	return b.client, b.clientErr
 }
 
 func (b *Bundle) WorkspaceClient() *databricks.WorkspaceClient {
-	b.clientOnce.Do(func() {
-		var err error
-		b.client, err = b.InitializeWorkspaceClient()
-		if err != nil {
-			panic(err)
-		}
-	})
-	return b.client
+	client, err := b.WorkspaceClientE()
+	if err != nil {
+		panic(err)
+	}
+
+	return client
 }
 
 // SetWorkpaceClient sets the workspace client for this bundle.
diff --git a/cmd/root/auth.go b/cmd/root/auth.go
index 49abfd414..4fcfbb4d8 100644
--- a/cmd/root/auth.go
+++ b/cmd/root/auth.go
@@ -209,7 +209,7 @@ func MustWorkspaceClient(cmd *cobra.Command, args []string) error {
 		if b != nil {
 			ctx = context.WithValue(ctx, &configUsed, b.Config.Workspace.Config())
 			cmd.SetContext(ctx)
-			client, err := b.InitializeWorkspaceClient()
+			client, err := b.WorkspaceClientE()
 			if err != nil {
 				return err
 			}
diff --git a/cmd/root/bundle.go b/cmd/root/bundle.go
index 36af1c495..6414fbe3f 100644
--- a/cmd/root/bundle.go
+++ b/cmd/root/bundle.go
@@ -87,7 +87,7 @@ func configureBundle(cmd *cobra.Command, b *bundle.Bundle) (*bundle.Bundle, diag
 
 	// Set the auth configuration in the command context. This can be used
 	// downstream to initialize a API client.
-	client, err := b.InitializeWorkspaceClient()
+	client, err := b.WorkspaceClientE()
 	if err != nil {
 		return b, diags.Extend(diag.FromErr(err))
 	}