Use sync root path in metadata computation

pietern · pietern · commit 7ea37a7ad8d8 · 2024-08-21T15:15:32.000+02:00
diff --git a/bundle/deploy/metadata/compute.go b/bundle/deploy/metadata/compute.go
@@ -37,10 +37,11 @@ func (m *compute) Apply(_ context.Context, b *bundle.Bundle) diag.Diagnostics {
 	// Set job config paths in metadata
 	jobsMetadata := make(map[string]*metadata.Job)
 	for name, job := range b.Config.Resources.Jobs {
-		// Compute config file path the job is defined in, relative to the bundle
-		// root
+		// Compute config file path the job is defined in, relative to the sync root.
+		// You can join the file path (below) with this relative path to find the
+		// workspace path containing the YAML file that defines the job.
 		l := b.Config.GetLocation("resources.jobs." + name)
-		relativePath, err := filepath.Rel(b.RootPath, l.File)
+		relativePath, err := filepath.Rel(b.SyncRootPath, l.File)
 		if err != nil {
 			return diag.Errorf("failed to compute relative path for job %s: %v", name, err)
 		}
diff --git a/bundle/deploy/metadata/compute_test.go b/bundle/deploy/metadata/compute_test.go
@@ -16,6 +16,8 @@ import (
 
 func TestComputeMetadataMutator(t *testing.T) {
 	b := &bundle.Bundle{
+		RootPath:     "parent/my_bundle",
+		SyncRootPath: "parent",
 		Config: config.Root{
 			Workspace: config.Workspace{
 				RootPath:     "/Users/shreyas.goenka@databricks.com",
@@ -55,9 +57,9 @@ func TestComputeMetadataMutator(t *testing.T) {
 		},
 	}
 
-	bundletest.SetLocation(b, "resources.jobs.my-job-1", "a/b/c")
-	bundletest.SetLocation(b, "resources.jobs.my-job-2", "d/e/f")
-	bundletest.SetLocation(b, "resources.pipelines.my-pipeline", "abc")
+	bundletest.SetLocation(b, "resources.jobs.my-job-1", "parent/my_bundle/a/b/c")
+	bundletest.SetLocation(b, "resources.jobs.my-job-2", "parent/my_bundle/d/e/f")
+	bundletest.SetLocation(b, "resources.pipelines.my-pipeline", "parent/my_bundle/abc")
 
 	expectedMetadata := metadata.Metadata{
 		Version: metadata.Version,
@@ -79,11 +81,11 @@ func TestComputeMetadataMutator(t *testing.T) {
 			Resources: metadata.Resources{
 				Jobs: map[string]*metadata.Job{
 					"my-job-1": {
-						RelativePath: "a/b/c",
+						RelativePath: "my_bundle/a/b/c",
 						ID:           "1111",
 					},
 					"my-job-2": {
-						RelativePath: "d/e/f",
+						RelativePath: "my_bundle/d/e/f",
 						ID:           "2222",
 					},
 				},
