From 279c19ebc05190ce9b259f5580bcad05975b9042 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pieter.noordhuis@databricks.com>
Date: Wed, 4 Sep 2024 16:46:36 +0200
Subject: [PATCH] Additional clone call sites

---
 bundle/artifacts/expand_globs.go           | 7 +------
 bundle/libraries/expand_glob_references.go | 8 +++-----
 bundle/libraries/upload.go                 | 2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/bundle/artifacts/expand_globs.go b/bundle/artifacts/expand_globs.go
index 617444054d..cdf3d45900 100644
--- a/bundle/artifacts/expand_globs.go
+++ b/bundle/artifacts/expand_globs.go
@@ -33,12 +33,7 @@ func createGlobError(v dyn.Value, p dyn.Path, message string) diag.Diagnostic {
 		Severity:  diag.Error,
 		Summary:   fmt.Sprintf("%s: %s", source, message),
 		Locations: []dyn.Location{v.Location()},
-
-		Paths: []dyn.Path{
-			// Hack to clone the path. This path copy is mutable.
-			// To be addressed in a later PR.
-			p.Append(),
-		},
+		Paths:     []dyn.Path{p},
 	}
 }
 
diff --git a/bundle/libraries/expand_glob_references.go b/bundle/libraries/expand_glob_references.go
index 9e90a2a17f..9322a06b83 100644
--- a/bundle/libraries/expand_glob_references.go
+++ b/bundle/libraries/expand_glob_references.go
@@ -16,12 +16,10 @@ type expand struct {
 
 func matchError(p dyn.Path, l []dyn.Location, message string) diag.Diagnostic {
 	return diag.Diagnostic{
-		Severity: diag.Error,
-		Summary:  message,
-		Paths: []dyn.Path{
-			p.Append(),
-		},
+		Severity:  diag.Error,
+		Summary:   message,
 		Locations: l,
+		Paths:     []dyn.Path{p},
 	}
 }
 
diff --git a/bundle/libraries/upload.go b/bundle/libraries/upload.go
index be7cc41db5..224e7ab2d9 100644
--- a/bundle/libraries/upload.go
+++ b/bundle/libraries/upload.go
@@ -76,7 +76,7 @@ func collectLocalLibraries(b *bundle.Bundle) (map[string][]configLocation, error
 
 				source = filepath.Join(b.RootPath, source)
 				libs[source] = append(libs[source], configLocation{
-					configPath: p.Append(), // Hack to get the copy of path
+					configPath: p,
 					location:   v.Location(),
 				})