Skip to content

Guard the empty-file case when loading CRDs #6209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arpitjain099 wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

Guard the empty-file case when loading CRDs #6209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion api/internal/accumulator/loadconfigfromcrds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func LoadConfigFromCRDs(
}

func makeNameToApiMap(content []byte) (result nameToApiMap, err error) {
if content[0] == '{' {
if len(content) > 0 && content[0] == '{' {
err = json.Unmarshal(content, &result)
} else {
err = yaml.Unmarshal(content, &result)
Expand Down
14 changes: 14 additions & 0 deletions api/internal/accumulator/loadconfigfromcrds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,17 @@ func TestLoadCRDs(t *testing.T) {
t.Fatalf("expected\n %v\n but got\n %v\n", expectedTc, actualTc)
}
}

func TestLoadCRDsEmptyFile(t *testing.T) {
// A crds entry pointing at a zero-byte file should contribute nothing
// rather than crashing the build.
fSys := filesys.MakeFsInMemory()
err := fSys.WriteFile("/testpath/empty.json", []byte(""))
require.NoError(t, err)
ldr, err := loader.NewLoader(loader.RestrictionRootOnly, "/testpath", fSys)
require.NoError(t, err)

actualTc, err := LoadConfigFromCRDs(ldr, []string{"empty.json"})
require.NoError(t, err)
require.Equal(t, &builtinconfig.TransformerConfig{}, actualTc)
}
Loading