refactor: show git output only in debug mode

Signed-off-by: Alexey Igrychev <alexey.igrychev@flant.com>
werf · Jul 26, 2022 · a40255a · a40255a
1 parent 8007487
commit a40255a
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git a/cmd/werf/build/main.go b/cmd/werf/build/main.go
@@ -153,7 +153,7 @@ func runMain(ctx context.Context, args []string) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/bundle/export/export.go b/cmd/werf/bundle/export/export.go
@@ -154,7 +154,7 @@ func runExport(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/bundle/publish/publish.go b/cmd/werf/bundle/publish/publish.go
@@ -171,7 +171,7 @@ func runPublish(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/ci_env/ci_env.go b/cmd/werf/ci_env/ci_env.go
@@ -104,7 +104,7 @@ func runCIEnv(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/cleanup/cleanup.go b/cmd/werf/cleanup/cleanup.go
@@ -118,7 +118,7 @@ func runCleanup(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/compose/main.go b/cmd/werf/compose/main.go
@@ -316,7 +316,7 @@ func runMain(ctx context.Context, dockerComposeCmdName string, cmdData composeCm
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/config/graph/graph.go b/cmd/werf/config/graph/graph.go
@@ -65,7 +65,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
 				return err
 			}
 
-			if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+			if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 				return err
 			}
 

diff --git a/cmd/werf/config/list/list.go b/cmd/werf/config/list/list.go
@@ -70,7 +70,7 @@ func run(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/config/render/render.go b/cmd/werf/config/render/render.go
@@ -43,7 +43,7 @@ func NewCmd(ctx context.Context) *cobra.Command {
 				return err
 			}
 
-			if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+			if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 				return err
 			}
 

diff --git a/cmd/werf/converge/converge.go b/cmd/werf/converge/converge.go
@@ -199,7 +199,7 @@ func runMain(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/dismiss/dismiss.go b/cmd/werf/dismiss/dismiss.go
@@ -146,7 +146,7 @@ func runDismiss(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/export/export.go b/cmd/werf/export/export.go
@@ -138,7 +138,7 @@ func run(ctx context.Context, imagesToProcess, tagTemplateList []string) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/helm/secret/rotate_secret_key/rotate_secret_key.go b/cmd/werf/helm/secret/rotate_secret_key/rotate_secret_key.go
@@ -83,7 +83,7 @@ func runRotateSecretKey(ctx context.Context, cmd *cobra.Command, secretValuesPat
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/host/cleanup/cleanup.go b/cmd/werf/host/cleanup/cleanup.go
@@ -116,7 +116,7 @@ func runCleanup(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/kube_run/kube_run.go b/cmd/werf/kube_run/kube_run.go
@@ -260,7 +260,7 @@ func runMain(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/managed_images/add/add.go b/cmd/werf/managed_images/add/add.go
@@ -101,7 +101,7 @@ func run(ctx context.Context, imageName string) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/managed_images/ls/ls.go b/cmd/werf/managed_images/ls/ls.go
@@ -97,7 +97,7 @@ func run(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/managed_images/rm/rm.go b/cmd/werf/managed_images/rm/rm.go
@@ -101,7 +101,7 @@ func run(ctx context.Context, imageNames []string) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/purge/purge.go b/cmd/werf/purge/purge.go
@@ -109,7 +109,7 @@ func runPurge(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/render/render.go b/cmd/werf/render/render.go
@@ -180,7 +180,7 @@ func runRender(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/run/run.go b/cmd/werf/run/run.go
@@ -243,7 +243,7 @@ func runMain(ctx context.Context) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}
 

diff --git a/cmd/werf/stage/image/main.go b/cmd/werf/stage/image/main.go
@@ -118,7 +118,7 @@ func run(ctx context.Context, imageName string) error {
 		return err
 	}
 
-	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+	if err := true_git.Init(ctx, true_git.Options{LiveGitOutput: *commonCmdData.LogDebug}); err != nil {
 		return err
 	}