From 950bd23d86f9009d6396dc52f01ddb45e33697d5 Mon Sep 17 00:00:00 2001
From: sgandon <sgandon@talend.com>
Date: Thu, 2 May 2019 13:41:49 +0200
Subject: [PATCH] fix(struct): renamed Error struct field into Failed (#566)

---
 state/state.go      | 12 ++++++------
 state/state_test.go |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/state/state.go b/state/state.go
index 9b1525f1..8b254c88 100644
--- a/state/state.go
+++ b/state/state.go
@@ -157,7 +157,7 @@ type SetValue struct {
 type AffectedReleases struct {
 	Upgraded []*ReleaseSpec
 	Deleted  []*ReleaseSpec
-	Error    []*ReleaseSpec
+	Failed   []*ReleaseSpec
 }
 
 const DefaultEnv = "default"
@@ -346,14 +346,14 @@ func (st *HelmState) SyncReleases(affectedReleases *AffectedReleases, helm helme
 						relErr = &ReleaseError{release, err}
 					} else if installed {
 						if err := helm.DeleteRelease(context, release.Name, "--purge"); err != nil {
-							affectedReleases.Error = append(affectedReleases.Error, release)
+							affectedReleases.Failed = append(affectedReleases.Failed, release)
 							relErr = &ReleaseError{release, err}
 						} else {
 							affectedReleases.Deleted = append(affectedReleases.Deleted, release)
 						}
 					}
 				} else if err := helm.SyncRelease(context, release.Name, chart, flags...); err != nil {
-					affectedReleases.Error = append(affectedReleases.Error, release)
+					affectedReleases.Failed = append(affectedReleases.Failed, release)
 					relErr = &ReleaseError{release, err}
 				} else {
 					affectedReleases.Upgraded = append(affectedReleases.Upgraded, release)
@@ -816,7 +816,7 @@ func (st *HelmState) DeleteReleases(affectedReleases *AffectedReleases, helm hel
 		}
 		if installed {
 			if err := helm.DeleteRelease(context, release.Name, flags...); err != nil {
-				affectedReleases.Error = append(affectedReleases.Error, &release)
+				affectedReleases.Failed = append(affectedReleases.Failed, &release)
 				return err
 			} else {
 				affectedReleases.Deleted = append(affectedReleases.Deleted, &release)
@@ -1373,10 +1373,10 @@ func (ar *AffectedReleases) DisplayAffectedReleases(logger *zap.SugaredLogger) {
 			logger.Info(release.Name)
 		}
 	}
-	if ar.Error != nil {
+	if ar.Failed != nil {
 		logger.Info("\nList of releases in error :")
 		logger.Info("RELEASE")
-		for _, release := range ar.Error {
+		for _, release := range ar.Failed {
 			logger.Info(release.Name)
 		}
 	}
diff --git a/state/state_test.go b/state/state_test.go
index 74a1844a..61587e4c 100644
--- a/state/state_test.go
+++ b/state/state_test.go
@@ -653,7 +653,7 @@ type mockRelease struct {
 type mockAffected struct {
 	upgraded []*mockRelease
 	deleted  []*mockRelease
-	error    []*mockRelease
+	failed   []*mockRelease
 }
 
 func (helm *mockHelmExec) UpdateDeps(chart string) error {
@@ -1007,8 +1007,8 @@ func TestHelmState_SyncReleasesAffectedRealeases(t *testing.T) {
 
 			affectedReleases := AffectedReleases{}
 			if err := state.SyncReleases(&affectedReleases, helm, []string{}, 1); err != nil {
-				if !testEq(affectedReleases.Error, tt.wantAffected.error) {
-					t.Errorf("HelmState.SynchAffectedRelease() error failed for [%s] = %v, want %v", tt.name, affectedReleases.Error, tt.wantAffected.error)
+				if !testEq(affectedReleases.Failed, tt.wantAffected.failed) {
+					t.Errorf("HelmState.SynchAffectedRelease() error failed for [%s] = %v, want %v", tt.name, affectedReleases.Failed, tt.wantAffected.failed)
 				} //else expected error
 			}
 			if !testEq(affectedReleases.Upgraded, tt.wantAffected.upgraded) {
@@ -1776,7 +1776,7 @@ func TestHelmState_Delete(t *testing.T) {
 			affectedReleases := AffectedReleases{}
 			errs := state.DeleteReleases(&affectedReleases, helm, tt.purge)
 			if errs != nil {
-				if !tt.wantErr || len(affectedReleases.Error) != 1 || affectedReleases.Error[0].Name != release.Name {
+				if !tt.wantErr || len(affectedReleases.Failed) != 1 || affectedReleases.Failed[0].Name != release.Name {
 					t.Errorf("DeleteReleases() for %s error = %v, wantErr %v", tt.name, errs, tt.wantErr)
 					return
 				}