move interactive option to global (#370)

Fixes #366

Signed-off-by: yxxhero <aiopsclub@163.com>

pkg/config/apply.go

@@ -52,8 +52,6 @@ type ApplyOptions struct {
 	Wait bool
 	// WaitForJobs is true if the helm command should wait for the jobs to be completed
 	WaitForJobs bool
-	// Interactive is true if the user should be prompted for input.
-	Interactive bool
 }
 
 // NewApply creates a new Apply
@@ -204,8 +202,3 @@ func (a *ApplyImpl) Wait() bool {
 func (a *ApplyImpl) WaitForJobs() bool {
 	return a.ApplyOptions.WaitForJobs
 }
-
-// Interactive returns the Interactive.
-func (a *ApplyImpl) Interactive() bool {
-	return a.ApplyOptions.Interactive
-}

pkg/config/delete.go

@@ -10,8 +10,6 @@ type DeleteOptions struct {
 	Purge bool
 	// SkipDeps is the skip deps flag
 	SkipDeps bool
-	// Interactive is true if the user should be prompted for input.
-	Interactive bool
 }
 
 // NewDeleteOptions creates a new Apply
@@ -52,8 +50,3 @@ func (c *DeleteImpl) Purge() bool {
 func (c *DeleteImpl) SkipDeps() bool {
 	return c.DeleteOptions.SkipDeps
 }
-
-// Interactive returns the Interactive
-func (c *DeleteImpl) Interactive() bool {
-	return c.DeleteOptions.Interactive
-}

pkg/config/destroy.go

@@ -8,8 +8,6 @@ type DestroyOptions struct {
 	Concurrency int
 	// SkipDeps is the skip deps flag
 	SkipDeps bool
-	// Interactive is true if the user should be prompted for input.
-	Interactive bool
 }
 
 // NewDestroyOptions creates a new Apply
@@ -45,8 +43,3 @@ func (c *DestroyImpl) Args() string {
 func (c *DestroyImpl) SkipDeps() bool {
 	return c.DestroyOptions.SkipDeps
 }
-
-// Interactive returns the Interactive
-func (c *DestroyImpl) Interactive() bool {
-	return c.DestroyOptions.Interactive
-}

pkg/config/global.go

@@ -46,6 +46,8 @@ type GlobalOptions struct {
 	logger *zap.SugaredLogger
 	// EnableLiveOutput enables live output from the Helm binary stdout/stderr into Helmfile own stdout/stderr
 	EnableLiveOutput bool
+	// Interactive is true if the user should be prompted for input.
+	Interactive bool
 }
 
 // Logger returns the logger to use.
@@ -179,3 +181,8 @@ func (g *GlobalImpl) ValidateConfig() error {
 	}
 	return nil
 }
+
+// Interactive returns the Interactive
+func (g *GlobalImpl) Interactive() bool {
+	return g.GlobalOptions.Interactive
+}

pkg/config/sync.go

@@ -26,8 +26,6 @@ type SyncOptions struct {
 	Wait bool
 	// WaitForJobs is the wait for jobs flag
 	WaitForJobs bool
-	// Interactive is true if the user should be prompted for input.
-	Interactive bool
 }
 
 // NewSyncOptions creates a new Apply
@@ -112,8 +110,3 @@ func (t *SyncImpl) Wait() bool {
 func (t *SyncImpl) WaitForJobs() bool {
 	return t.SyncOptions.WaitForJobs
 }
-
-// Interactive returns the Interactive
-func (t *SyncImpl) Interactive() bool {
-	return t.SyncOptions.Interactive
-}