Skip to content

Commit e161177

Browse files
committed
feat: add the Drupal ecosystem
Signed-off-by: Gareth Jones <[email protected]>
1 parent 5f5c477 commit e161177

File tree

6 files changed

+11
-2
lines changed

6 files changed

+11
-2
lines changed

bindings/go/osvschema/constants.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const (
1717
EcosystemCRAN Ecosystem = "CRAN"
1818
EcosystemCratesIO Ecosystem = "crates.io"
1919
EcosystemDebian Ecosystem = "Debian"
20+
EcosystemDrupal Ecosystem = "Drupal"
2021
EcosystemGHC Ecosystem = "GHC"
2122
EcosystemGitHubActions Ecosystem = "GitHub Actions"
2223
EcosystemGo Ecosystem = "Go"

docs/schema.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,7 @@ The defined ecosystems are:
790790
| `CRAN` | The R package ecosystem. The `name` is an R package name. |
791791
| `crates.io` | The crates.io ecosystem for Rust; the `name` field is a crate name. |
792792
| `Debian` | The Debian package ecosystem; the `name` is the name of the source package. The ecosystem string might optionally have a `:<RELEASE>` suffix to scope the package to a particular Debian release. `<RELEASE>` is a numeric version specified in the [Debian distro-info-data](https://debian.pages.debian.net/distro-info-data/debian.csv). For example, the ecosystem string "Debian:7" refers to the Debian 7 (wheezy) release. |
793+
| `Drupal` | The Drupal CMS ecosystem, for packages sourced from the Drupal composer repository. The ecosystem implies https://packages.drupal.org/8 as the source repository, unless a :7 suffix is present in which case the repository is https://packages.drupal.org/7 |
793794
| `GHC` | The Haskell compiler ecosystem. The `name` field is the name of a component of the GHC compiler ecosystem (e.g., compiler, GHCI, RTS). |
794795
| `GitHub Actions` | The GitHub Actions ecosystem; the `name` field is the action's repository name with owner e.g. `{owner}/{repo}`. |
795796
| `Go` | The Go ecosystem; the `name` field is a Go module path. |

ecosystems.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"CRAN": "The R package ecosystem. The `name` is an R package name.",
1212
"crates.io": "The crates.io ecosystem for Rust; the `name` field is a crate name.",
1313
"Debian": "The Debian package ecosystem; the `name` is the name of the source package. The ecosystem string might optionally have a `:<RELEASE>` suffix to scope the package to a particular Debian release. `<RELEASE>` is a numeric version specified in the [Debian distro-info-data](https://debian.pages.debian.net/distro-info-data/debian.csv). For example, the ecosystem string \"Debian:7\" refers to the Debian 7 (wheezy) release.",
14+
"Drupal": "The Drupal CMS ecosystem, for packages sourced from the Drupal composer repository. The ecosystem implies https://packages.drupal.org/8 as the source repository, unless a :7 suffix is present in which case the repository is https://packages.drupal.org/7",
1415
"GHC": "The Haskell compiler ecosystem. The `name` field is the name of a component of the GHC compiler ecosystem (e.g., compiler, GHCI, RTS).",
1516
"GitHub Actions": "The GitHub Actions ecosystem; the `name` field is the action's repository name with owner e.g. `{owner}/{repo}`.",
1617
"Go": "The Go ecosystem; the `name` field is a Go module path.",

tools/osv-linter/internal/checks/schema_generated.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@
341341
"CRAN",
342342
"crates.io",
343343
"Debian",
344+
"Drupal",
344345
"GHC",
345346
"GitHub Actions",
346347
"Go",
@@ -377,7 +378,7 @@
377378
"type": "string",
378379
"title": "Currently supported ecosystems",
379380
"description": "These ecosystems are also documented at https://ossf.github.io/osv-schema/#affectedpackage-field",
380-
"pattern": "^(AlmaLinux|Alpaquita|Alpine|Android|BellSoft Hardened Containers|Bioconductor|Bitnami|Chainguard|ConanCenter|CRAN|crates\\.io|Debian|GHC|GitHub Actions|Go|Hackage|Hex|Kubernetes|Linux|Mageia|Maven|MinimOS|npm|NuGet|openEuler|openSUSE|OSS-Fuzz|Packagist|Photon OS|Pub|PyPI|Red Hat|Rocky Linux|RubyGems|SUSE|SwiftURL|Ubuntu|Wolfi|GIT)(:.+)?$"
381+
"pattern": "^(AlmaLinux|Alpaquita|Alpine|Android|BellSoft Hardened Containers|Bioconductor|Bitnami|Chainguard|ConanCenter|CRAN|crates\\.io|Debian|Drupal|GHC|GitHub Actions|Go|Hackage|Hex|Kubernetes|Linux|Mageia|Maven|MinimOS|npm|NuGet|openEuler|openSUSE|OSS-Fuzz|Packagist|Photon OS|Pub|PyPI|Red Hat|Rocky Linux|RubyGems|SUSE|SwiftURL|Ubuntu|Wolfi|GIT)(:.+)?$"
381382
},
382383
"prefix": {
383384
"type": "string",

tools/osv-linter/internal/pkgchecker/ecosystems.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ func ExistsInEcosystem(pkg string, ecosystem string) bool {
5151
return existsInCrates(pkg)
5252
case "Debian":
5353
return true
54+
case "Drupal":
55+
return true
5456
case "GIT":
5557
return true
5658
case "GitHub Actions":
@@ -136,6 +138,8 @@ func VersionsExistInEcosystem(pkg string, versions []string, ecosystem string) e
136138
return nil
137139
case "Debian":
138140
return nil
141+
case "Drupal":
142+
return nil
139143
case "GIT":
140144
return nil
141145
case "GitHub Actions":

validation/schema.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@
341341
"CRAN",
342342
"crates.io",
343343
"Debian",
344+
"Drupal",
344345
"GHC",
345346
"GitHub Actions",
346347
"Go",
@@ -377,7 +378,7 @@
377378
"type": "string",
378379
"title": "Currently supported ecosystems",
379380
"description": "These ecosystems are also documented at https://ossf.github.io/osv-schema/#affectedpackage-field",
380-
"pattern": "^(AlmaLinux|Alpaquita|Alpine|Android|BellSoft Hardened Containers|Bioconductor|Bitnami|Chainguard|ConanCenter|CRAN|crates\\.io|Debian|GHC|GitHub Actions|Go|Hackage|Hex|Kubernetes|Linux|Mageia|Maven|MinimOS|npm|NuGet|openEuler|openSUSE|OSS-Fuzz|Packagist|Photon OS|Pub|PyPI|Red Hat|Rocky Linux|RubyGems|SUSE|SwiftURL|Ubuntu|Wolfi|GIT)(:.+)?$"
381+
"pattern": "^(AlmaLinux|Alpaquita|Alpine|Android|BellSoft Hardened Containers|Bioconductor|Bitnami|Chainguard|ConanCenter|CRAN|crates\\.io|Debian|Drupal|GHC|GitHub Actions|Go|Hackage|Hex|Kubernetes|Linux|Mageia|Maven|MinimOS|npm|NuGet|openEuler|openSUSE|OSS-Fuzz|Packagist|Photon OS|Pub|PyPI|Red Hat|Rocky Linux|RubyGems|SUSE|SwiftURL|Ubuntu|Wolfi|GIT)(:.+)?$"
381382
},
382383
"prefix": {
383384
"type": "string",

0 commit comments

Comments
 (0)