提交 0ba79cb7 编写于 作者: T TommyLike

Support ignore projects when performing validate

上级 870a1582
......@@ -35,11 +35,13 @@ type Sig struct {
type DirScanner struct {
DirName string
ignoreProjects []string
}
func NewDirScanner(dir string) *DirScanner {
func NewDirScanner(dir string, projects []string) *DirScanner {
return &DirScanner{
DirName: dir,
ignoreProjects: projects,
}
}
......@@ -97,7 +99,11 @@ func (ds *DirScanner) ScanSigYaml(filename string, projects chan<- string) error
for _,s := range sig.Sigs {
for _, repo := range s.Repositories {
projects <- repo
if Find(ds.ignoreProjects, repo) {
fmt.Printf("[Warning] Project %s will be ignored due to --ignoreproject options %v", repo, ds.ignoreProjects)
} else {
projects <- repo
}
}
}
return nil
......
......@@ -74,7 +74,8 @@ func CheckOwner() error {
wg.Add(1)
go giteeHandler.ValidateUser(&wg, stopCh, userChannel, &failedUser)
scanner := NewDirScanner(checkOwnerFlags.DirName)
var emptyProjects []string
scanner := NewDirScanner(checkOwnerFlags.DirName, emptyProjects)
err := scanner.ScanAllOwners(checkOwnerFlags.FileName, userChannel)
wg.Wait()
if err != nil {
......
......@@ -27,6 +27,7 @@ import (
type SigRepoCheck struct {
FileName string
GiteeToken string
IgnoreProjects string
}
......@@ -36,6 +37,7 @@ var sigRepoCheck = &SigRepoCheck{}
func SigInitRunFlags(cmd *cobra.Command) {
cmd.Flags().StringVarP(&sigRepoCheck.FileName, "filename", "f", "", "the file name of sig file")
cmd.Flags().StringVarP(&sigRepoCheck.GiteeToken, "giteetoken", "g", "", "the gitee token")
cmd.Flags().StringVarP(&sigRepoCheck.IgnoreProjects, "ignoreprojects", "i", "", "the projects should be ignored, splitted via ','")
}
func buildSigCommand() *cobra.Command {
......@@ -99,7 +101,8 @@ func CheckSigRepo() error {
go giteeHandler.CollectRepos(&wg,100, size, i, 5 , "open_euler", resultChannel, )
}
scanner := NewDirScanner("")
projects := strings.Split(checkOwnerFlags.FileName, ",")
scanner := NewDirScanner(checkOwnerFlags.DirName, projects)
err := scanner.ScanSigYaml(sigRepoCheck.FileName, sigChannel)
//Wait all gitee query threads to be finished
wg.Wait()
......
文件已删除
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册