Skip to content

Commit 5a264c3

Browse files
denikIsaac
andcommitted
Keep rejecting an empty resource name when collecting resources
Co-authored-by: Isaac <no-reply@databricks.com>
1 parent bfd68dc commit 5a264c3

2 files changed

Lines changed: 28 additions & 5 deletions

File tree

‎bundle/config/mutator/resourcemutator/process_static_resources.go‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package resourcemutator
22

33
import (
44
"context"
5+
"errors"
56

67
"github.com/databricks/cli/bundle"
78
"github.com/databricks/cli/bundle/config/mutator"
@@ -27,7 +28,10 @@ func (p processStaticResources) Name() string {
2728
}
2829

2930
func (p processStaticResources) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
30-
addedResources := getAllResources(b)
31+
addedResources, err := getAllResources(b)
32+
if err != nil {
33+
return diag.FromErr(err)
34+
}
3135

3236
// only YAML resources need to have paths normalized, before normalizing paths
3337
// we need to resolve variables because they can change path values:
@@ -57,12 +61,15 @@ func (p processStaticResources) Apply(ctx context.Context, b *bundle.Bundle) dia
5761
return nil
5862
}
5963

60-
func getAllResources(b *bundle.Bundle) ResourceKeySet {
64+
func getAllResources(b *bundle.Bundle) (ResourceKeySet, error) {
6165
set := NewResourceKeySet()
6266
for _, group := range b.Config.Resources.AllResources() {
6367
for name := range group.Resources {
68+
if name == "" {
69+
return nil, errors.New("failed to collect resources: can't parse resource key")
70+
}
6471
set.AddResourceKey(ResourceKey{Type: group.Description.PluralName, Name: name})
6572
}
6673
}
67-
return set
74+
return set, nil
6875
}

‎bundle/config/mutator/resourcemutator/process_static_resources_test.go‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ func TestGetAllResources(t *testing.T) {
2525
},
2626
}
2727

28-
set := getAllResources(b)
28+
set, err := getAllResources(b)
29+
require.NoError(t, err)
2930

3031
assert.ElementsMatch(
3132
t,
@@ -59,5 +60,20 @@ func TestGetAllResourcesMatchesConfigKeys(t *testing.T) {
5960
require.NoError(t, err)
6061
require.Equal(t, rv.NumField(), expected.Size())
6162

62-
assert.Equal(t, expected, getAllResources(b))
63+
set, err := getAllResources(b)
64+
require.NoError(t, err)
65+
assert.Equal(t, expected, set)
66+
}
67+
68+
func TestGetAllResourcesRejectsEmptyName(t *testing.T) {
69+
b := &bundle.Bundle{
70+
Config: config.Root{
71+
Resources: config.Resources{
72+
Jobs: map[string]*resources.Job{"": {}},
73+
},
74+
},
75+
}
76+
77+
_, err := getAllResources(b)
78+
assert.EqualError(t, err, "failed to collect resources: can't parse resource key")
6379
}

0 commit comments

Comments
 (0)