upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-24 15:49:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

review

Browse source 
Signed-off-by: Stephane Jeandeaux <stephane.jeandeaux@gmail.com>
This commit is contained in:
Stephane Jeandeaux 2024-08-02 11:21:23 +02:00
parent 8434935a3d
commit 44a594fef5
No known key found for this signature in database
GPG key ID: 167157842698B63C
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/action/uninstall.go
View file

@ -17,6 +17,7 @@ limitations under the License.
package action
import (
"errors"
"fmt"
"log/slog"
"strings"
@ -28,6 +29,7 @@ import (
"helm.sh/helm/v4/pkg/kube"
releaseutil "helm.sh/helm/v4/pkg/release/util"
release "helm.sh/helm/v4/pkg/release/v1"
"helm.sh/helm/v4/pkg/storage/driver"
helmtime "helm.sh/helm/v4/pkg/time"
)
@ -67,14 +69,13 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
if u.DryRun {
r, err := u.cfg.releaseContent(name, 0)
switch {
case err == nil:
fallthrough
case u.IgnoreNotFound && errors.As(err, &driver.ErrReleaseNotFound):
return &release.UninstallReleaseResponse{Release: r}, nil
default:
if err != nil {
if u.IgnoreNotFound && errors.Is(err, driver.ErrReleaseNotFound) {
return nil, nil
}
return &release.UninstallReleaseResponse{}, err
}
return &release.UninstallReleaseResponse{Release: r}, nil
}
if err := chartutil.ValidateReleaseName(name); err != nil {

2
pkg/action/uninstall_test.go
View file

@ -41,7 +41,7 @@ func TestUninstallRelease_dryRun_ignoreNotFound(t *testing.T) {
is := assert.New(t)
res, err := unAction.Run("release-non-exist")
is.NotNil(res)
is.Nil(res)
is.NoError(err)
}