Stop tracking file path locations in bundle resources

bundle/artifacts/prepare.go

@@ -34,11 +34,13 @@ func (m *prepare) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics
  return diag.Errorf("artifact doesn't exist: %s", m.name)
 	}
 
+	l := b.Config.GetLocation("artifacts." + m.name)
+	dirPath := filepath.Dir(l.File)
+
 	// Check if source paths are absolute, if not, make them absolute
 	for k := range artifact.Files {
  f := &artifact.Files[k]
  if !filepath.IsAbs(f.Source) {
- dirPath := filepath.Dir(artifact.ConfigFilePath)
  f.Source = filepath.Join(dirPath, f.Source)
  }
 	}
@@ -49,7 +51,6 @@ func (m *prepare) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics
 	}
 
 	if !filepath.IsAbs(artifact.Path) {
- dirPath := filepath.Dir(artifact.ConfigFilePath)
  artifact.Path = filepath.Join(dirPath, artifact.Path)
 	}
 

bundle/config/artifact.go

@@ -4,18 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/libs/exec"
 )
 
 type Artifacts map[string]*Artifact
 
-func (artifacts Artifacts) ConfigureConfigFilePath() {
-	for _, artifact := range artifacts {
- artifact.ConfigureConfigFilePath()
-	}
-}
-
 type ArtifactType string
 
 const ArtifactPythonWheel ArtifactType = `whl`
