fix golint issues, else blocks (#457)
This commit is contained in:
@@ -7,21 +7,19 @@ import (
|
||||
"github.com/tal-tech/go-zero/tools/goctl/rpc/execx"
|
||||
)
|
||||
|
||||
var moduleCheckErr = errors.New("the work directory must be found in the go mod or the $GOPATH")
|
||||
var errModuleCheck = errors.New("the work directory must be found in the go mod or the $GOPATH")
|
||||
|
||||
type (
|
||||
ProjectContext struct {
|
||||
WorkDir string
|
||||
// Name is the root name of the project
|
||||
// eg: go-zero、greet
|
||||
Name string
|
||||
// Path identifies which module a project belongs to, which is module value if it's a go mod project,
|
||||
// or else it is the root name of the project, eg: github.com/tal-tech/go-zero、greet
|
||||
Path string
|
||||
// Dir is the path of the project, eg: /Users/keson/goland/go/go-zero、/Users/keson/go/src/greet
|
||||
Dir string
|
||||
}
|
||||
)
|
||||
type ProjectContext struct {
|
||||
WorkDir string
|
||||
// Name is the root name of the project
|
||||
// eg: go-zero、greet
|
||||
Name string
|
||||
// Path identifies which module a project belongs to, which is module value if it's a go mod project,
|
||||
// or else it is the root name of the project, eg: github.com/tal-tech/go-zero、greet
|
||||
Path string
|
||||
// Dir is the path of the project, eg: /Users/keson/goland/go/go-zero、/Users/keson/go/src/greet
|
||||
Dir string
|
||||
}
|
||||
|
||||
// Prepare checks the project which module belongs to,and returns the path and module.
|
||||
// workDir parameter is the directory of the source of generating code,
|
||||
|
||||
@@ -25,7 +25,7 @@ func projectFromGoPath(workDir string) (*ProjectContext, error) {
|
||||
goPath := buildContext.GOPATH
|
||||
goSrc := filepath.Join(goPath, "src")
|
||||
if !util.FileExists(goSrc) {
|
||||
return nil, moduleCheckErr
|
||||
return nil, errModuleCheck
|
||||
}
|
||||
|
||||
wd, err := filepath.Abs(workDir)
|
||||
@@ -34,7 +34,7 @@ func projectFromGoPath(workDir string) (*ProjectContext, error) {
|
||||
}
|
||||
|
||||
if !strings.HasPrefix(wd, goSrc) {
|
||||
return nil, moduleCheckErr
|
||||
return nil, errModuleCheck
|
||||
}
|
||||
|
||||
projectName := strings.TrimPrefix(wd, goSrc+string(filepath.Separator))
|
||||
|
||||
Reference in New Issue
Block a user