Skip to content

Commit 331f04e

Browse files
committed
Correct package index schema's regex for size property
The `packages[].platforms[].size` and `packages[].tools[].systems[].size` properties are string representations of integers, and thus must consist solely of the characters 0-9. The previous regular expression for a valid size value only required that a number be found somewhere in the string.
1 parent 288fe38 commit 331f04e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

etc/schemas/arduino-package-index-definitions-schema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@
770770
"base": {
771771
"object": {
772772
"type": "string",
773-
"pattern": "[0-9]+"
773+
"pattern": "^[0-9]+$"
774774
}
775775
},
776776
"permissive": {

internal/project/packageindex/packageindexschemas_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,9 @@ func TestPattern(t *testing.T) {
412412
{"/packages/0/platforms/0/size", "42", compliancelevel.Specification, assert.False},
413413
{"/packages/0/platforms/0/size", "42", compliancelevel.Strict, assert.False},
414414

415-
{"/packages/0/platforms/0/size", "foo", compliancelevel.Permissive, assert.True},
416-
{"/packages/0/platforms/0/size", "foo", compliancelevel.Specification, assert.True},
417-
{"/packages/0/platforms/0/size", "foo", compliancelevel.Strict, assert.True},
415+
{"/packages/0/platforms/0/size", "42B", compliancelevel.Permissive, assert.True},
416+
{"/packages/0/platforms/0/size", "42B", compliancelevel.Specification, assert.True},
417+
{"/packages/0/platforms/0/size", "42B", compliancelevel.Strict, assert.True},
418418

419419
{"/packages/0/tools/0/systems/0/archiveFileName", "foo.tar.bz2", compliancelevel.Permissive, assert.False},
420420
{"/packages/0/tools/0/systems/0/archiveFileName", "foo.tar.bz2", compliancelevel.Specification, assert.False},

internal/rule/schema/schemadata/bindata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3306,7 +3306,7 @@ var _arduinoPackageIndexDefinitionsSchemaJson = []byte(`{
33063306
"base": {
33073307
"object": {
33083308
"type": "string",
3309-
"pattern": "[0-9]+"
3309+
"pattern": "^[0-9]+$"
33103310
}
33113311
},
33123312
"permissive": {

0 commit comments

Comments
 (0)