Merge pull request #342 from helmfile/339-introduction-of-skip-needs-results-in-breaking-change

Fix --skip-needs regression introduced in v0.145.0

pkg/config/apply.go

@@ -112,7 +112,7 @@ func (a *ApplyImpl) DiffOutput() string {
 
 // IncludeNeeds returns the include needs.
 func (a *ApplyImpl) IncludeNeeds() bool {
-	return a.ApplyOptions.IncludeNeeds || a.ApplyOptions.IncludeTransitiveNeeds
+	return a.ApplyOptions.IncludeNeeds || a.IncludeTransitiveNeeds()
 }
 
 // IncludeTests returns the include tests.
@@ -157,7 +157,7 @@ func (a *ApplyImpl) SkipDiffOnInstall() bool {
 
 // SkipNeeds returns the skip needs.
 func (a *ApplyImpl) SkipNeeds() bool {
-	if !a.ApplyOptions.IncludeNeeds {
+	if !a.IncludeNeeds() {
 		return a.ApplyOptions.SkipNeeds
 	}
 	return false

pkg/config/diff.go

@@ -69,7 +69,7 @@ func (t *DiffImpl) Concurrency() int {
 
 // IncludeNeeds returns the include needs
 func (t *DiffImpl) IncludeNeeds() bool {
-	return t.DiffOptions.IncludeNeeds || t.DiffOptions.IncludeTransitiveNeeds
+	return t.DiffOptions.IncludeNeeds || t.IncludeTransitiveNeeds()
 }
 
 // IncludeTransitiveNeeds returns the include transitive needs
@@ -89,7 +89,7 @@ func (t *DiffImpl) SkipDeps() bool {
 
 // SkipNeeds returns the skip needs
 func (t *DiffImpl) SkipNeeds() bool {
-	if !t.DiffOptions.IncludeNeeds {
+	if !t.IncludeNeeds() {
 		return t.DiffOptions.SkipNeeds
 	}
 

pkg/config/global.go

@@ -135,7 +135,7 @@ func (g *GlobalImpl) Color() bool {
 	}
 
 	// We replicate the helm-diff behavior in helmfile
-	// because when when helmfile calls helm-diff, helm-diff has no access to term and therefore
+	// because when helmfile calls helm-diff, helm-diff has no access to term and therefore
 	// we can't rely on helm-diff's ability to auto-detect term for color output.
 	// See https://github.com/roboll/helmfile/issues/2043
 

pkg/config/lint.go

@@ -72,7 +72,7 @@ func (l *LintImpl) SkipCleanup() bool {
 
 // IncludeNeeds returns the include needs
 func (l *LintImpl) IncludeNeeds() bool {
-	return l.LintOptions.IncludeNeeds || l.LintOptions.IncludeTransitiveNeeds
+	return l.LintOptions.IncludeNeeds || l.IncludeTransitiveNeeds()
 }
 
 // IncludeTransitiveNeeds returns the include transitive needs
@@ -82,7 +82,7 @@ func (l *LintImpl) IncludeTransitiveNeeds() bool {
 
 // SkipNeeds returns the skip needs
 func (l *LintImpl) SkipNeeds() bool {
-	if !l.LintOptions.IncludeNeeds {
+	if !l.IncludeNeeds() {
 		return l.LintOptions.SkipNeeds
 	}
 

pkg/config/sync.go

@@ -61,7 +61,7 @@ func (t *SyncImpl) Concurrency() int {
 
 // IncludeNeeds returns the include needs
 func (t *SyncImpl) IncludeNeeds() bool {
-	return t.SyncOptions.IncludeNeeds || t.SyncOptions.IncludeTransitiveNeeds
+	return t.SyncOptions.IncludeNeeds || t.IncludeTransitiveNeeds()
 }
 
 // IncludeTransitiveNeeds returns the include transitive needs
@@ -81,7 +81,7 @@ func (t *SyncImpl) SkipDeps() bool {
 
 // SkipNeeds returns the skip needs
 func (t *SyncImpl) SkipNeeds() bool {
-	if !t.SyncOptions.IncludeNeeds {
+	if !t.IncludeNeeds() {
 		return t.SyncOptions.SkipNeeds
 	}
 

pkg/config/template.go

@@ -74,7 +74,7 @@ func (t *TemplateImpl) IncludeCRDs() bool {
 
 // IncludeNeeds returns the include needs
 func (t *TemplateImpl) IncludeNeeds() bool {
-	return t.TemplateOptions.IncludeNeeds || t.TemplateOptions.IncludeTransitiveNeeds
+	return t.TemplateOptions.IncludeNeeds || t.IncludeTransitiveNeeds()
 }
 
 // IncludeTransitiveNeeds returns the include transitive needs
@@ -109,7 +109,7 @@ func (t *TemplateImpl) SkipDeps() bool {
 
 // SkipNeeds returns the skip needs
 func (t *TemplateImpl) SkipNeeds() bool {
-	if !t.TemplateOptions.IncludeNeeds {
+	if !t.IncludeNeeds() {
 		return t.TemplateOptions.SkipNeeds
 	}