Enrich discover --verbose command tree output with additional data (Layers, data from Descriptor) #1501
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
…ayers, data from Descriptor)
TerryHowe
reviewed
Sep 23, 2024
Comment on lines
+124
to
+137
| fetchOpts := oras.DefaultFetchBytesOptions | ||
| fetchOpts.TargetPlatform = platform.Platform | ||
| _, content, err := oras.FetchBytes(ctx, target, digest.String(), fetchOpts) | ||
| if err != nil { | ||
| return false, fmt.Errorf("failed to fetch the content of %q: %w", "", err) | ||
| } | ||
|
|
||
| var jsonMap map[string]any | ||
| if err = json.Unmarshal(content, &jsonMap); err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| if layers, ok := jsonMap["layers"].([]interface{}); ok { | ||
| if len(layers) != 0 { |
There was a problem hiding this comment.
This whole thing seems to me like a method fetchLayers or something which returns layers or error
Comment on lines
+90
to
+101
| func addDescriptorInfo(referrer ocispec.Descriptor, referrerNode *tree.Node) { | ||
| descriptorNode := referrerNode.AddPath("Descriptor") | ||
| descriptorNode.AddPath(strings.TrimSpace("MediaType: " + referrer.MediaType)) | ||
| descriptorNode.AddPath(strings.TrimSpace("Size: " + strconv.FormatInt(referrer.Size, 10))) | ||
| } | ||
|
|
||
| func addAnnotationsInfo(referrer ocispec.Descriptor, referrerNode *tree.Node) error { | ||
| if len(referrer.Annotations) != 0 { | ||
| annotationsNode := referrerNode.AddPath("Annotations") | ||
| annotationsKeys := sortedKeys(referrer.Annotations) | ||
| for _, k := range annotationsKeys { | ||
| v := referrer.Annotations[k] |
There was a problem hiding this comment.
Seems like it would be easier to unit test this stuff if it was a wrapper for referrerNode and these were addDescriptor, addAnnotations, etc.
| v := annotationsMap[k] | ||
| bytes, err := yaml.Marshal(map[string]interface{}{k: v}) | ||
| if err != nil { | ||
| continue |
There was a problem hiding this comment.
This is too deep, something needs to be broken up here
| results, err := registry.Referrers(ctx, repo, desc, artifactType) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| for _, r := range results { | ||
| if err := handler.OnDiscovered(r, desc); err != nil { | ||
| if err := handler.OnDiscovered(r, desc, ctx, repo, platform); err != nil { |
There was a problem hiding this comment.
Not loving passing ctx in the middle here. I haven't looked everything over, but seems like this should be passing down a fetch method around here
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.
WIP
Hi,
when I was investigating why Trivy does not see SBOMs attached to Harbor Images (it was because old Harbor v2.10.2 was malformes
ArtifactTypeof attached SBOM JSON. It always override toapplication/vnd.oci.empty.v1+json. In latest version of Harbor it is fixed), I found out that it is good to see (at that time only in debugger) some additional data about Images.What helped me, was to see
MediaTypefromDescriptor, andMediaTypefrom Layers.What do you think about those additions to
--verbosemode ofdiscovercommand?Thank you
Ivos
What this PR does / why we need it:
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
Please check the following list:
Output looks like this: