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

Fix PURL test failures, migrate cyclonedx-bom to purl crate #746

Merged
merged 7 commits into from
Jul 17, 2024

Conversation

Shnatsel
Copy link
Contributor

@Shnatsel Shnatsel commented Jul 16, 2024

cargo cyclonedx

Drop our custom percent encoding machinery now that the purl crate implements this for us. This was one hell of a rabbit hole, and it is a testament to the quality of the purl crate that they are actually handling this nonsense correctly now.

Fixes #745

cyclonedx-bom

Migrate from the very incomplete packageurl to the purl crate already used by cargo cyclonedx. We used to have two different PURL crates in the tree, this brings the number back to one. Also provide a more informative error message on validation errors.

Fixes #636

This is all still semver-compatible, because the packageurl crate was never actually exposed to the outside world. But this is a PR against main because I cannot be bothered to backport this.

@Shnatsel Shnatsel requested a review from a team as a code owner July 16, 2024 09:18
…onstructor

Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
…just use the `purl` crate.

Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
… for us

Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@lfrancke
Copy link
Contributor

Thank you for this. It looks good to me.

Should phylum-dev/purl#11 be closed if it's handled now?
They don't seem to have a changelog or release notes but I do see upstream commits on this.

@Shnatsel
Copy link
Contributor Author

Good point, I closed the upstream issue.

@Shnatsel Shnatsel merged commit 00c6f77 into CycloneDX:main Jul 17, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cargo cyclonedx tests fail after upgrading to purl 0.1.3 Switch from packageurl to purl crate
2 participants