Skip to content

Commit 6651ddc

Browse files
author
Jacob Woliver
committed
chore: add v5 manifest schema for bioc
1 parent cfab93c commit 6651ddc

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

pkg/metadata/schemas.go

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var validSchemas = []int{
1313
var validBiocSchemas = []int{
1414
3,
1515
4,
16+
5,
1617
}
1718

1819
func IsValidSchema(v version.ManifestVersion) bool {

pkg/metadata/schemas_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@ func (s *SchemaSuite) TestIsValidBiocSchema() {
5858
{"v2", false},
5959
{"v3", true},
6060
{"v4", true},
61+
{"v5", true},
6162
{"v13", false},
6263
{"1", false},
6364
{"2", false},
6465
{"3", true},
6566
{"4", true},
67+
{"5", true},
6668
{"13", false},
6769
{"v1/2", false},
6870
{"v2/2", false},
@@ -73,6 +75,7 @@ func (s *SchemaSuite) TestIsValidBiocSchema() {
7375
{"v2/2/4", false},
7476
{"v3/2/4", true},
7577
{"v4/2/4", true},
78+
{"v5/2/4", true},
7679
{"v13/2/4", false},
7780
} {
7881
v, err := version.ParseNewManifestVersion(test.version)

pkg/utils/filepath_getter.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"path/filepath"
77

88
"github.com/rstudio/package-manager-rpackagerewriter/pkg/archive"
9-
"github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
10-
"github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
9+
v1 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
10+
v2 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
1111
)
1212

1313
type FilePathGetter interface {
@@ -42,7 +42,7 @@ func (f *defaultFilePathGetterFactory) GetFilePathGetter(schemaVersion int) (Fil
4242

4343
func (f *biocFilePathGetterFactory) GetFilePathGetter(schemaVersion int) (FilePathGetter, error) {
4444
switch schemaVersion {
45-
case 3, 4:
45+
case 3, 4, 5:
4646
// Bioc was originally created at parity with CRAN at version 3. Version 4 of bioc was a simple copy
4747
// of version 3 that was used to force a fresh sync so that a fix in the sync code would be picked
4848
// up. For both of these reasons, the Bioc transformer here is the same as the CRAN V2V3FilePathGetter.

pkg/utils/filepath_getter_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"github.com/stretchr/testify/suite"
88

99
"github.com/rstudio/package-manager-rpackagerewriter/pkg/archive"
10-
"github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
11-
"github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
10+
v1 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v1"
11+
v2 "github.com/rstudio/package-manager-rpackagerewriter/pkg/utils/v2"
1212
)
1313

1414
func TestFilePathGetterSuite(t *testing.T) {
@@ -65,6 +65,10 @@ func (s *FilePathGetterSuite) TestGetBioc() {
6565
s.Require().Nil(err)
6666
s.Require().IsType(&v2.V2V3FilePathGetter{}, fpg)
6767

68+
fpg, err = fpf.GetFilePathGetter(5)
69+
s.Require().Nil(err)
70+
s.Require().IsType(&v2.V2V3FilePathGetter{}, fpg)
71+
6872
_, err = fpf.GetFilePathGetter(13)
6973
s.Require().ErrorContains(err, "Invalid version 13 for GetFilePathGetter")
7074
}

0 commit comments

Comments
 (0)