Merge pull request #3025 from werf/dev_fix_not_initialized_true_git_p…

…ackage [dev] Fix not initialized true git package
werf · Dec 15, 2020 · 40eaefe · 40eaefe
2 parents 68909d6 + 222fcd9
commit 40eaefe
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 0 deletions.
diff --git a/cmd/werf/ci_env/ci_env.go b/cmd/werf/ci_env/ci_env.go
@@ -22,6 +22,7 @@ import (
 	"github.com/werf/werf/pkg/docker_registry"
 	"github.com/werf/werf/pkg/git_repo"
 	"github.com/werf/werf/pkg/tmp_manager"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -93,6 +94,10 @@ func runCIEnv(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	if err := common.ValidateArgumentCount(1, args, cmd); err != nil {
 		return err
 	}

diff --git a/cmd/werf/config/list/list.go b/cmd/werf/config/list/list.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/werf/werf/cmd/werf/common"
 	"github.com/werf/werf/pkg/git_repo"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -60,6 +61,10 @@ func run() error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	projectDir, err := common.GetProjectDir(&commonCmdData)
 	if err != nil {
 		return fmt.Errorf("getting project dir failed: %s", err)

diff --git a/cmd/werf/config/render/render.go b/cmd/werf/config/render/render.go
@@ -8,6 +8,7 @@ import (
 	"github.com/werf/werf/cmd/werf/common"
 	"github.com/werf/werf/pkg/config"
 	"github.com/werf/werf/pkg/git_repo"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -36,6 +37,10 @@ func NewCmd() *cobra.Command {
 				return err
 			}
 
+			if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+				return err
+			}
+
 			projectDir, err := common.GetProjectDir(&commonCmdData)
 			if err != nil {
 				return fmt.Errorf("getting project dir failed: %s", err)

diff --git a/cmd/werf/dismiss/dismiss.go b/cmd/werf/dismiss/dismiss.go
@@ -21,6 +21,7 @@ import (
 	"github.com/werf/werf/pkg/git_repo"
 	"github.com/werf/werf/pkg/image"
 	"github.com/werf/werf/pkg/tmp_manager"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 	"github.com/werf/werf/pkg/werf/global_warnings"
 )
@@ -119,6 +120,10 @@ func runDismiss() error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	if err := image.Init(); err != nil {
 		return err
 	}

diff --git a/cmd/werf/helm/get_namespace.go b/cmd/werf/helm/get_namespace.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/werf/werf/cmd/werf/common"
 	"github.com/werf/werf/pkg/git_repo"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -56,6 +57,10 @@ func runGetNamespace() error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *getNamespaceCmdData.LogVerbose || *getNamespaceCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	projectDir, err := common.GetProjectDir(&getNamespaceCmdData)
 	if err != nil {
 		return fmt.Errorf("getting project dir failed: %s", err)

diff --git a/cmd/werf/helm/get_release.go b/cmd/werf/helm/get_release.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/werf/werf/cmd/werf/common"
 	"github.com/werf/werf/pkg/git_repo"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -56,6 +57,10 @@ func runGetRelease() error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *getReleaseCmdData.LogVerbose || *getReleaseCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	projectDir, err := common.GetProjectDir(&getReleaseCmdData)
 	if err != nil {
 		return fmt.Errorf("getting project dir failed: %s", 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
@@ -15,6 +15,7 @@ import (
 	"github.com/werf/werf/cmd/werf/common"
 	"github.com/werf/werf/pkg/deploy/secret"
 	"github.com/werf/werf/pkg/git_repo"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/util"
 	"github.com/werf/werf/pkg/werf"
 )
@@ -76,6 +77,10 @@ func runRotateSecretKey(cmd *cobra.Command, secretValuesPaths ...string) error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	projectDir, err := common.GetProjectDir(&commonCmdData)
 	if err != nil {
 		return fmt.Errorf("getting project dir failed: %s", err)

diff --git a/cmd/werf/managed_images/add/add.go b/cmd/werf/managed_images/add/add.go
@@ -11,6 +11,7 @@ import (
 	"github.com/werf/werf/pkg/git_repo"
 	"github.com/werf/werf/pkg/image"
 	"github.com/werf/werf/pkg/tmp_manager"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -79,6 +80,10 @@ func run(imageName string) error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	if err := image.Init(); err != nil {
 		return err
 	}

diff --git a/cmd/werf/managed_images/ls/ls.go b/cmd/werf/managed_images/ls/ls.go
@@ -11,6 +11,7 @@ import (
 	"github.com/werf/werf/pkg/git_repo"
 	"github.com/werf/werf/pkg/image"
 	"github.com/werf/werf/pkg/tmp_manager"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -76,6 +77,10 @@ func run() error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	if err := image.Init(); err != nil {
 		return err
 	}

diff --git a/cmd/werf/managed_images/rm/rm.go b/cmd/werf/managed_images/rm/rm.go
@@ -12,6 +12,7 @@ import (
 	"github.com/werf/werf/pkg/git_repo"
 	"github.com/werf/werf/pkg/image"
 	"github.com/werf/werf/pkg/tmp_manager"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 )
 
@@ -80,6 +81,10 @@ func run(imageNames []string) error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	if err := image.Init(); err != nil {
 		return err
 	}

diff --git a/cmd/werf/purge/purge.go b/cmd/werf/purge/purge.go
@@ -16,6 +16,7 @@ import (
 	"github.com/werf/werf/pkg/storage"
 	"github.com/werf/werf/pkg/storage/manager"
 	"github.com/werf/werf/pkg/tmp_manager"
+	"github.com/werf/werf/pkg/true_git"
 	"github.com/werf/werf/pkg/werf"
 	"github.com/werf/werf/pkg/werf/global_warnings"
 )
@@ -97,6 +98,10 @@ func runPurge() error {
 		return err
 	}
 
+	if err := true_git.Init(true_git.Options{LiveGitOutput: *commonCmdData.LogVerbose || *commonCmdData.LogDebug}); err != nil {
+		return err
+	}
+
 	if err := image.Init(); err != nil {
 		return err
 	}