Skip to content

Commit

Permalink
feat: Add R cataloger (#1790)
Browse files Browse the repository at this point in the history
Add a cataloger that detects installed R packages by looking for DESCRIPTION
files. The base R package is now picked up in coverageImage tests in
test/cli/packages_cmd_test.go, so increment expected package counts for the
tests that use that image.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
  • Loading branch information
willmurphyscode authored May 10, 2023
1 parent 0580328 commit da36246
Show file tree
Hide file tree
Showing 31 changed files with 2,476 additions and 5 deletions.
2 changes: 1 addition & 1 deletion internal/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ const (

// JSONSchemaVersion is the current schema version output by the JSON encoder
// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
JSONSchemaVersion = "7.1.5"
JSONSchemaVersion = "7.1.6"
)
4 changes: 4 additions & 0 deletions schema/json/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ can be extended to include specific package metadata struct shapes in the future
// not matter as long as it is exported.

// TODO: this should be generated from reflection of whats in the pkg package
// Should be created during generation below; use reflection's ability to
// create types at runtime.
// should be same name as struct minus metadata
type artifactMetadataContainer struct {
Alpm pkg.AlpmMetadata
Apk pkg.ApkMetadata
Expand Down Expand Up @@ -56,6 +59,7 @@ type artifactMetadataContainer struct {
PythonPackage pkg.PythonPackageMetadata
PythonPipfilelock pkg.PythonPipfileLockMetadata
PythonRequirements pkg.PythonRequirementsMetadata
RDescriptionFile pkg.RDescriptionFileMetadata
Rebar pkg.RebarLockMetadata
Rpm pkg.RpmMetadata
RustCargo pkg.CargoPackageMetadata
Expand Down
Loading

0 comments on commit da36246

Please # to comment.