test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-30 10:48:15 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[ADD] add check error advice action type

Browse Source
This commit is contained in:
goodrain 2018-02-23 17:21:14 +08:00
parent 8767091879
commit 64c8208eba
2 changed files with 88 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/builder/parser/parser.go
View File

@ -22,18 +22,19 @@ import (
"fmt"
"strconv"
"strings"
"github.com/goodrain/rainbond/pkg/builder/parser/code"
)
//Port 端口
type Port struct {
ContainerPort int `json:"container_port"`
ContainerPort int `json:"container_port"`
Protocol string `json:"protocol"`
}
//Volume 存储地址
type Volume struct {
VolumePath string `json:"volume_path"`
VolumePath string `json:"volume_path"`
VolumeType string `json:"volume_type"`
}
@ -46,8 +47,8 @@ type Env struct {
//ParseError 错误信息
type ParseError struct {
ErrorType ParseErrorType `json:"error_type"`
ErrorInfo string `json:"error_info"`
SolveAdvice string `json:"solve_advice"`
ErrorInfo string `json:"error_info"`
SolveAdvice string `json:"solve_advice"`
}
//ParseErrorList 错误列表
@ -81,6 +82,11 @@ func ErrorAndSolve(errtype ParseErrorType, errorInfo, SolveAdvice string) ParseE
return parseError
}
//SolveAdvice 构建a标签建议
func SolveAdvice(actionType, message string) string {
return fmt.Sprintf("<a action_type=\"%s\">%s</a>", actionType, message)
}
func (p ParseError) Error() string {
return fmt.Sprintf("Type:%s Message:%s", p.ErrorType, p.ErrorInfo)
}
@ -124,25 +130,25 @@ type Lang string
//ServiceInfo 智能获取的应用信息
type ServiceInfo struct {
Ports []Port `json:"ports"`
Envs []Env `json:"envs"`
Volumes []Volume `json:"volumes"`
Image Image `json:"image"`
Args []string `json:"args"`
DependServices []string `json:"depends,omitempty"`
ServiceDeployType string `json:"deploy_type,omitempty"`
Branchs []string `json:"branchs,omitempty"`
Memory int `json:"memory"`
Lang code.Lang `json:"language"`
Runtime bool `json:"runtime"`
Library bool `json:"library"`
Procfile bool `json:"procfile"`
Ports []Port `json:"ports"`
Envs []Env `json:"envs"`
Volumes []Volume `json:"volumes"`
Image Image `json:"image"`
Args []string `json:"args"`
DependServices []string `json:"depends,omitempty"`
ServiceDeployType string `json:"deploy_type,omitempty"`
Branchs []string `json:"branchs,omitempty"`
Memory int `json:"memory"`
Lang code.Lang `json:"language"`
Runtime bool `json:"runtime"`
Library bool `json:"library"`
Procfile bool `json:"procfile"`
}
//GetServiceInfo GetServiceInfo
type GetServiceInfo struct {
UUID string `json:"uuid"`
Source string `json:"source"`
UUID string `json:"uuid"`
Source string `json:"source"`
}
//GetPortProtocol 获取端口协议

133
pkg/builder/parser/source_code.go
View File

