Skip to content

Strict unmarshal for plugin files #3046

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

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Strict unmarshal for plugin files #3046

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
6 changes: 3 additions & 3 deletions internal/config/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (p Plugins) Load(path string) error {
errs = errors.Join(errs, err)
}

for _, dataDir := range xdg.DataDirs {
for _, dataDir := range append(xdg.DataDirs, xdg.DataHome, xdg.ConfigHome) {
if err := p.loadPluginDir(filepath.Join(dataDir, k9sPluginsDir)); err != nil {
errs = errors.Join(errs, err)
}
Expand All @@ -88,9 +88,9 @@ func (p Plugins) loadPluginDir(dir string) error {
errs = errors.Join(errs, err)
}
var plugin Plugin
if err = yaml.Unmarshal(fileContent, &plugin); err != nil {
if err = yaml.UnmarshalStrict(fileContent, &plugin); err != nil {
var plugins Plugins
if err = yaml.Unmarshal(fileContent, &plugins); err != nil {
if err = yaml.UnmarshalStrict(fileContent, &plugins); err != nil {
return fmt.Errorf("cannot parse %s into either a single plugin nor plugins: %w", fileName, err)
}
for name, plugin := range plugins.Plugins {
Expand Down
Loading