Write sbom.legacy.json files for newer platform api #825
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Natalie Arellano <[email protected]>
natalieparellano
force-pushed
the
remove-legacy-bom-label
branch
from
215eefe to
7707bea
Compare
Comment on lines
-13
to
-37
| func WriteTOML(path string, data interface{}) error { | ||
| if err := os.MkdirAll(filepath.Dir(path), 0777); err != nil { | ||
| return err | ||
| } | ||
| f, err := os.Create(path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer f.Close() | ||
| return toml.NewEncoder(f).Encode(data) | ||
| } | ||
|
|
||
| func ReadGroup(path string) (buildpack.Group, error) { | ||
| var group buildpack.Group | ||
| _, err := toml.DecodeFile(path, &group) | ||
| return group, err | ||
| } | ||
|
|
||
| func ReadOrder(path string) (buildpack.Order, error) { | ||
| var order struct { | ||
| Order buildpack.Order `toml:"order"` | ||
| } | ||
| _, err := toml.DecodeFile(path, &order) | ||
| return order.Order, err | ||
| } |
There was a problem hiding this comment.
These functions are unused. I think we forgot to delete them in an earlier PR.
builder.go
Outdated
| if err := encoding.WriteJSON(filepath.Join(b.LayersDir, "sbom", "launch", "sbom.legacy.json"), launchBOM); err != nil { | ||
| return nil, errors.Wrap(err, "encoding launch bom") | ||
| } | ||
| launchBOM = []buildpack.BOMEntry{} // zero out bom in <layers>/config/metadata.toml |
There was a problem hiding this comment.
This will have the effect of producing a null bom, as opposed to omitting it, because of here. I don't think this is what we want...
There was a problem hiding this comment.
Fixed in db5d4af - thanks @jabrown85 for the suggestion!
Signed-off-by: Natalie Arellano <[email protected]>
jabrown85
reviewed
Mar 11, 2022
Signed-off-by: Natalie Arellano <[email protected]>
Due to limitations of our TOML library, we can't add MarshalTOML to the top-level struct. Signed-off-by: Natalie Arellano <[email protected]>
mboldt
approved these changes
Mar 17, 2022
Signed-off-by: Natalie Arellano <[email protected]>
jabrown85
approved these changes
Mar 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #808