Skip to content

contentutil: thread context through registry refs #6985

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

Merged
tonistiigi merged 1 commit into from
Aug 26, 2026
+96 −69
Merged

contentutil: thread context through registry refs #6985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions client/client_export_image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func testBuildExportScratch(t *testing.T, sb integration.Sandbox) {
}, "", makeFrontend([]string{"linux/amd64", "linux/arm64"}), nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand All @@ -160,7 +160,7 @@ func testBuildExportScratch(t *testing.T, sb integration.Sandbox) {
require.Empty(t, img.Layers)
require.True(t, platforms.Only(platforms.DefaultSpec()).Match(img.Img.Platform))

desc, provider, err = contentutil.ProviderFromRef(targetMulti)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), targetMulti)
require.NoError(t, err)
imgs, err = testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -1744,10 +1744,10 @@ func testPushByDigest(t *testing.T, sb integration.Sandbox) {
}, nil)
require.NoError(t, err)

_, _, err = contentutil.ProviderFromRef(name + ":latest")
_, _, err = contentutil.ProviderFromRef(sb.Context(), name+":latest")
require.Error(t, err)

desc, _, err := contentutil.ProviderFromRef(name + "@" + resp.ExporterResponse[exptypes.ExporterImageDigestKey])
desc, _, err := contentutil.ProviderFromRef(sb.Context(), name+"@"+resp.ExporterResponse[exptypes.ExporterImageDigestKey])
require.NoError(t, err)

require.Equal(t, resp.ExporterResponse[exptypes.ExporterImageDigestKey], desc.Digest.String())
Expand Down
28 changes: 14 additions & 14 deletions client/client_export_metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func testAttestationBundle(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -301,7 +301,7 @@ func testAttestationDefaultSubject(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -439,7 +439,7 @@ func testExportAnnotations(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -634,7 +634,7 @@ func testExportAnnotationsMediaTypes(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand All @@ -655,7 +655,7 @@ func testExportAnnotationsMediaTypes(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(target2)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), target2)
require.NoError(t, err)
imgs2, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -801,7 +801,7 @@ func testExportAttestations(t *testing.T, sb integration.Sandbox, ociArtifact bo
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(targets[0])
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), targets[0])
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -1414,7 +1414,7 @@ EOF
}, "", makeTargetFrontend(false), nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand All @@ -1439,7 +1439,7 @@ EOF
}, "", makeTargetFrontend(true), nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(target)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err = testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -1471,7 +1471,7 @@ EOF
}, "", makeTargetFrontend(false), nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(target)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err = testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -1503,7 +1503,7 @@ EOF
}, "", makeTargetFrontend(true), nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(target)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err = testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -1535,7 +1535,7 @@ EOF
}, "", makeTargetFrontend(false), nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(target)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err = testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -1569,7 +1569,7 @@ EOF
}, "", makeTargetFrontend(false), nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(target)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err = testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -1726,7 +1726,7 @@ EOF
}, "", targetFrontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -1880,7 +1880,7 @@ func testSBOMSupplements(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down
2 changes: 1 addition & 1 deletion client/client_git_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ func testGitBundleRoundTripRegistry(t *testing.T, sb integration.Sandbox) {
// digest; the repository exists implicitly once any blob is uploaded
// under its name.
bundleRepoRef := registry + "/foo/bundle@" + bundleDgst.String()
ingester, err := contentutil.IngesterFromRef(bundleRepoRef)
ingester, err := contentutil.IngesterFromRef(sb.Context(), bundleRepoRef)
require.NoError(t, err)
err = content.WriteBlob(ctx, ingester, "bundle-"+bundleDgst.String(), bytes.NewReader(bundleBytes),
ocispecs.Descriptor{Digest: bundleDgst, Size: int64(len(bundleBytes))})
Expand Down
2 changes: 1 addition & 1 deletion client/client_oci_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func testImageBlobSource(t *testing.T, sb integration.Sandbox) {
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(name)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), name)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down
6 changes: 3 additions & 3 deletions client/compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ func createCompatibilityBaseImage(ctx context.Context, t *testing.T, c *Client,
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(baseRef)
desc, provider, err := contentutil.ProviderFromRef(ctx, baseRef)
require.NoError(t, err)
actual := readCompatibilityActualFromProvider(ctx, t, provider, desc)

Expand Down Expand Up @@ -452,7 +452,7 @@ func exportCompatibilityImageCase(ctx context.Context, t *testing.T, c *Client,
return compatibilityActual{}, err
}

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(ctx, target)
if err != nil {
return compatibilityActual{}, err
}
Expand Down Expand Up @@ -655,7 +655,7 @@ func readCompatibilityActualFromProvider(ctx context.Context, t *testing.T, prov
}

func readImageCompatibilityProvenance(ctx context.Context, ref string) (*provenancetypes.ProvenancePredicateSLSA1, error) {
desc, provider, err := contentutil.ProviderFromRef(ref)
desc, provider, err := contentutil.ProviderFromRef(ctx, ref)
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions frontend/dockerfile/dockerfile_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ COPY --from=base /arch /
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target + "-img")
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target+"-img")
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down Expand Up @@ -299,7 +299,7 @@ COPY --from=base /arch /
}, nil)
require.NoError(t, err)

