technofab/powerproto
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/powerproto.git synced 2025-12-11 23:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(*): update command error type

Browse source 
Signed-off-by: storyicon <yuanchao@bilibili.com>
This commit is contained in:
storyicon 2021-07-22 20:41:06 +08:00
parent a4d4c459ba
commit 1c73b92f0f
No known key found for this signature in database
GPG key ID: 245915D985F966CF
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/component/actionmanager/manager.go
View file

@ -72,7 +72,7 @@ func (m *BasicActionManager) ExecutePostShell(ctx context.Context, config config
if err != nil { if err != nil {
return &ErrPostShell{ return &ErrPostShell{
Path: config.Path(), Path: config.Path(),
ErrCommandExec: err, ErrCommandExec: err.(*command.ErrCommandExec),
} }
} }
return nil return nil

2
pkg/component/compilermanager/compiler.go
View file

@ -104,7 +104,7 @@ func (b *BasicCompiler) Compile(ctx context.Context, protoFilePath string) error
b.Logger, b.dir, b.protocPath, arguments, nil) b.Logger, b.dir, b.protocPath, arguments, nil)
if err != nil { if err != nil {
return &ErrCompile{ return &ErrCompile{
ErrCommandExec: err, ErrCommandExec: err.(*command.ErrCommandExec),
} }
} }
return nil return nil

8
pkg/component/pluginmanager/git.go
View file

@ -34,13 +34,13 @@ func GetGitLatestCommitId(ctx context.Context, log logger.Logger, repo string) (
}, nil) }, nil)
if err != nil { if err != nil {
return "", &ErrGitList{ return "", &ErrGitList{
ErrCommandExec: err, ErrCommandExec: err.(*command.ErrCommandExec),
} }
} }
f := strings.Fields(string(data)) f := strings.Fields(string(data))
if len(f) != 2 { if len(f) != 2 {
return "", &ErrGitList{ return "", &ErrGitList{
ErrCommandExec: err, ErrCommandExec: err.(*command.ErrCommandExec),
} }
} }
return f[0], nil return f[0], nil
@ -53,7 +53,7 @@ func ListGitCommitIds(ctx context.Context, log logger.Logger, repo string) ([]st
}, nil) }, nil)
if err != nil { if err != nil {
return nil, &ErrGitList{ return nil, &ErrGitList{
ErrCommandExec: err, ErrCommandExec: err.(*command.ErrCommandExec),
} }
} }
var commitIds []string var commitIds []string
@ -74,7 +74,7 @@ func ListGitTags(ctx context.Context, log logger.Logger, repo string) ([]string,
}, nil) }, nil)
if err != nil { if err != nil {
return nil, &ErrGitList{ return nil, &ErrGitList{
ErrCommandExec: err, ErrCommandExec: err.(*command.ErrCommandExec),
} }
} }
var tags []string var tags []string

4
pkg/component/pluginmanager/plugin.go
View file

@ -71,7 +71,7 @@ func InstallPluginUsingGo(ctx context.Context,
}, []string{"GOBIN=" + dir, "GO111MODULE=on"}) }, []string{"GOBIN=" + dir, "GO111MODULE=on"})
if err2 != nil { if err2 != nil {
return "", &ErrGoInstall{ return "", &ErrGoInstall{
ErrCommandExec: err2, ErrCommandExec: err2.(*command.ErrCommandExec),
} }
} }
return local, nil return local, nil
@ -114,7 +114,7 @@ func ListGoPackageVersions(ctx context.Context, log logger.Logger, path string)
}) })
if err != nil { if err != nil {
return nil, &ErrGoList{ return nil, &ErrGoList{
ErrCommandExec: err, ErrCommandExec: err.(*command.ErrCommandExec),
} }
} }
var module Module var module Module

2
pkg/util/command/command.go
View file

@ -29,7 +29,7 @@ import (
// Execute is used to execute commands, return stdout and execute errors // Execute is used to execute commands, return stdout and execute errors
func Execute(ctx context.Context, func Execute(ctx context.Context,
log logger.Logger, 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 := exec.CommandContext(ctx, name, arguments...)
cmd.Env = append(os.Environ(), env...) cmd.Env = append(os.Environ(), env...)
cmd.Dir = dir cmd.Dir = dir