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

[feat] use new script for sbom generation #3942

Merged
merged 15 commits into from
Apr 15, 2024
Merged

Conversation

MangoIV
Copy link
Contributor

@MangoIV MangoIV commented Mar 11, 2024

https://wearezeta.atlassian.net/browse/SEC-596

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Mar 11, 2024
@MangoIV MangoIV marked this pull request as ready for review March 12, 2024 11:08
@MangoIV MangoIV requested review from supersven and emil-wire March 12, 2024 11:22
hack/bin/Sbom.hs Outdated Show resolved Hide resolved
hack/bin/Sbom.hs Show resolved Hide resolved
hack/bin/bombon.hs Show resolved Hide resolved
@MangoIV MangoIV force-pushed the mangoiv/sbom-generation branch 2 times, most recently from 7558ff7 to 5727288 Compare March 25, 2024 10:06
@MangoIV MangoIV force-pushed the mangoiv/sbom-generation branch from 5727288 to c0c7c46 Compare April 10, 2024 06:19
@MangoIV MangoIV force-pushed the mangoiv/sbom-generation branch from c0c7c46 to 52eb2ec Compare April 10, 2024 09:42
Makefile Outdated Show resolved Hide resolved
nix/wire-server.nix Outdated Show resolved Hide resolved
nix/default.nix Outdated Show resolved Hide resolved
hack/bin/Sbom.hs Outdated Show resolved Hide resolved
hack/bin/Sbom.hs Outdated Show resolved Hide resolved
hack/bin/Sbom.hs Outdated Show resolved Hide resolved
nix/wire-server.nix Outdated Show resolved Hide resolved
Co-authored-by: Sven Tennie <sven.tennie@wire.com>
@MangoIV
Copy link
Contributor Author

MangoIV commented Apr 15, 2024

@supersven thank you for your review; I have tried to address your issues, would you happen to have time to take one more glance at it? :3

Thank you!

@MangoIV MangoIV force-pushed the mangoiv/sbom-generation branch from e6bc7d9 to 2341fd1 Compare April 15, 2024 09:37
@supersven
Copy link
Contributor

@supersven thank you for your review; I have tried to address your issues, would you happen to have time to take one more glance at it? :3

Thank you!

@MangoIV I'm at it 😄

hack/bin/Sbom.hs Outdated Show resolved Hide resolved
Co-authored-by: Sven Tennie <sven.tennie@wire.com>
deriving stock (Eq, Ord, Show, Generic)
deriving anyclass (FromJSON, ToJSON)

sadSbomMeta :: Text -> Text -> [Text] -> SBomMeta Identity
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
sadSbomMeta :: Text -> Text -> [Text] -> SBomMeta Identity
emptySbomMeta :: Text -> Text -> [Text] -> SBomMeta Identity

or

Suggested change
sadSbomMeta :: Text -> Text -> [Text] -> SBomMeta Identity
notFoundSbomMeta :: Text -> Text -> [Text] -> SBomMeta Identity

?

Hm, could be that I don't get the name 🤔 However, if this is named "sad" because the search algorithm is sad because it didn't find anything, then I would say be can name this better 😃

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, it's because it didn't find anything and the information it can provide is sad :(

Copy link
Contributor

@supersven supersven Apr 15, 2024

Choose a reason for hiding this comment

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

As said empty... or notFound... would have been easier to grap. 😸

@MangoIV MangoIV merged commit 072da99 into develop Apr 15, 2024
8 checks passed
@MangoIV MangoIV deleted the mangoiv/sbom-generation branch April 15, 2024 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants