Skip to content

Commit 3c71f34

Browse files
add more version checks
1 parent d80ca1f commit 3c71f34

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

modules/packages/arch/metadata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ const (
3939
var (
4040
reName = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+$`)
4141
reVer = regexp.MustCompile(`^[a-zA-Z0-9:_.+]+-+[0-9]+$`)
42-
reOptDep = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?[a-zA-Z0-9@._+-]+)?(:.*)?$`)
43-
rePkgVer = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?[a-zA-Z0-9@._+-]+)?$`)
42+
reOptDep = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?([0-9]+:)?[a-zA-Z0-9@._+-]+)?(:.*)?$`)
43+
rePkgVer = regexp.MustCompile(`^[a-zA-Z0-9@._+-]+([<>]?=?([0-9]+:)?[a-zA-Z0-9@._+-]+)?$`)
4444

4545
magicZSTD = []byte{0x28, 0xB5, 0x2F, 0xFD}
4646
magicXZ = []byte{0xFD, 0x37, 0x7A, 0x58, 0x5A}

modules/packages/arch/metadata_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,3 +445,9 @@ dummy6
445445
}
446446
require.Equal(t, pkgdesc, md.Desc())
447447
}
448+
449+
func TestOptVersionCheck(t *testing.T) {
450+
for _, s := range []string{"foo", "foo>=1.0.0", "foo<=1.0.0", "foo>=1:1.0.0: aaa"} {
451+
require.True(t, reOptDep.MatchString(s), s)
452+
}
453+
}

0 commit comments

Comments
 (0)