Skip to content

Commit

Permalink
Migrate TestResolveComplexVariableWithVarReference (#2156)
Browse files Browse the repository at this point in the history
This is the last test referencing
ResolveVariableReferencesInComplexVariables, allowing removal of that
mutator.
  • Loading branch information
denik authored Jan 15, 2025
1 parent d53a78e commit 39b0359
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 69 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
bundle:
name: TestResolveComplexVariableWithVarReference

variables:
package_version:
default: "1.0.0"
cluster_libraries:
type: "complex"
default:
- pypi:
package: "cicd_template==${var.package_version}"

resources:
jobs:
job1:
tasks:
- libraries: ${var.cluster_libraries}
12 changes: 12 additions & 0 deletions acceptance/bundle/variables/complex-with-var-reference/output.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"libraries": [
{
"pypi": {
"package": "cicd_template==1.0.0"
}
}
],
"task_key": ""
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$CLI bundle validate -o json | jq .resources.jobs.job1.tasks
69 changes: 0 additions & 69 deletions bundle/config/mutator/resolve_variable_references_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,79 +7,10 @@ import (
"github.com/databricks/cli/bundle"
"github.com/databricks/cli/bundle/config"
"github.com/databricks/cli/bundle/config/resources"
"github.com/databricks/cli/bundle/config/variable"
"github.com/databricks/cli/libs/diag"
"github.com/databricks/cli/libs/dyn"
"github.com/databricks/databricks-sdk-go/service/compute"
"github.com/databricks/databricks-sdk-go/service/jobs"
"github.com/databricks/databricks-sdk-go/service/pipelines"
"github.com/stretchr/testify/require"
)

func TestResolveComplexVariableWithVarReference(t *testing.T) {
b := &bundle.Bundle{
Config: config.Root{
Bundle: config.Bundle{
Name: "example",
},
Variables: map[string]*variable.Variable{
"package_version": {
Value: "1.0.0",
},
"cluster_libraries": {
Value: [](map[string]any){
{
"pypi": map[string]string{
"package": "cicd_template==${var.package_version}",
},
},
},
Type: variable.VariableTypeComplex,
},
},

Resources: config.Resources{
Jobs: map[string]*resources.Job{
"job1": {
JobSettings: &jobs.JobSettings{
Tasks: []jobs.Task{
{
Libraries: []compute.Library{},
},
},
},
},
},
},
},
}

ctx := context.Background()

// Assign the variables to the dynamic configuration.
diags := bundle.ApplyFunc(ctx, b, func(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
err := b.Config.Mutate(func(v dyn.Value) (dyn.Value, error) {
var p dyn.Path
var err error

p = dyn.MustPathFromString("resources.jobs.job1.tasks[0]")
v, err = dyn.SetByPath(v, p.Append(dyn.Key("libraries")), dyn.V("${var.cluster_libraries}"))
require.NoError(t, err)

return v, nil
})
return diag.FromErr(err)
})
require.NoError(t, diags.Error())

diags = bundle.Apply(ctx, b, bundle.Seq(
ResolveVariableReferencesInComplexVariables(),
ResolveVariableReferences("bundle", "workspace", "variables"),
))
require.NoError(t, diags.Error())
require.Equal(t, "cicd_template==1.0.0", b.Config.Resources.Jobs["job1"].JobSettings.Tasks[0].Libraries[0].Pypi.Package)
}

func TestResolveVariableReferencesWithSourceLinkedDeployment(t *testing.T) {
testCases := []struct {
enabled bool
Expand Down

0 comments on commit 39b0359

Please sign in to comment.