(WIP, not for merging) Standalone WASM+native build of "bundle init"

libs/template/config.go

@@ -6,9 +6,7 @@ import (
 	"fmt"
 	"io/fs"
 
-	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/jsonschema"
-	"github.com/databricks/cli/libs/log"
 	"golang.org/x/exp/maps"
 )
 
@@ -165,42 +163,45 @@ func (c *config) skipPrompt(p jsonschema.Property, r *renderer) (bool, error) {
 }
 
 func (c *config) promptOnce(property *jsonschema.Schema, name, defaultVal, description string) error {
-	var userInput string
-	if property.Enum != nil {
-		// List options for the user to select from
-		options, err := property.EnumStringSlice()
-		if err != nil {
-			return err
-		}
-		userInput, err = cmdio.AskSelect(c.ctx, description, options)
-		if err != nil {
-			return err
+	return nil
+	/*
+		var userInput string
+		if property.Enum != nil {
+			// List options for the user to select from
+			options, err := property.EnumStringSlice()
+			if err != nil {
+				return err
+			}
+			userInput, err = cmdio.AskSelect(c.ctx, description, options)
+			if err != nil {
+				return err
+			}
+		} else {
+			var err error
+			userInput, err = cmdio.Ask(c.ctx, description, defaultVal)
+			if err != nil {
+				return err
+			}
 		}
-	} else {
+
+		// Convert user input string back to a Go value
 		var err error
-		userInput, err = cmdio.Ask(c.ctx, description, defaultVal)
+		c.values[name], err = property.ParseString(userInput)
 		if err != nil {
-			return err
+			// Show error and retry if validation fails
+			cmdio.LogString(c.ctx, "Validation failed: "+err.Error())
+			return retriableError{err: err}
 		}
-	}
-
-	// Convert user input string back to a Go value
-	var err error
-	c.values[name], err = property.ParseString(userInput)
-	if err != nil {
-		// Show error and retry if validation fails
-		cmdio.LogString(c.ctx, "Validation failed: "+err.Error())
-		return retriableError{err: err}
-	}
 
-	// Validate the partial config which includes the new value
-	err = c.schema.ValidateInstance(c.values)
-	if err != nil {
-		// Show error and retry if validation fails
-		cmdio.LogString(c.ctx, "Validation failed: "+err.Error())
-		return retriableError{err: err}
-	}
-	return nil
+		// Validate the partial config which includes the new value
+		err = c.schema.ValidateInstance(c.values)
+		if err != nil {
+			// Show error and retry if validation fails
+			cmdio.LogString(c.ctx, "Validation failed: "+err.Error())
+			return retriableError{err: err}
+		}
+		return nil
+	*/
 }
 
 // Prompts user for values for properties that do not have a value set yet
@@ -255,11 +256,13 @@ func (c *config) promptForValues(r *renderer) error {
 // Prompt user for any missing config values. Assign default values if
 // terminal is not TTY
 func (c *config) promptOrAssignDefaultValues(r *renderer) error {
-	// TODO: replace with IsPromptSupported call (requires fixing TestAccBundleInitErrorOnUnknownFields test)
-	if cmdio.IsOutTTY(c.ctx) && cmdio.IsInTTY(c.ctx) && !cmdio.IsGitBash(c.ctx) {
-		return c.promptForValues(r)
-	}
-	log.Debugf(c.ctx, "Terminal is not TTY. Assigning default values to template input parameters")
+	/*
+		// TODO: replace with IsPromptSupported call (requires fixing TestAccBundleInitErrorOnUnknownFields test)
+		if cmdio.IsOutTTY(c.ctx) && cmdio.IsInTTY(c.ctx) && !cmdio.IsGitBash(c.ctx) {
+			return c.promptForValues(r)
+		}
+		log.Debugf(c.ctx, "Terminal is not TTY. Assigning default values to template input parameters")
+	*/
 	return c.assignDefaultValues(r)
 }
 

libs/template/file.go

@@ -1,12 +1,8 @@
 package template
 
 import (
-	"bytes"
-	"context"
 	"io/fs"
 	"slices"
-
-	"github.com/databricks/cli/libs/filer"
 )
 
 // Interface representing a file to be materialized from a template into a project
@@ -18,7 +14,7 @@ type file interface {
 	RelPath() string
 
 	// Write file to disk at the destination path.
-	Write(ctx context.Context, out filer.Filer) error
+	// Write(ctx context.Context, out filer.Filer) error
 
 	// contents returns the file contents as a byte slice.
 	// This is used for testing purposes.
@@ -43,6 +39,7 @@ func (f *copyFile) RelPath() string {
 	return f.relPath
 }
 
+/*
 func (f *copyFile) Write(ctx context.Context, out filer.Filer) error {
 	src, err := f.srcFS.Open(f.srcPath)
 	if err != nil {
@@ -51,6 +48,7 @@ func (f *copyFile) Write(ctx context.Context, out filer.Filer) error {
 	defer src.Close()
 	return out.Write(ctx, f.relPath, src, filer.CreateParentDirectories, filer.WriteMode(f.perm))
 }
+*/
 
 func (f *copyFile) contents() ([]byte, error) {
 	return fs.ReadFile(f.srcFS, f.srcPath)
@@ -71,9 +69,9 @@ func (f *inMemoryFile) RelPath() string {
 	return f.relPath
 }
 
-func (f *inMemoryFile) Write(ctx context.Context, out filer.Filer) error {
-	return out.Write(ctx, f.relPath, bytes.NewReader(f.content), filer.CreateParentDirectories, filer.WriteMode(f.perm))
-}
+//func (f *inMemoryFile) Write(ctx context.Context, out filer.Filer) error {
+//	return out.Write(ctx, f.relPath, bytes.NewReader(f.content), filer.CreateParentDirectories, filer.WriteMode(f.perm))
+//}
 
 func (f *inMemoryFile) contents() ([]byte, error) {
 	return slices.Clone(f.content), nil

libs/template/helpers.go

@@ -2,18 +2,15 @@ package template
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"math/rand"
 	"net/url"
 	"os"
 	"regexp"
 	"text/template"
 
-	"github.com/databricks/cli/libs/command"
-	"github.com/databricks/cli/libs/iamutil"
-	"github.com/databricks/databricks-sdk-go/apierr"
-	"github.com/databricks/databricks-sdk-go/service/iam"
+	//"github.com/databricks/databricks-sdk-go/apierr"
+	//"github.com/databricks/databricks-sdk-go/service/iam"
 
 	"github.com/google/uuid"
 )
@@ -32,9 +29,9 @@ type pair struct {
 }
 
 var (
-	cachedUser               *iam.User
-	cachedIsServicePrincipal *bool
-	cachedCatalog            *string
+// cachedUser               *iam.User
+// cachedIsServicePrincipal *bool
+// cachedCatalog            *string
 )
 
 // UUID that is stable for the duration of the template execution. This can be used
@@ -44,8 +41,7 @@ var (
 // is run and can be used to attribute DBU revenue to bundle templates.
 var bundleUuid = uuid.New().String()
 
-func loadHelpers(ctx context.Context) template.FuncMap {
-	w := command.WorkspaceClient(ctx)
+func loadHelpers(ctx context.Context, values map[string]string) template.FuncMap {
 	return template.FuncMap{
 		"fail": func(format string, args ...any) (any, error) {
 			return nil, ErrFail{fmt.Sprintf(format, args...)}
@@ -89,83 +85,29 @@ func loadHelpers(ctx context.Context) template.FuncMap {
 			return result
 		},
 		// Get smallest node type (follows Terraform's GetSmallestNodeType)
-		"smallest_node_type": func() (string, error) {
-			if w.Config.Host == "" {
-				return "", errors.New("cannot determine target workspace, please first setup a configuration profile using 'databricks configure'")
-			}
-			if w.Config.IsAzure() {
-				return "Standard_D3_v2", nil
-			} else if w.Config.IsGcp() {
-				return "n1-standard-4", nil
-			}
-			return "i3.xlarge", nil
-		},
+		"smallest_node_type": readValuesFunc(values, "smallest_node_type", "i3.xlarge"),
 		"path_separator": func() string {
 			return string(os.PathSeparator)
 		},
-		"workspace_host": func() (string, error) {
-			if w.Config.Host == "" {
-				return "", errors.New("cannot determine target workspace, please first setup a configuration profile using 'databricks configure'")
-			}
-			return w.Config.Host, nil
-		},
-		"user_name": func() (string, error) {
-			if cachedUser == nil {
-				var err error
-				cachedUser, err = w.CurrentUser.Me(ctx)
-				if err != nil {
-					return "", err
-				}
-			}
-			result := cachedUser.UserName
-			if result == "" {
-				result = cachedUser.Id
-			}
-			return result, nil
-		},
-		"short_name": func() (string, error) {
-			if cachedUser == nil {
-				var err error
-				cachedUser, err = w.CurrentUser.Me(ctx)
-				if err != nil {
-					return "", err
-				}
-			}
-			return iamutil.GetShortUserName(cachedUser), nil
-		},
+		"workspace_host": readValuesFunc(values, "workspace_host", "<host>"),
+		"user_name":      readValuesFunc(values, "user_name", "<user>"),
+		"short_name":     readValuesFunc(values, "short_name", "<user>"),
 		// Get the default workspace catalog. If there is no default, or if
 		// Unity Catalog is not enabled, return an empty string.
-		"default_catalog": func() (string, error) {
-			if cachedCatalog == nil {
-				metastore, err := w.Metastores.Current(ctx)
-				if err != nil {
-					var aerr *apierr.APIError
-					if errors.As(err, &aerr) && (aerr.ErrorCode == "PERMISSION_DENIED" || aerr.ErrorCode == "METASTORE_DOES_NOT_EXIST") {
-						// Ignore: access denied or workspace doesn't have a metastore assigned
-						empty_default := ""
-						cachedCatalog = &empty_default
-						return "", nil
-					}
-					return "", err
-				}
-				cachedCatalog = &metastore.DefaultCatalogName
-			}
-			return *cachedCatalog, nil
-		},
+		"default_catalog": readValuesFunc(values, "default_catalog", ""),
+
 		"is_service_principal": func() (bool, error) {
-			if cachedIsServicePrincipal != nil {
-				return *cachedIsServicePrincipal, nil
-			}
-			if cachedUser == nil {
-				var err error
-				cachedUser, err = w.CurrentUser.Me(ctx)
-				if err != nil {
-					return false, err
-				}
-			}
-			result := iamutil.IsServicePrincipal(cachedUser)
-			cachedIsServicePrincipal = &result
-			return result, nil
+			return false, nil
 		},
 	}
 }
+
+func readValuesFunc(values map[string]string, name, defaultValue string) func() string {
+	return func() string {
+		x, ok := values[name]
+		if ok {
+			return x
+		}
+		return defaultValue
+	}
+}

libs/template/reader.go

@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/log"
 )
 
@@ -83,11 +82,11 @@ func (r *gitReader) FS(ctx context.Context) (fs.FS, error) {
 	r.tmpRepoDir = repoDir
 
 	// start the spinner
-	promptSpinner := cmdio.Spinner(ctx)
-	promptSpinner <- "Downloading the template\n"
+	// promptSpinner := cmdio.Spinner(ctx)
+	// promptSpinner <- "Downloading the template\n"
 
 	err = r.cloneFunc(ctx, r.gitUrl, r.ref, repoDir)
-	close(promptSpinner)
+	// close(promptSpinner)
 	if err != nil {
 		return nil, err
 	}