Ensure Provenance Material URIs for OCI sources are configured to use pkg:oci PURLs
#3918
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
tonistiigi
reviewed
May 31, 2023
client/client_test.go
Outdated
| @@ -7564,7 +7565,7 @@ func testExportAttestations(t *testing.T, sb integration.Sandbox) { | |||
|
|
|||
| purls := map[string]string{} | |||
| for _, k := range targets { | |||
| p, _ := purl.RefToPURL(k, &ps[i]) | |||
| p, _ := purl.RefToPURL(packageurl.TypeDocker, k, &ps[i]) | |||
There was a problem hiding this comment.
it would be better if this used string constants instead. Otherwise we are running the same function both in implementation and in test.
So did these values actually change as well?
There was a problem hiding this comment.
The values haven't changed, no, we just move the packageurl.TypeDocker from inside the function to outside the function.
I've changed these to string constants (still need a bit of printf magic) - I've put this commit at the start of the patch stack, and verified that the values stay constant with each patch.
Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
This also allows us to specify that local images should be generated with exactly the same specification as remote images, but with the pkg:oci scheme instead of pkg:docker. Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
tonistiigi
approved these changes
May 31, 2023
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.
Previously, OCI layout sources were being incorrectly recorded in the materials.
There were two main issues:
ResolveImageConfig(which can take aResolverTypeparameter to read from local oci stores).Now locally loaded images are more reasonably recorded in the materials. See the added test.