@ -32,12 +32,10 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/transport"
"github.com/Sirupsen/logrus"
//"github.com/docker/docker/client"
"github.com/docker/engine-api/client"
)
//SourceCodeParse docker run 命令解析或直接镜像名解析
type SourceCodeParse struct {
ports map[int]*Port
@ -52,9 +50,9 @@ type SourceCodeParse struct {
dockerclient *client.Client
logger event.Logger
Lang code.Lang
Runtime bool `json:"runtime"`
Library bool `json:"library"`
Procfile bool `json:"procfile"`
Runtime bool `json:"runtime"`
Library bool `json:"library"`
Procfile bool `json:"procfile"`
}
//CreateSourceCodeParse create parser
@ -98,7 +96,7 @@ func (d *SourceCodeParse) Parse() ParseErrorList {
ep, err := transport.NewEndpoint(csi.RepositoryURL)
if err != nil {
d.logger.Error("Git项目仓库地址格式错误", map[string]string{"step": "parse"})
d.errappend(ErrorAndSolve(FatalError, "Git项目仓库地址格式错误", "请确认并修改仓库地址"))
d.errappend(ErrorAndSolve(FatalError, "Git项目仓库地址格式错误", SolveAdvice("modify_url", "请确认并修改仓库地址")))
return d.errors
}
//获取代码
@ -112,13 +110,9 @@ func (d *SourceCodeParse) Parse() ParseErrorList {
if err != nil {
if err == transport.ErrAuthenticationRequired {
if ep.Protocol == "ssh" {
solve := `
请将以下SSH Key配置到仓库安全设置中：
` + sources.GetPublicKey() + `
`
d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", solve))
d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", SolveAdvice("get_publickey", "请获取授权Key配置到你的仓库项目中")))
} else {
d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", "请提供正确的账号密码"))
d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", SolveAdvice("modify_userpass", "请提供正确的账号密码")))
}
return d.errors
}
@ -153,54 +147,54 @@ func (d *SourceCodeParse) Parse() ParseErrorList {
return gitFunc()
}
case "svn":
default:
default:
//按照git处理处理
if gitFunc() != nil {
return gitFunc()
}
}
//验证仓库地址
// ep, err := transport.NewEndpoint(csi.RepositoryURL)
// if err != nil {
// d.logger.Error("Git项目仓库地址格式错误", map[string]string{"step": "parse"})
// d.errappend(ErrorAndSolve(FatalError, "Git项目仓库地址格式错误", "请确认并修改仓库地址"))
// return d.errors
// }
// //获取代码
// rs, err := sources.GitClone(csi, cacheDir, d.logger, 5)
// if err != nil {
// if err == transport.ErrAuthenticationRequired {
// if ep.Protocol == "ssh" {
// solve := `
// 请将以下SSH Key配置到仓库安全设置中：
// ` + sources.GetPublicKey() + `
// `
// d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", solve))
// } else {
// d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", "请提供正确的账号密码"))
// }
// return d.errors
// }
// if err == plumbing.ErrReferenceNotFound {
// solve := "请到代码仓库查看正确的分支情况"
// d.errappend(ErrorAndSolve(FatalError, fmt.Sprintf("Git项目仓库指定分支 %s 不存在", csi.Branch), solve))
// return d.errors
// }
// d.errappend(Errorf(FatalError, err.Error()))
// return d.errors
// }
// //获取分支
// branch, err := rs.Branches()
// if err == nil {
// branch.ForEach(func(re *plumbing.Reference) error {
// name := re.Name()
// if name.IsBranch() {
// d.branchs = append(d.branchs, name.Short())
// }
// return nil
// })
// } else {
// d.branchs = append(d.branchs, csi.Branch)
// }
// ep, err := transport.NewEndpoint(csi.RepositoryURL)
// if err != nil {
// d.logger.Error("Git项目仓库地址格式错误", map[string]string{"step": "parse"})
// d.errappend(ErrorAndSolve(FatalError, "Git项目仓库地址格式错误", "请确认并修改仓库地址"))
// return d.errors
// }
// //获取代码
// rs, err := sources.GitClone(csi, cacheDir, d.logger, 5)
// if err != nil {
// if err == transport.ErrAuthenticationRequired {
// if ep.Protocol == "ssh" {
// solve := `
// 请将以下SSH Key配置到仓库安全设置中：
// ` + sources.GetPublicKey() + `
// `
// d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", solve))
// } else {
// d.errappend(ErrorAndSolve(FatalError, "Git项目仓库需要安全验证", "请提供正确的账号密码"))
// }
// return d.errors
// }
// if err == plumbing.ErrReferenceNotFound {
// solve := "请到代码仓库查看正确的分支情况"
// d.errappend(ErrorAndSolve(FatalError, fmt.Sprintf("Git项目仓库指定分支 %s 不存在", csi.Branch), solve))
// return d.errors
// }
// d.errappend(Errorf(FatalError, err.Error()))
// return d.errors
// }
// //获取分支
// branch, err := rs.Branches()
// if err == nil {
// branch.ForEach(func(re *plumbing.Reference) error {
// name := re.Name()
// if name.IsBranch() {
// d.branchs = append(d.branchs, name.Short())
// }
// return nil
// })
// } else {
// d.branchs = append(d.branchs, csi.Branch)
// }
}
//读取云帮配置文件
@ -234,12 +228,11 @@ func (d *SourceCodeParse) Parse() ParseErrorList {
}
}
d.Lang = lang
logrus.Debugf("d. lang result is %v", d.Lang)
if lang == code.NO {
d.errappend(ErrorAndSolve(FatalError, "代码无法失败语言类型", "请参考文档查看平台语言支持规范"))
d.errappend(ErrorAndSolve(FatalError, "代码无法识别语言类型", "请参考文档查看平台语言支持规范"))
return d.errors
}
//判断代码规范
//判断代码<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>范
spec := code.CheckCodeSpecification(buildPath, lang)
if spec.Advice != nil {
for k, v := range spec.Advice {
@ -325,24 +318,24 @@ func (d *SourceCodeParse) GetLang() code.Lang {
}
//GetRuntime GetRuntime
func (d *SourceCodeParse)GetRuntime() bool {
func (d *SourceCodeParse) GetRuntime() bool {
return d.Runtime
}
//GetServiceInfo 获取service info
func (d *SourceCodeParse) GetServiceInfo() []ServiceInfo {
serviceInfo := ServiceInfo{
Ports: d.GetPorts(),
Envs: d.GetEnvs(),
Volumes: d.GetVolumes(),
Image: d.GetImage(),
Args: d.GetArgs(),
Branchs: d.GetBranchs(),
Memory: d.memory,
Lang: d.GetLang(),
Library: true,
Ports: d.GetPorts(),
Envs: d.GetEnvs(),
Volumes: d.GetVolumes(),
Image: d.GetImage(),
Args: d.GetArgs(),
Branchs: d.GetBranchs(),
Memory: d.memory,
Lang: d.GetLang(),
Library: true,
Procfile: true,
Runtime: true,
Runtime: true,
}
return []ServiceInfo{serviceInfo}
}