desc2, provider, err := contentutil.ProviderFromRef(target + "-img")
desc2, provider, err := contentutil.ProviderFromRef(sb.Context(), target+"-img")
require.NoError(t, err)

require.Equal(t, desc.Digest, desc2.Digest)
Expand Down Expand Up @@ -383,7 +383,7 @@ COPY --from=base unique /
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
img, err := testutil.ReadImage(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion frontend/dockerfile/dockerfile_cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ ENTRYPOINT []random string
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down
2 changes: 1 addition & 1 deletion frontend/dockerfile/dockerfile_history_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ RUN dir C:\Windows
cmd := sb.Cmd(args + " --output type=image,push=true,name=" + target)
require.NoError(t, cmd.Run())

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
Expand Down
4 changes: 2 additions & 2 deletions frontend/dockerfile/dockerfile_namedcontext_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ RUN echo foo>> C:\test
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
img, err := testutil.ReadImage(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -381,7 +381,7 @@ RUN echo foo>> C:\test
}, nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(targetDerived)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), targetDerived)
require.NoError(t, err)
imgDerived, err := testutil.ReadImage(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down
6 changes: 3 additions & 3 deletions frontend/dockerfile/dockerfile_platform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ EOF

require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

info, err := testutil.ReadImages(ctx, provider, desc)
Expand Down Expand Up @@ -369,7 +369,7 @@ EOF

require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)

info, err := testutil.ReadImages(ctx, provider, desc)
Expand Down Expand Up @@ -417,7 +417,7 @@ EOF
}, nil)
require.NoError(t, err)

desc, provider, err = contentutil.ProviderFromRef(target2)
desc, provider, err = contentutil.ProviderFromRef(sb.Context(), target2)
require.NoError(t, err)

info, err = testutil.ReadImages(ctx, provider, desc)
Expand Down
22 changes: 11 additions & 11 deletions frontend/dockerfile/dockerfile_provenance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ RUN echo ok> /foo
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -499,7 +499,7 @@ COPY myapp.Dockerfile /
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -701,7 +701,7 @@ RUN echo "ok-$TARGETARCH" > /foo
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(ctx, target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -912,7 +912,7 @@ func testClientFrontendProvenance(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -1058,7 +1058,7 @@ COPY --from=base C:\out C:\Files
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(ctx, provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -1172,7 +1172,7 @@ func testClientLLBProvenance(t *testing.T, sb integration.Sandbox) {
}, "", frontend, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -1869,7 +1869,7 @@ func assertFrontendRequest(t *testing.T, f frontendGateway, req *provenancetypes
}

func readNativeProvenancePredicate(ctx context.Context, t *testing.T, target string) provenancetypes.ProvenancePredicateSLSA1 {
desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(ctx, target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(ctx, provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -1932,7 +1932,7 @@ RUN --mount=type=secret,id=mysecret --mount=type=secret,id=othersecret --mount=t
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -2062,7 +2062,7 @@ EOF
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -2334,7 +2334,7 @@ ADD bar bar`)
}, nil)
require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down Expand Up @@ -2628,7 +2628,7 @@ func testDuplicateLayersProvenance(t *testing.T, sb integration.Sandbox) {

require.NoError(t, err)

desc, provider, err := contentutil.ProviderFromRef(target)
desc, provider, err := contentutil.ProviderFromRef(sb.Context(), target)
require.NoError(t, err)
imgs, err := testutil.ReadImages(sb.Context(), provider, desc)
require.NoError(t, err)
Expand Down
Loading