jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x/build/blob: more tests for ParseRef

Browse Source 
Also, remove superfluous checks in Valid for invalid parts that are
present, which is impossible to have since Parts ensures all parts are
valid, and ParseRef ensures the ref is valid.
This commit is contained in:
Blake Mizerany 2024-04-04 11:36:10 -07:00
parent d85fbd0e99
commit 45ca3c80e8
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
x/build/blob/ref.go
View File

@ -230,7 +230,8 @@ func Parts(s string) iter.Seq2[PartKind, string] {
yieldValid := func(kind PartKind, part string) bool { yieldValid := func(kind PartKind, part string) bool {
if !isValidPart(part) { if !isValidPart(part) {
return yield(Invalid, "") yield(Invalid, "")
return false
} }
return yield(kind, part) return yield(kind, part)
} }
@ -303,26 +304,12 @@ func Complete(s string) bool {
return ParseRef(s).Complete() return ParseRef(s).Complete()
} }
// Valid returns true if the ref has a valid name. To know if a ref is
// "complete", use Complete.
func (r Ref) Valid() bool { func (r Ref) Valid() bool {
// Name is required // Parts ensures we only have valid parts, so no need to validate
if !isValidPart(r.name) { // them here, only check if we have a name or not.
return false return r.name != ""
}
// Optional parts must be valid if present
if r.domain != "" && !isValidPart(r.domain) {
return false
}
if r.namespace != "" && !isValidPart(r.namespace) {
return false
}
if r.tag != "" && !isValidPart(r.tag) {
return false
}
if r.build != "" && !isValidPart(r.build) {
return false
}
return true
} }
// isValidPart returns true if given part is valid ascii [a-zA-Z0-9_\.-] // isValidPart returns true if given part is valid ascii [a-zA-Z0-9_\.-]

12
x/build/blob/ref_test.go
View File

@ -34,6 +34,10 @@ var testRefs = map[string]Ref{
"+0/00000": {}, "+0/00000": {},
"0+.\xf2\x80\xf6\x9d00000\xe5\x99\xe6\xd900\xd90\xa60\x91\xdc0\xff\xbf\x99\xe800\xb9\xdc\xd6\xc300\x970\xfb\xfd0\xe0\x8a\xe1\xad\xd40\x9700\xa80\x980\xdd0000\xb00\x91000\xfe0\x89\x9b\x90\x93\x9f0\xe60\xf7\x84\xb0\x87\xa5\xff0\xa000\x9a\x85\xf6\x85\xfe\xa9\xf9\xe9\xde00\xf4\xe0\x8f\x81\xad\xde00\xd700\xaa\xe000000\xb1\xee0\x91": {}, "0+.\xf2\x80\xf6\x9d00000\xe5\x99\xe6\xd900\xd90\xa60\x91\xdc0\xff\xbf\x99\xe800\xb9\xdc\xd6\xc300\x970\xfb\xfd0\xe0\x8a\xe1\xad\xd40\x9700\xa80\x980\xdd0000\xb00\x91000\xfe0\x89\x9b\x90\x93\x9f0\xe60\xf7\x84\xb0\x87\xa5\xff0\xa000\x9a\x85\xf6\x85\xfe\xa9\xf9\xe9\xde00\xf4\xe0\x8f\x81\xad\xde00\xd700\xaa\xe000000\xb1\xee0\x91": {},
"0//0": {}, "0//0": {},
"m+^^^": {},
"file:///etc/passwd": {},
"file:///etc/passwd:latest": {},
"file:///etc/passwd:latest+u": {},
} }
func TestRefParts(t *testing.T) { func TestRefParts(t *testing.T) {
@ -44,8 +48,13 @@ func TestRefParts(t *testing.T) {
} }
} }
func TestParseRef(t *testing.T) { func TestParseRefWithAndWithoutPrefixes(t *testing.T) {
for s, want := range testRefs { for s, want := range testRefs {
for _, prefix := range []string{"", "https://", "http://"} {
// We should get the same results with or without the
// http(s) prefixes
s := prefix + s
t.Run(s, func(t *testing.T) { t.Run(s, func(t *testing.T) {
got := ParseRef(s) got := ParseRef(s)
if got != want { if got != want {
@ -59,6 +68,7 @@ func TestParseRef(t *testing.T) {
}) })
} }
} }
}
func TestRefFull(t *testing.T) { func TestRefFull(t *testing.T) {
const empty = "!(MISSING DOMAIN)/!(MISSING NAMESPACE)/!(MISSING NAME):!(MISSING TAG)+!(MISSING BUILD)" const empty = "!(MISSING DOMAIN)/!(MISSING NAMESPACE)/!(MISSING NAME):!(MISSING TAG)+!(MISSING BUILD)"