Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPDX allows ISO 8601 but docs require YYYY-MM-DDThh:mm:ssZ #40

Merged
merged 2 commits into from
Nov 19, 2024
Merged

SPDX allows ISO 8601 but docs require YYYY-MM-DDThh:mm:ssZ #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba1fee
SPDX allows ISO 8601 but docs require YYYY-MM-DDThh:mm:ssZ
mprpic Nov 13, 2024
5ca67e8
Merge branch 'main' into fix-timestamps
mprpic Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/sbom.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ The following snippet shows a minimal SBOM document:
"dataLicense": "CC0-1.0",// (2)!
"SPDXID": "SPDXRef-DOCUMENT",// (3)!
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",// (4)!
"creators": [
"Tool: example SPDX document only"
]
Expand All @@ -175,6 +175,8 @@ The following snippet shows a minimal SBOM document:
3. [`SPDXID`](https://spdx.github.io/spdx-spec/v2.3/document-creation-information/#63-spdx-identifier-field)
must be set to `SPDXRef-DOCUMENT`.

4. UTC timestamps must use the `YYYY-MM-DDThh:mm:ssZ` format.

A more detailed breakdown of some of the fields:

`creationInfo`
Expand Down
2 changes: 1 addition & 1 deletion ...ples/container_image/build/kernel-module-management-operator-container-1.1.2-25.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion ...ontainer_image/build/kernel-module-management-operator-container-1.1.2-25_amd64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion ...ontainer_image/build/kernel-module-management-operator-container-1.1.2-25_arm64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion ...tainer_image/build/kernel-module-management-operator-container-1.1.2-25_ppc64le.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/build/ubi9-micro-container-9.4-6.1716471860.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/build/ubi9-micro-container-9.4-6.1716471860_amd64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/build/ubi9-micro-container-9.4-6.1716471860_arm64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/build/ubi9-micro-container-9.4-6.1716471860_ppc64le.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/build/ubi9-micro-container-9.4-6.1716471860_s390x.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/release/from_catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def create_sbom(image_id, root_package, packages, rel_type, other_pkgs=None, oth
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only",
],
Expand Down
2 changes: 1 addition & 1 deletion ...es/container_image/release/kernel-module-management-operator-container-1.1.2-25.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion ...tainer_image/release/kernel-module-management-operator-container-1.1.2-25_amd64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion ...tainer_image/release/kernel-module-management-operator-container-1.1.2-25_arm64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion ...iner_image/release/kernel-module-management-operator-container-1.1.2-25_ppc64le.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/release/ubi9-micro-container-9.4-6.1716471860.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/release/ubi9-micro-container-9.4-6.1716471860_amd64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/release/ubi9-micro-container-9.4-6.1716471860_arm64.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion .../examples/container_image/release/ubi9-micro-container-9.4-6.1716471860_ppc64le.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/release/ubi9-micro-container-9.4-6.1716471860_s390x.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/product/rhel-9.2-eus.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down
4 changes: 2 additions & 2 deletions sbom/examples/rpm/build/from-koji.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ def handle_srpm(filename, name):
# Same as document.creationInfo.creators
"annotator": "Tool: example SPDX document only",
# Same as document.creationInfo.created
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": f"sigmd5: {sigmd5}",
}
],
Expand Down Expand Up @@ -420,7 +420,7 @@ def handle_srpm(filename, name):
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only",
],
Expand Down
20 changes: 10 additions & 10 deletions sbom/examples/rpm/build/openshift-pipelines-client-1.14.3-11352.el8.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
"created": "2006-08-14T02:34:56Z",
"creators": [
"Tool: example SPDX document only"
]
Expand Down Expand Up @@ -18705,7 +18705,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: ff3f705ac3e7d126414e2ddac0ca6698"
}
]
Expand Down Expand Up @@ -18826,7 +18826,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: 72cb02dc0199f79d373d0711fb9f34a1"
}
]
Expand Down Expand Up @@ -18856,7 +18856,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: af4f27125181cd98a50d0ab1e9a674f4"
}
]
Expand Down Expand Up @@ -18886,7 +18886,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: a256612eeae23411aed22f8648143ddb"
}
]
Expand Down Expand Up @@ -18916,7 +18916,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: b78748d047c9228691469e04046a5e8a"
}
]
Expand Down Expand Up @@ -18946,7 +18946,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: 12a4752a5db8103c95014b84bfc3c324"
}
]
Expand Down Expand Up @@ -18976,7 +18976,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: aecd200bcec7df622e6f5865535d17a7"
}
]
Expand Down Expand Up @@ -19006,7 +19006,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: 64c4de3e0b4df349d3ac5d801e2aac86"
}
]
Expand Down Expand Up @@ -19036,7 +19036,7 @@
{
"annotationType": "OTHER",
"annotator": "Tool: example SPDX document only",
"annotationDate": "2006-08-14T02:34:56+00:00",
"annotationDate": "2006-08-14T02:34:56Z",
"comment": "sigmd5: 20369982b93b4710c630a5032a887938"
}
]
Expand Down
Loading
Loading