Skip to content

fix: bump embedded SPDX license list to v1.1-3.28.0 (closes #12) #161

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

Open
nissessenap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: bump embedded SPDX license list to v1.1-3.28.0 (closes #12) #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 27 additions & 19 deletions cmd/validate_cdx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,26 @@ const (
// Copied from CycloneDX spec. repo.
// See: https://github.com/CycloneDX/specification/tree/master/tools/src/test/resources/1.6
const (
TEST_CDX_SPEC_1_6_VALID_BOM = "test/cyclonedx/1.6/specification/valid-bom-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ANNOTATION = "test/cyclonedx/1.6/specification/valid-annotation-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ATTESTATION = "test/cyclonedx/1.6/specification/valid-attestation-1.6.json"
TEST_CDX_SPEC_1_6_VALID_COMPONENT_HASH = "test/cyclonedx/1.6/specification/valid-component-hashes-1.6.json"
TEST_CDX_SPEC_1_6_VALID_COMPONENT_IDS = "test/cyclonedx/1.6/specification/valid-component-identifiers-1.6.json"
TEST_CDX_SPEC_1_6_VALID_SWID = "test/cyclonedx/1.6/specification/valid-component-swid-1.6.json"
TEST_CDX_SPEC_1_6_VALID_SWID_FULL = "test/cyclonedx/1.6/specification/valid-component-swid-full-1.6.json"
TEST_CDX_SPEC_1_6_VALID_COMPONENT_TYPES = "test/cyclonedx/1.6/specification/valid-component-types-1.6.json"
TEST_CDX_SPEC_1_6_VALID_CRYPTO_IMPL = "test/cyclonedx/1.6/specification/valid-cryptography-implementation-1.6.json"
TEST_CDX_SPEC_1_6_VALID_EVIDENCE = "test/cyclonedx/1.6/specification/valid-evidence-1.6.json"
TEST_CDX_SPEC_1_6_VALID_LICENSE_EXP = "test/cyclonedx/1.6/specification/valid-license-expression-1.6.json"
TEST_CDX_SPEC_1_6_VALID_LICENSING = "test/cyclonedx/1.6/specification/valid-license-licensing-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ML = "test/cyclonedx/1.6/specification/valid-machine-learning-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ML_ENV = "test/cyclonedx/1.6/specification/valid-machine-learning-considerations-env-1.6.json"
TEST_CDX_SPEC_1_6_VALID_METADATA_TOOL = "test/cyclonedx/1.6/specification/valid-metadata-tool-1.6.json"
TEST_CDX_SPEC_1_6_VALID_SAASBOM = "test/cyclonedx/1.6/specification/valid-saasbom-1.6.json"
TEST_CDX_SPEC_1_6_VALID_VULNERABILITY = "test/cyclonedx/1.6/specification/valid-vulnerability-1.6.json"
TEST_CDX_SPEC_1_6_VALID_EXT_REF_IRI = "test/validation/cdx-1-6-validate-component-ext-ref-iri-reference.json"
TEST_CDX_SPEC_1_6_1_VALID_SPDX_LICENSE = "test/cyclonedx/1.6/specification/valid-license-spdx-licenses-1.6.1.json"
TEST_CDX_SPEC_1_6_VALID_BOM = "test/cyclonedx/1.6/specification/valid-bom-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ANNOTATION = "test/cyclonedx/1.6/specification/valid-annotation-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ATTESTATION = "test/cyclonedx/1.6/specification/valid-attestation-1.6.json"
TEST_CDX_SPEC_1_6_VALID_COMPONENT_HASH = "test/cyclonedx/1.6/specification/valid-component-hashes-1.6.json"
TEST_CDX_SPEC_1_6_VALID_COMPONENT_IDS = "test/cyclonedx/1.6/specification/valid-component-identifiers-1.6.json"
TEST_CDX_SPEC_1_6_VALID_SWID = "test/cyclonedx/1.6/specification/valid-component-swid-1.6.json"
TEST_CDX_SPEC_1_6_VALID_SWID_FULL = "test/cyclonedx/1.6/specification/valid-component-swid-full-1.6.json"
TEST_CDX_SPEC_1_6_VALID_COMPONENT_TYPES = "test/cyclonedx/1.6/specification/valid-component-types-1.6.json"
TEST_CDX_SPEC_1_6_VALID_CRYPTO_IMPL = "test/cyclonedx/1.6/specification/valid-cryptography-implementation-1.6.json"
TEST_CDX_SPEC_1_6_VALID_EVIDENCE = "test/cyclonedx/1.6/specification/valid-evidence-1.6.json"
TEST_CDX_SPEC_1_6_VALID_LICENSE_EXP = "test/cyclonedx/1.6/specification/valid-license-expression-1.6.json"
TEST_CDX_SPEC_1_6_VALID_LICENSING = "test/cyclonedx/1.6/specification/valid-license-licensing-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ML = "test/cyclonedx/1.6/specification/valid-machine-learning-1.6.json"
TEST_CDX_SPEC_1_6_VALID_ML_ENV = "test/cyclonedx/1.6/specification/valid-machine-learning-considerations-env-1.6.json"
TEST_CDX_SPEC_1_6_VALID_METADATA_TOOL = "test/cyclonedx/1.6/specification/valid-metadata-tool-1.6.json"
TEST_CDX_SPEC_1_6_VALID_SAASBOM = "test/cyclonedx/1.6/specification/valid-saasbom-1.6.json"
TEST_CDX_SPEC_1_6_VALID_VULNERABILITY = "test/cyclonedx/1.6/specification/valid-vulnerability-1.6.json"
TEST_CDX_SPEC_1_6_VALID_EXT_REF_IRI = "test/validation/cdx-1-6-validate-component-ext-ref-iri-reference.json"
TEST_CDX_SPEC_1_6_1_VALID_SPDX_LICENSE = "test/cyclonedx/1.6/specification/valid-license-spdx-licenses-1.6.1.json"
TEST_CDX_1_6_VALID_SPDX_LICENSE_ARTISTIC_DIST = "test/cyclonedx/1.6/cdx-1-6-valid-spdx-license-artistic-dist.json"
)

const (
Expand Down Expand Up @@ -230,6 +231,13 @@ func TestValidateCdx16SpdxLicense(t *testing.T) {
innerTestValidate(t, *vti)
}

// Ensure an SPDX license ID added after the previously-embedded list (SPDX 3.26.0)
// validates cleanly (e.g., "Artistic-dist", added in SPDX 3.27.0).
func TestValidateCdx16SpdxLicenseArtisticDist(t *testing.T) {
vti := NewValidateTestInfoMinimum(TEST_CDX_1_6_VALID_SPDX_LICENSE_ARTISTIC_DIST)
innerTestValidate(t, *vti)
}

// 1.7 Tests
func TestValidateCdx17CryptoCitation(t *testing.T) {
vti := NewValidateTestInfoMinimum(TEST_CDX_SPEC_1_7_VALID_CRYPTO_CITATION)
Expand Down
Loading