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.

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

Add CycloneDX v1.5 JSON schema and update resource config #41

Merged
merged 3 commits into from
Jun 27, 2023

Conversation

mrutkows
Copy link
Contributor

The v1.5 was announced today; add support for it as a built-in schema and the default config.json file.

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>
@mrutkows mrutkows self-assigned this Jun 26, 2023
@mrutkows mrutkows added the enhancement New feature or request label Jun 26, 2023
Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>
Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>
@mrutkows mrutkows merged commit aafbf3c into main Jun 27, 2023
@mrutkows mrutkows deleted the v1.5-schema branch June 27, 2023 13:34
ajistrying pushed a commit to ajistrying/sbom-utility that referenced this pull request Jun 29, 2023
* Add CycloneDX v1.5 JSON schema and update resource config

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add minimal tests for 1.5 schema

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add minimal tests for 1.5 schema

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

---------

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>
Signed-off-by: ajistrying <ajistrying@gmail.com>
mrutkows added a commit that referenced this pull request Jun 29, 2023
* replace deprecated ioutil functions

Signed-off-by: ajistrying <ajistrying@gmail.com>

* remove comments

Signed-off-by: ajistrying <ajistrying@gmail.com>

* G304 suppress warnings
Signed-off-by: ajistrying <ajistrying@gmail.com>

Signed-off-by: ajistrying <ajistrying@gmail.com>

* Support schema error results to be ouptut in JSON format including custom format flags (#40)

* Create a framework for validation error special case handling

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Create a framework for validation error special case handling

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Adjust JSON output formatting as an array

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Use an ordered map to control JSON output marshaling order

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Use an ordered map to control JSON output marshaling order

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Use an ordered map to control JSON output marshaling order

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Use an ordered map to control JSON output marshaling order

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Separate format related functions into their own file

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Separate format related functions into their own file

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Format value for unique item error

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Consolidate validation flags and use on top-level API call

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Adjust JSON error result output prefix and indent

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add validation test case for bad iri-format

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add validation test case for bad iri-format

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Consolidate persistent command flags into a struct

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* represent array type, index and item as a map in json error results

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Support flag  true|false on validate command

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Fix even more Sonatype errors that seem to chnage every time I touch an old file

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Adjust help for validate given new formats/flags

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Update README to show validate JSON output and new flags

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* buffer JSON output for unit tests

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Update the text format logic to mirror new json formatting

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Update the text format logic to mirror new json formatting

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Update the text format logic to mirror new json formatting

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Streamline json and text formatting paths

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Adjust colorized indent to match normal indent

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add additional test assertions to validate # errs and error conext

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Assure forced schema file tests reset to default schema

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

---------

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add CycloneDX v1.5 JSON schema and update resource config (#41)

* Add CycloneDX v1.5 JSON schema and update resource config

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add minimal tests for 1.5 schema

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Add minimal tests for 1.5 schema

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

---------

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>
Signed-off-by: ajistrying <ajistrying@gmail.com>

* Remove invalid output file warning (#42)

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>
Signed-off-by: ajistrying <ajistrying@gmail.com>

* Put back inputFilename as parm. in os.ReadFile() call

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Attempt to ignore underlying golang sonatype error

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Attempt to ignore underlying golang sonatype error

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

* Attempt to ignore underlying golang sonatype error

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

---------

Signed-off-by: ajistrying <ajistrying@gmail.com>
Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>
Co-authored-by: Matt Rutkowski <mrutkows@us.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant