Also verify that Maintainers are valid in individual entry objects

tianon · tianon · commit 29ebe1cee370 · 2017-01-24T13:03:52.000-08:00
diff --git a/manifest/rfc2822.go b/manifest/rfc2822.go
@@ -167,6 +167,9 @@ func (manifest *Manifest2822) AddEntry(entry Manifest2822Entry) error {
 	if !GitCommitRegex.MatchString(entry.GitCommit) {
 		return fmt.Errorf(`Tags %q has invalid GitCommit (must be a commit, not a tag or ref): %q`, entry.TagsString(), entry.GitCommit)
 	}
+	if invalidMaintainers := entry.InvalidMaintainers(); len(invalidMaintainers) > 0 {
+		return fmt.Errorf("Tags %q has invalid Maintainers: %q (expected format %q)", strings.Join(invalidMaintainers, ", "), MaintainersFormat)
+	}
 
 	for _, tag := range entry.Tags {
 		if otherEntry := manifest.GetTag(tag); otherEntry != nil {

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,9 @@ func (manifest *Manifest2822) AddEntry(entry Manifest2822Entry) error {`
`167`	`167`	`if !GitCommitRegex.MatchString(entry.GitCommit) {`
`168`	`168`	return fmt.Errorf(`Tags %q has invalid GitCommit (must be a commit, not a tag or ref): %q`, entry.TagsString(), entry.GitCommit)
`169`	`169`	`}`
	`170`	`+ if invalidMaintainers := entry.InvalidMaintainers(); len(invalidMaintainers) > 0 {`
	`171`	`+ return fmt.Errorf("Tags %q has invalid Maintainers: %q (expected format %q)", strings.Join(invalidMaintainers, ", "), MaintainersFormat)`
	`172`	`+ }`
`170`	`173`
`171`	`174`	`for _, tag := range entry.Tags {`
`172`	`175`	`if otherEntry := manifest.GetTag(tag); otherEntry != nil {`