From 1c73b92f0f2f473eccbbefc6898bcf4c6da273c3 Mon Sep 17 00:00:00 2001
From: storyicon <yuanchao@bilibili.com>
Date: Thu, 22 Jul 2021 20:41:06 +0800
Subject: [PATCH] chore(*): update command error type

Signed-off-by: storyicon <yuanchao@bilibili.com>
---
 pkg/component/actionmanager/manager.go    | 2 +-
 pkg/component/compilermanager/compiler.go | 2 +-
 pkg/component/pluginmanager/git.go        | 8 ++++----
 pkg/component/pluginmanager/plugin.go     | 4 ++--
 pkg/util/command/command.go               | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/component/actionmanager/manager.go b/pkg/component/actionmanager/manager.go
index 94376d2..1d671d6 100644
--- a/pkg/component/actionmanager/manager.go
+++ b/pkg/component/actionmanager/manager.go
@@ -72,7 +72,7 @@ func (m *BasicActionManager) ExecutePostShell(ctx context.Context, config config
 	if err != nil {
 		return &ErrPostShell{
 			Path:           config.Path(),
-			ErrCommandExec: err,
+			ErrCommandExec: err.(*command.ErrCommandExec),
 		}
 	}
 	return nil
diff --git a/pkg/component/compilermanager/compiler.go b/pkg/component/compilermanager/compiler.go
index 6e119fd..07d69d8 100644
--- a/pkg/component/compilermanager/compiler.go
+++ b/pkg/component/compilermanager/compiler.go
@@ -104,7 +104,7 @@ func (b *BasicCompiler) Compile(ctx context.Context, protoFilePath string) error
 		b.Logger, b.dir, b.protocPath, arguments, nil)
 	if err != nil {
 		return &ErrCompile{
-			ErrCommandExec: err,
+			ErrCommandExec: err.(*command.ErrCommandExec),
 		}
 	}
 	return nil
diff --git a/pkg/component/pluginmanager/git.go b/pkg/component/pluginmanager/git.go
index 514b53b..192f201 100644
--- a/pkg/component/pluginmanager/git.go
+++ b/pkg/component/pluginmanager/git.go
@@ -34,13 +34,13 @@ func GetGitLatestCommitId(ctx context.Context, log logger.Logger, repo string) (
 	}, nil)
 	if err != nil {
 		return "", &ErrGitList{
-			ErrCommandExec: err,
+			ErrCommandExec: err.(*command.ErrCommandExec),
 		}
 	}
 	f := strings.Fields(string(data))
 	if len(f) != 2 {
 		return "", &ErrGitList{
-			ErrCommandExec: err,
+			ErrCommandExec: err.(*command.ErrCommandExec),
 		}
 	}
 	return f[0], nil
@@ -53,7 +53,7 @@ func ListGitCommitIds(ctx context.Context, log logger.Logger, repo string) ([]st
 	}, nil)
 	if err != nil {
 		return nil, &ErrGitList{
-			ErrCommandExec: err,
+			ErrCommandExec: err.(*command.ErrCommandExec),
 		}
 	}
 	var commitIds []string
@@ -74,7 +74,7 @@ func ListGitTags(ctx context.Context, log logger.Logger, repo string) ([]string,
 	}, nil)
 	if err != nil {
 		return nil, &ErrGitList{
-			ErrCommandExec: err,
+			ErrCommandExec: err.(*command.ErrCommandExec),
 		}
 	}
 	var tags []string
diff --git a/pkg/component/pluginmanager/plugin.go b/pkg/component/pluginmanager/plugin.go
index b691245..d2b4804 100644
--- a/pkg/component/pluginmanager/plugin.go
+++ b/pkg/component/pluginmanager/plugin.go
@@ -71,7 +71,7 @@ func InstallPluginUsingGo(ctx context.Context,
 	}, []string{"GOBIN=" + dir, "GO111MODULE=on"})
 	if err2 != nil {
 		return "", &ErrGoInstall{
-			ErrCommandExec: err2,
+			ErrCommandExec: err2.(*command.ErrCommandExec),
 		}
 	}
 	return local, nil
@@ -114,7 +114,7 @@ func ListGoPackageVersions(ctx context.Context, log logger.Logger, path string)
 	})
 	if err != nil {
 		return nil, &ErrGoList{
-			ErrCommandExec: err,
+			ErrCommandExec: err.(*command.ErrCommandExec),
 		}
 	}
 	var module Module
diff --git a/pkg/util/command/command.go b/pkg/util/command/command.go
index 41378e5..492ebd4 100644
--- a/pkg/util/command/command.go
+++ b/pkg/util/command/command.go
@@ -29,7 +29,7 @@ import (
 // Execute is used to execute commands, return stdout and execute errors
 func Execute(ctx context.Context,
 	log logger.Logger,
-	dir string, name string, arguments []string, env []string) ([]byte, *ErrCommandExec) {
+	dir string, name string, arguments []string, env []string) ([]byte, error) {
 	cmd := exec.CommandContext(ctx, name, arguments...)
 	cmd.Env = append(os.Environ(), env...)
 	cmd.Dir = dir