@@ -40,8 +33,6 @@ type Artifact struct {
 	BuildCommand string `json:"build,omitempty"`
 
 	Executable exec.ExecutableType `json:"executable,omitempty"`
-
-	paths.Paths
 }
 
 func (a *Artifact) Build(ctx context.Context) ([]byte, error) {

bundle/config/mutator/trampoline_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/databricks/cli/bundle"
 	"github.com/databricks/cli/bundle/config"
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/bundle/config/resources"
 	"github.com/databricks/databricks-sdk-go/service/jobs"
 	"github.com/stretchr/testify/require"
@@ -65,9 +64,6 @@ func TestGenerateTrampoline(t *testing.T) {
  Resources: config.Resources{
  Jobs: map[string]*resources.Job{
  "test": {
- Paths: paths.Paths{
- ConfigFilePath: tmpDir,
- },
  JobSettings: &jobs.JobSettings{
  Tasks: tasks,
  },

bundle/config/resources.go

@@ -21,81 +21,14 @@ type Resources struct {
 	Schemas map[string]*resources.Schema `json:"schemas,omitempty"`
 }
 
-type resource struct {
-	resource ConfigResource
-	resource_type string
-	key string
-}
-
-func (r *Resources) allResources() []resource {
-	all := make([]resource, 0)
-	for k, e := range r.Jobs {
- all = append(all, resource{resource_type: "job", resource: e, key: k})
-	}
-	for k, e := range r.Pipelines {
- all = append(all, resource{resource_type: "pipeline", resource: e, key: k})
-	}
-	for k, e := range r.Models {
- all = append(all, resource{resource_type: "model", resource: e, key: k})
-	}
-	for k, e := range r.Experiments {
- all = append(all, resource{resource_type: "experiment", resource: e, key: k})
-	}
-	for k, e := range r.ModelServingEndpoints {
- all = append(all, resource{resource_type: "serving endpoint", resource: e, key: k})
-	}
-	for k, e := range r.RegisteredModels {
- all = append(all, resource{resource_type: "registered model", resource: e, key: k})
-	}
-	for k, e := range r.QualityMonitors {
- all = append(all, resource{resource_type: "quality monitor", resource: e, key: k})
-	}
-	return all
-}
-
-func (r *Resources) VerifyAllResourcesDefined() error {
-	all := r.allResources()
-	for _, e := range all {
- err := e.resource.Validate()
- if err != nil {
- return fmt.Errorf("%s %s is not defined", e.resource_type, e.key)
- }
-	}
-
-	return nil
-}
-
-// ConfigureConfigFilePath sets the specified path for all resources contained in this instance.
-// This property is used to correctly resolve paths relative to the path
-// of the configuration file they were defined in.
-func (r *Resources) ConfigureConfigFilePath() {
-	for _, e := range r.Jobs {
- e.ConfigureConfigFilePath()
-	}
-	for _, e := range r.Pipelines {
- e.ConfigureConfigFilePath()
-	}
-	for _, e := range r.Models {
- e.ConfigureConfigFilePath()
-	}
-	for _, e := range r.Experiments {
- e.ConfigureConfigFilePath()
-	}
-	for _, e := range r.ModelServingEndpoints {
- e.ConfigureConfigFilePath()
-	}
-	for _, e := range r.RegisteredModels {
- e.ConfigureConfigFilePath()
-	}
-	for _, e := range r.QualityMonitors {
- e.ConfigureConfigFilePath()
-	}
-}
-
 type ConfigResource interface {
+	// Function to assert if the resource exists in the workspace configured in
+	// the input workspace client.
 	Exists(ctx context.Context, w *databricks.WorkspaceClient, id string) (bool, error)
+
+	// Terraform equivalent name of the resource. For example "databricks_job"
+	// for jobs and "databricks_pipeline" for pipelines.
 	TerraformResourceName() string
-	Validate() error
 }
 
 func (r *Resources) FindResourceByConfigKey(key string) (ConfigResource, error) {

bundle/config/resources/job.go

@@ -2,10 +2,8 @@ package resources
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/marshal"
@@ -17,8 +15,6 @@ type Job struct {
 	Permissions []Permission `json:"permissions,omitempty"`
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 
-	paths.Paths
-
 	*jobs.JobSettings
 }
 
@@ -48,11 +44,3 @@ func (j *Job) Exists(ctx context.Context, w *databricks.WorkspaceClient, id stri
 func (j *Job) TerraformResourceName() string {
 	return "databricks_job"
 }
-
-func (j *Job) Validate() error {
-	if j == nil || !j.DynamicValue.IsValid() || j.JobSettings == nil {
- return fmt.Errorf("job is not defined")
-	}
-
-	return nil
-}

bundle/config/resources/mlflow_experiment.go

@@ -2,9 +2,7 @@ package resources
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/marshal"
@@ -16,8 +14,6 @@ type MlflowExperiment struct {
 	Permissions []Permission `json:"permissions,omitempty"`
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 
-	paths.Paths
-
 	*ml.Experiment
 }
 
@@ -43,11 +39,3 @@ func (s *MlflowExperiment) Exists(ctx context.Context, w *databricks.WorkspaceCl
 func (s *MlflowExperiment) TerraformResourceName() string {
 	return "databricks_mlflow_experiment"
 }
-
-func (s *MlflowExperiment) Validate() error {
-	if s == nil || !s.DynamicValue.IsValid() {
- return fmt.Errorf("experiment is not defined")
-	}
-
-	return nil
-}

bundle/config/resources/mlflow_model.go

@@ -2,9 +2,7 @@ package resources
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/marshal"
@@ -16,8 +14,6 @@ type MlflowModel struct {
 	Permissions []Permission `json:"permissions,omitempty"`
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 
-	paths.Paths
-
 	*ml.Model
 }
 
@@ -43,11 +39,3 @@ func (s *MlflowModel) Exists(ctx context.Context, w *databricks.WorkspaceClient,
 func (s *MlflowModel) TerraformResourceName() string {
 	return "databricks_mlflow_model"
 }
-
-func (s *MlflowModel) Validate() error {
-	if s == nil || !s.DynamicValue.IsValid() {
- return fmt.Errorf("model is not defined")
-	}
-
-	return nil
-}

bundle/config/resources/model_serving_endpoint.go

@@ -2,9 +2,7 @@ package resources
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/marshal"
@@ -20,10 +18,6 @@ type ModelServingEndpoint struct {
 	// as a reference in other resources. This value is returned by terraform.
 	ID string `json:"id,omitempty" bundle:"readonly"`
 
-	// Path to config file where the resource is defined. All bundle resources
-	// include this for interpolation purposes.
-	paths.Paths
-
 	// This is a resource agnostic implementation of permissions for ACLs.
 	// Implementation could be different based on the resource type.
 	Permissions []Permission `json:"permissions,omitempty"`
@@ -53,11 +47,3 @@ func (s *ModelServingEndpoint) Exists(ctx context.Context, w *databricks.Workspa
 func (s *ModelServingEndpoint) TerraformResourceName() string {
 	return "databricks_model_serving"
 }
-
-func (s *ModelServingEndpoint) Validate() error {
-	if s == nil || !s.DynamicValue.IsValid() {
- return fmt.Errorf("serving endpoint is not defined")
-	}
-
-	return nil
-}

bundle/config/resources/pipeline.go

@@ -2,9 +2,7 @@ package resources
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/marshal"
@@ -16,8 +14,6 @@ type Pipeline struct {
 	Permissions []Permission `json:"permissions,omitempty"`
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 
-	paths.Paths
-
 	*pipelines.PipelineSpec
 }
 
@@ -43,11 +39,3 @@ func (p *Pipeline) Exists(ctx context.Context, w *databricks.WorkspaceClient, id
 func (p *Pipeline) TerraformResourceName() string {
 	return "databricks_pipeline"
 }
-
-func (p *Pipeline) Validate() error {
-	if p == nil || !p.DynamicValue.IsValid() {
- return fmt.Errorf("pipeline is not defined")
-	}
-
-	return nil
-}

bundle/config/resources/quality_monitor.go

@@ -2,9 +2,7 @@ package resources
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/databricks/cli/bundle/config/paths"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/marshal"
@@ -21,10 +19,6 @@ type QualityMonitor struct {
 	// as a reference in other resources. This value is returned by terraform.
 	ID string `json:"id,omitempty" bundle:"readonly"`
 
-	// Path to config file where the resource is defined. All bundle resources
-	// include this for interpolation purposes.
-	paths.Paths
-
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 }
 
@@ -50,11 +44,3 @@ func (s *QualityMonitor) Exists(ctx context.Context, w *databricks.WorkspaceClie
 func (s *QualityMonitor) TerraformResourceName() string {
 	return "databricks_quality_monitor"
 }
-
-func (s *QualityMonitor) Validate() error {
-	if s == nil || !s.DynamicValue.IsValid() {
- return fmt.Errorf("quality monitor is not defined")
-	}
-
-	return nil
-}