Skip to content

Commit

Permalink
Fix prefix preset used for UC schemas (#1704)
Browse files Browse the repository at this point in the history
## Changes
In #1490 we regressed and started
using the development mode prefix for UC schemas regardless of the mode
of the bundle target.

This PR fixes the regression and adds a regression test

## Tests
Failing integration tests pass now.
  • Loading branch information
shreyas-goenka authored Aug 21, 2024
1 parent 192f33b commit f5df211
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 2 deletions.
3 changes: 1 addition & 2 deletions bundle/config/mutator/apply_presets.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ func (m *applyPresets) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnos

// Schemas: Prefix
for i := range r.Schemas {
prefix = "dev_" + b.Config.Workspace.CurrentUser.ShortName + "_"
r.Schemas[i].Name = prefix + r.Schemas[i].Name
r.Schemas[i].Name = normalizePrefix(prefix) + r.Schemas[i].Name
// HTTP API for schemas doesn't yet support tags. It's only supported in
// the Databricks UI and via the SQL API.
}
Expand Down
57 changes: 57 additions & 0 deletions bundle/config/mutator/apply_presets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/databricks/cli/bundle/config"
"github.com/databricks/cli/bundle/config/mutator"
"github.com/databricks/cli/bundle/config/resources"
"github.com/databricks/databricks-sdk-go/service/catalog"
"github.com/databricks/databricks-sdk-go/service/jobs"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -68,6 +69,62 @@ func TestApplyPresetsPrefix(t *testing.T) {
}
}

func TestApplyPresetsPrefixForUcSchema(t *testing.T) {
tests := []struct {
name string
prefix string
schema *resources.Schema
want string
}{
{
name: "add prefix to schema",
prefix: "[prefix]",
schema: &resources.Schema{
CreateSchema: &catalog.CreateSchema{
Name: "schema1",
},
},
want: "prefix_schema1",
},
{
name: "add empty prefix to schema",
prefix: "",
schema: &resources.Schema{
CreateSchema: &catalog.CreateSchema{
Name: "schema1",
},
},
want: "schema1",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
b := &bundle.Bundle{
Config: config.Root{
Resources: config.Resources{
Schemas: map[string]*resources.Schema{
"schema1": tt.schema,
},
},
Presets: config.Presets{
NamePrefix: tt.prefix,
},
},
}

ctx := context.Background()
diag := bundle.Apply(ctx, b, mutator.ApplyPresets())

if diag.HasError() {
t.Fatalf("unexpected error: %v", diag)
}

require.Equal(t, tt.want, b.Config.Resources.Schemas["schema1"].Name)
})
}
}

func TestApplyPresetsTags(t *testing.T) {
tests := []struct {
name string
Expand Down

0 comments on commit f5df211

Please sign in to comment.