Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundle/config/variable/resolve_metastore.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ func (l resolveMetastore) Resolve(ctx context.Context, w *databricks.WorkspaceCl
// Return the ID of the first matching metastore.
switch len(entities) {
case 0:
return "", fmt.Errorf("metastoren named %q does not exist", l.name)
return "", fmt.Errorf("metastore named %q does not exist", l.name)
case 1:
return entities[0].MetastoreId, nil
default:
return "", fmt.Errorf("there are %d instances of clusters named %q", len(entities), l.name)
return "", fmt.Errorf("there are %d instances of metastores named %q", len(entities), l.name)
}
}

Expand Down
20 changes: 19 additions & 1 deletion bundle/config/variable/resolve_metastore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,25 @@ func TestResolveMetastore_ResolveNotFound(t *testing.T) {
ctx := context.Background()
l := resolveMetastore{name: "metastore"}
_, err := l.Resolve(ctx, m.WorkspaceClient)
require.ErrorContains(t, err, "metastoren named \"metastore\" does not exist")
require.ErrorContains(t, err, "metastore named \"metastore\" does not exist")
}

func TestResolveMetastore_ResolveMultiple(t *testing.T) {
m := mocks.NewMockWorkspaceClient(t)

api := m.GetMockMetastoresAPI()
api.EXPECT().
ListAll(mock.Anything, mock.Anything).
Return([]catalog.MetastoreInfo{
{MetastoreId: "abcd", Name: "metastore"},
{MetastoreId: "efgh", Name: "metastore"},
}, nil)

ctx := context.Background()
l := resolveMetastore{name: "metastore"}
_, err := l.Resolve(ctx, m.WorkspaceClient)
require.Error(t, err)
assert.ErrorContains(t, err, "there are 2 instances of metastores named \"metastore\"")
}

func TestResolveMetastore_String(t *testing.T) {
Expand Down