Skip to content

Commit

Permalink
Initialize variable definitions that are defined without properties (#…
Browse files Browse the repository at this point in the history
…966)

## Changes

We can debate whether or not variable definitions without properties are
valid, but in no case should this panic the CLI.

Fixes #934.

## Tests

Unit.
  • Loading branch information
pietern authored Nov 8, 2023
1 parent 65dd9c5 commit 7847388
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 0 deletions.
30 changes: 30 additions & 0 deletions bundle/config/mutator/initialize_variables.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package mutator

import (
"context"

"github.com/databricks/cli/bundle"
"github.com/databricks/cli/bundle/config/variable"
)

type initializeVariables struct{}

// InitializeVariables initializes nil variables to their corresponding zero values.
func InitializeVariables() bundle.Mutator {
return &initializeVariables{}
}

func (m *initializeVariables) Name() string {
return "InitializeVariables"
}

func (m *initializeVariables) Apply(ctx context.Context, b *bundle.Bundle) error {
vars := b.Config.Variables
for k, v := range vars {
if v == nil {
vars[k] = &variable.Variable{}
}
}

return nil
}
42 changes: 42 additions & 0 deletions bundle/config/mutator/initialize_variables_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package mutator_test

import (
"context"
"testing"

"github.com/databricks/cli/bundle"
"github.com/databricks/cli/bundle/config"
"github.com/databricks/cli/bundle/config/mutator"
"github.com/databricks/cli/bundle/config/variable"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestInitializeVariables(t *testing.T) {
b := &bundle.Bundle{
Config: config.Root{
Variables: map[string]*variable.Variable{
"foo": nil,
"bar": {
Description: "This is a description",
},
},
},
}
err := bundle.Apply(context.Background(), b, mutator.InitializeVariables())
require.NoError(t, err)
assert.NotNil(t, b.Config.Variables["foo"])
assert.NotNil(t, b.Config.Variables["bar"])
assert.Equal(t, "This is a description", b.Config.Variables["bar"].Description)
}

func TestInitializeVariablesWithoutVariables(t *testing.T) {
b := &bundle.Bundle{
Config: config.Root{
Variables: nil,
},
}
err := bundle.Apply(context.Background(), b, mutator.InitializeVariables())
require.NoError(t, err)
assert.Nil(t, b.Config.Variables)
}
1 change: 1 addition & 0 deletions bundle/config/mutator/mutator.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ func DefaultMutators() []bundle.Mutator {
return []bundle.Mutator{
scripts.Execute(config.ScriptPreInit),
ProcessRootIncludes(),
InitializeVariables(),
DefineDefaultTarget(),
LoadGitDetails(),
}
Expand Down
3 changes: 3 additions & 0 deletions bundle/tests/variables/without_definition/databricks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
variables:
a:
b:
12 changes: 12 additions & 0 deletions bundle/tests/variables_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,15 @@ func TestVariablesTargetsBlockOverrideWithUndefinedVariables(t *testing.T) {
)))
assert.ErrorContains(t, err, "variable c is not defined but is assigned a value")
}

func TestVariablesWithoutDefinition(t *testing.T) {
t.Setenv("BUNDLE_VAR_a", "foo")
t.Setenv("BUNDLE_VAR_b", "bar")
b := load(t, "./variables/without_definition")
err := bundle.Apply(context.Background(), b, mutator.SetVariables())
require.NoError(t, err)
require.True(t, b.Config.Variables["a"].HasValue())
require.True(t, b.Config.Variables["b"].HasValue())
assert.Equal(t, "foo", *b.Config.Variables["a"].Value)
assert.Equal(t, "bar", *b.Config.Variables["b"].Value)
}

0 comments on commit 7847388

Please sign in to comment.