Skip to content

Commit fc612d6

Browse files
menehune23sophiewigmore
authored andcommitted
Fix binding handling when binding root doesn't exist
1 parent d600cb5 commit fc612d6

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

servicebindings/resolver.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ func (r *Resolver) ResolveOne(typ, provider, platformDir string) (Binding, error
9393

9494
func loadBindings(bindingRoot string) ([]Binding, error) {
9595
files, err := os.ReadDir(bindingRoot)
96-
if err != nil {
96+
if os.IsNotExist(err) {
97+
return nil, nil
98+
} else if err != nil {
9799
return nil, err
98100
}
99101

servicebindings/resolver_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,14 @@ func testResolver(t *testing.T, context spec.G, it spec.S) {
323323
_, err = resolver.Resolve("bad-type", "", "")
324324
Expect(err).To(MatchError(HavePrefix("failed to load bindings from '%s': failed to read binding 'bad-binding': open %s: permission denied", bindingRoot, filepath.Join(bindingRoot, "bad-binding", "type"))))
325325
})
326+
327+
it("returns empty list if binding root doesn't exist", func() {
328+
Expect(os.RemoveAll(bindingRoot)).To(Succeed())
329+
330+
bindings, err := resolver.Resolve("type-1", "", "")
331+
Expect(err).NotTo(HaveOccurred())
332+
Expect(bindings).To(BeEmpty())
333+
})
326334
})
327335

328336
context("ResolveOne", func() {

0 commit comments

Comments
 (0)