docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move more "bad entry" error handling into manifest.AddEntry, wher eit really belongs

This commit is contained in:
Tianon Gravi 2017-01-24 13:02:23 -08:00
parent b3ac43e115
commit 8bde624aad
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifest/rfc2822.go
View File

@ -155,6 +155,19 @@ func (manifest Manifest2822) GetTag(tag string) *Manifest2822Entry {
}
func (manifest *Manifest2822) AddEntry(entry Manifest2822Entry) error {
if len(entry.Tags) < 1 {
return fmt.Errorf("missing Tags")
}
if entry.GitRepo == "" || entry.GitFetch == "" || entry.GitCommit == "" {
return fmt.Errorf("Tags %q missing one of GitRepo, GitFetch, or GitCommit", entry.TagsString())
}
if !GitFetchRegex.MatchString(entry.GitFetch) {
return fmt.Errorf(`Tags %q has invalid GitFetch (must be "refs/heads/..." or "refs/tags/..."): %q`, entry.TagsString(), entry.GitFetch)
}
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)
}
for _, tag := range entry.Tags {
if otherEntry := manifest.GetTag(tag); otherEntry != nil {
return fmt.Errorf("Tags %q includes duplicate tag %q (duplicated in %q)", entry.TagsString(), tag, otherEntry.TagsString())
@ -249,19 +262,6 @@ func Parse2822(readerIn io.Reader) (*Manifest2822, error) {
return nil, err
}
if len(entry.Tags) < 1 {
return nil, fmt.Errorf("missing Tags")
}
if entry.GitRepo == "" || entry.GitFetch == "" || entry.GitCommit == "" {
return nil, fmt.Errorf("Tags %q missing one of GitRepo, GitFetch, or GitCommit", entry.TagsString())
}
if !GitFetchRegex.MatchString(entry.GitFetch) {
return nil, fmt.Errorf(`Tags %q has invalid GitFetch (must be "refs/heads/..." or "refs/tags/..."): %q`, entry.TagsString(), entry.GitFetch)
}
if !GitCommitRegex.MatchString(entry.GitCommit) {
return nil, fmt.Errorf(`Tags %q has invalid GitCommit (must be a commit, not a tag or ref): %q`, entry.TagsString(), entry.GitCommit)
}
err = manifest.AddEntry(entry)
if err != nil {
return nil, err