upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2719 from nebril/release-module-nil

Browse source 
Handle nil responses returned from rudder funcs
This commit is contained in:
Matt Butcher 2017-07-27 09:22:33 -06:00 committed by GitHub
commit 4a7d47cd74
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/tiller/release_modules.go
View file

@ -124,6 +124,9 @@ func (m *RemoteReleaseModule) Rollback(current, target *release.Release, req *se
func (m *RemoteReleaseModule) Status(r *release.Release, req *services.GetReleaseStatusRequest, env *environment.Environment) (string, error) {
statusRequest := &rudderAPI.ReleaseStatusRequest{Release: r}
resp, err := rudder.ReleaseStatus(statusRequest)
if resp == nil {
return "", err
}
return resp.Info.Status.Resources, err
}
@ -131,10 +134,17 @@ func (m *RemoteReleaseModule) Status(r *release.Release, req *services.GetReleas
func (m *RemoteReleaseModule) Delete(r *release.Release, req *services.UninstallReleaseRequest, env *environment.Environment) (string, []error) {
deleteRequest := &rudderAPI.DeleteReleaseRequest{Release: r}
resp, err := rudder.DeleteRelease(deleteRequest)
errs := make([]error, 0)
result := ""
if err != nil {
return resp.Release.Manifest, []error{err}
errs = append(errs, err)
}
return resp.Release.Manifest, []error{}
if resp != nil {
result = resp.Release.Manifest
}
return result, errs
}
// DeleteRelease is a helper that allows Rudder to delete a release without exposing most of Tiller inner functions