make expandGlobs a mutator

denik · denik · commit 240d4428b287 · 2025-03-21T10:43:04.000+01:00
diff --git a/bundle/artifacts/build.go b/bundle/artifacts/build.go
@@ -77,7 +77,7 @@ func (m *build) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 		// We need to expand glob reference after build mutator is applied because
 		// if we do it before, any files that are generated by build command will
 		// not be included into artifact.Files and thus will not be uploaded.
-		diags = diags.Extend(expandGlobs(ctx, b, artifactName))
+		diags = diags.Extend(bundle.Apply(ctx, b, expandGlobs{name: artifactName}))
 		if diags.HasError() {
 			break
 		}
diff --git a/bundle/artifacts/expand_globs.go b/bundle/artifacts/expand_globs.go
@@ -8,7 +8,6 @@ import (
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/dyn"
-	"github.com/databricks/cli/libs/log"
 )
 
 func createGlobError(v dyn.Value, p dyn.Path, message string) diag.Diagnostic {
@@ -30,25 +29,20 @@ func createGlobError(v dyn.Value, p dyn.Path, message string) diag.Diagnostic {
 	}
 }
 
-func expandGlobs(ctx context.Context, b *bundle.Bundle, name string) diag.Diagnostics {
-	err := b.Config.MarkMutatorEntry(ctx)
-	if err != nil {
-		log.Errorf(ctx, "entry error: %s", err)
-		return diag.Errorf("entry error: %s", err)
-	}
+type expandGlobs struct {
+	name string
+}
 
-	defer func() {
-		err := b.Config.MarkMutatorExit(ctx)
-		if err != nil {
-			log.Errorf(ctx, "exit error: %s", err)
-		}
-	}()
+func (e expandGlobs) Name() string {
+	return "expandGlobs"
+}
 
+func (e expandGlobs) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 	// Base path for this mutator.
 	// This path is set with the list of expanded globs when done.
 	base := dyn.NewPath(
 		dyn.Key("artifacts"),
-		dyn.Key(name),
+		dyn.Key(e.name),
 		dyn.Key("files"),
 	)
 
@@ -59,7 +53,7 @@ func expandGlobs(ctx context.Context, b *bundle.Bundle, name string) diag.Diagno
 	)
 
 	var diags diag.Diagnostics
-	err = b.Config.Mutate(func(v dyn.Value) (dyn.Value, error) {
+	err := b.Config.Mutate(func(v dyn.Value) (dyn.Value, error) {
 		var output []dyn.Value
 		_, err := dyn.MapByPattern(v, pattern, func(p dyn.Path, v dyn.Value) (dyn.Value, error) {
 			if v.Kind() != dyn.KindString {
diff --git a/bundle/artifacts/prepare.go b/bundle/artifacts/prepare.go
@@ -74,7 +74,7 @@ func (m *prepare) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics
 		}
 
 		if len(artifact.Files) > 0 && artifact.BuildCommand == "" {
-			diags = diags.Extend(expandGlobs(ctx, b, artifactName))
+			diags = diags.Extend(bundle.Apply(ctx, b, expandGlobs{name: artifactName}))
 		}
 
 		if diags.HasError() {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func (m build) Apply(ctx context.Context, b bundle.Bundle) diag.Diagnostics {`
`77`	`77`	`// We need to expand glob reference after build mutator is applied because`
`78`	`78`	`// if we do it before, any files that are generated by build command will`
`79`	`79`	`// not be included into artifact.Files and thus will not be uploaded.`
`80`		`- diags = diags.Extend(expandGlobs(ctx, b, artifactName))`
	`80`	`+ diags = diags.Extend(bundle.Apply(ctx, b, expandGlobs{name: artifactName}))`
`81`	`81`	`if diags.HasError() {`
`82`	`82`	`break`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func (m prepare) Apply(ctx context.Context, b bundle.Bundle) diag.Diagnostics`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`if len(artifact.Files) > 0 && artifact.BuildCommand == "" {`
`77`		`- diags = diags.Extend(expandGlobs(ctx, b, artifactName))`
	`77`	`+ diags = diags.Extend(bundle.Apply(ctx, b, expandGlobs{name: artifactName}))`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if diags.HasError() {`