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

Jump to bottom

Allow selecting the target with --target=<TRIPLE> or --all-targets #513

Merged
merged 22 commits into from
Oct 30, 2023
Merged

Allow selecting the target with --target=<TRIPLE> or --all-targets #513

merged 22 commits into from
Oct 30, 2023

Conversation

Shnatsel
Copy link
Contributor

@Shnatsel Shnatsel commented Oct 27, 2023 •
edited
Loading

Depends on #512, please review that first.

cargo cyclonedx now defaults to the host platform, producing a SBOM for the binary you would get with cargo build --release.

"Cross-compilation" of the SBOM is natively supported with --target=<TRIPLE>, same flag as for cargo build.

The old behavior that includes packages from all targets, even the packages only used on that one funky unikernel, is still available via --all-targets.

Fixes #500

@Shnatsel Shnatsel requested a review from a team as a code owner October 27, 2023 23:39
@Shnatsel
Add command-line arguments for feature selection. Not wired up to any…
1fd6482 
…thing yet.

Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add a struct to hold feature configuration
d1b6150 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add the Features to the SbomConfig struct
ecbbf02 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Parse feature selection from CLI arguments
4469a13 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Properly support both comma- and space-separated features
2b5a007 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add tests for Cargo feature parsing
4759470 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Adjust feature parsing not to result in empty features, add test
8bb78b1 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Wire up feature configuration to cargo-medatada calls; should be full…
175e127 
…y working now

Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Update comment
61d9fa8 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add CLI flags for configuring the target
ffc7fd6 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Rename --all-platforms to --all-targets
d3e512b 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add infrastructure for detecting the host platform
463d5e5 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add a struct to hold target config
f48e391 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add target to the config struct
8bf3ba3 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add a doc comment on SbomConfig::merge
5d4f1c7 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Parse target from the CLI args into config
14abde0 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Turn target selection into an enum since the two options are mutually…
f190139 
… exclusive

Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Wire up the target config to cargo-metadata
fe767b2 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Add a comment explaining the host platform detection
45daac1 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@lfrancke lfrancke mentioned this pull request Oct 28, 2023
Closed
lfrancke
lfrancke requested changes Oct 29, 2023
View reviewed changes
Copy link
Contributor

@lfrancke lfrancke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as before: README update missing, otherwise looking good.

I tried it (together with the dependency tree PR as well) and it looks good!

cargo-cyclonedx/src/cli.rs Show resolved Hide resolved
cargo-cyclonedx/src/platform.rs Show resolved Hide resolved
cargo-cyclonedx/src/cli.rs Outdated Show resolved Hide resolved
@Shnatsel
Copy link
Contributor Author

I'm going to round up the README changes before release. README is not neat split into small lines, so I'll run into lots of merge conflicts if I edit it in every PR.

@Shnatsel
Merge branch 'main' into target-selection
72a6c76
@Shnatsel
Use the 'long_help' clap attribute to document --target in detail
7c6d6de 
Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel
Use the special 'all' value for --target for consistency with `cargo …
5835ab7 
…tree`

Signed-off-by: Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
@Shnatsel Shnatsel merged commit d227e16 into CycloneDX:main Oct 30, 2023
9 checks passed
@Shnatsel Shnatsel mentioned this pull request Nov 3, 2023
Closed
@Shnatsel Shnatsel mentioned this pull request Jul 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lfrancke lfrancke lfrancke requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Allow emitting SBOM for a specific platform
2 participants
@Shnatsel @lfrancke