From bb917b8a832dfb48274bedb5a48a79242032cacc Mon Sep 17 00:00:00 2001 From: Suleiman Dibirov Date: Tue, 4 Nov 2025 07:06:25 +0200 Subject: [PATCH] fixes Signed-off-by: Suleiman Dibirov --- internal/plugin/installer/http_installer.go | 5 ++++- internal/plugin/installer/local_installer.go | 10 ++++++++-- internal/plugin/installer/oci_installer.go | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/internal/plugin/installer/http_installer.go b/internal/plugin/installer/http_installer.go index a8f8f9b3a..e42e2a439 100644 --- a/internal/plugin/installer/http_installer.go +++ b/internal/plugin/installer/http_installer.go @@ -92,7 +92,10 @@ func (i *HTTPInstaller) Install() error { } filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version) pluginsPath := helmpath.DataPath("plugins") - foundPlugins, _ := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + foundPlugins, err := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + if err != nil { + return fmt.Errorf("failed to search for existing plugins: %w", err) + } if len(foundPlugins) > 0 { return fmt.Errorf("plugin %q already exists at %q", metadata.Name, foundPlugins[0].Dir()) } diff --git a/internal/plugin/installer/local_installer.go b/internal/plugin/installer/local_installer.go index 475f1d920..1d05baaee 100644 --- a/internal/plugin/installer/local_installer.go +++ b/internal/plugin/installer/local_installer.go @@ -106,7 +106,10 @@ func (i *LocalInstaller) installFromDirectory() error { metadata := p.Metadata() pluginsPath := helmpath.DataPath("plugins") - foundPlugins, _ := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + foundPlugins, err := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + if err != nil { + return fmt.Errorf("failed to search for existing plugins: %w", err) + } if len(foundPlugins) > 0 { return fmt.Errorf("plugin %q already exists at %q", metadata.Name, foundPlugins[0].Dir()) } @@ -131,7 +134,10 @@ func (i *LocalInstaller) installFromArchive() error { } filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version) pluginsPath := helmpath.DataPath("plugins") - foundPlugins, _ := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + foundPlugins, err := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + if err != nil { + return fmt.Errorf("failed to search for existing plugins: %w", err) + } if len(foundPlugins) > 0 { return fmt.Errorf("plugin %q already exists at %q", metadata.Name, foundPlugins[0].Dir()) } diff --git a/internal/plugin/installer/oci_installer.go b/internal/plugin/installer/oci_installer.go index 346646d3e..51df15f61 100644 --- a/internal/plugin/installer/oci_installer.go +++ b/internal/plugin/installer/oci_installer.go @@ -102,7 +102,10 @@ func (i *OCIInstaller) Install() error { } filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version) pluginsPath := helmpath.DataPath("plugins") - foundPlugins, _ := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + foundPlugins, err := plugin.FindPlugins([]string{pluginsPath}, plugin.Descriptor{Name: metadata.Name}) + if err != nil { + return fmt.Errorf("failed to search for existing plugins: %w", err) + } if len(foundPlugins) > 0 { return fmt.Errorf("plugin %q already exists at %q", metadata.Name, foundPlugins[0].Dir()) }