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.

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

Jump to bottom

[25.0 backport] plugins: Fix panic when fetching by digest #47323

Merged
merged 2 commits into from Feb 5, 2024
Merged

[25.0 backport] plugins: Fix panic when fetching by digest #47323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5113311
tests: add plugin install test w/ digest
laurazard Feb 1, 2024
ba4a2da
plugins: fix panic installing from repo w/ digest
laurazard Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 43 additions & 0 deletions integration/plugin/common/plugin_test.go
View file
Open in desktop
Expand Up @@ -124,6 +124,49 @@ func TestPluginInstall(t *testing.T) {
assert.NilError(t, err)
})

t.Run("with digest", func(t *testing.T) {
ctx := setupTest(t)

reg := registry.NewV2(t)
defer reg.Close()

name := "test-" + strings.ToLower(t.Name())
repo := path.Join(registry.DefaultURL, name+":latest")
err := plugin.Create(ctx, client, repo)
assert.NilError(t, err)

rdr, err := client.PluginPush(ctx, repo, "")
assert.NilError(t, err)
defer rdr.Close()

buf := &strings.Builder{}
assert.NilError(t, err)
var digest string
assert.NilError(t, jsonmessage.DisplayJSONMessagesStream(rdr, buf, 0, false, func(j jsonmessage.JSONMessage) {
if j.Aux != nil {
var r types.PushResult
assert.NilError(t, json.Unmarshal(*j.Aux, &r))
digest = r.Digest
}
}), buf)

err = client.PluginRemove(ctx, repo, types.PluginRemoveOptions{Force: true})
assert.NilError(t, err)

rdr, err = client.PluginInstall(ctx, repo, types.PluginInstallOptions{
Disabled: true,
RemoteRef: repo + "@" + digest,
})
assert.NilError(t, err)
defer rdr.Close()

_, err = io.Copy(io.Discard, rdr)
assert.NilError(t, err)

_, _, err = client.PluginInspectWithRaw(ctx, repo)
assert.NilError(t, err)
})

t.Run("with htpasswd", func(t *testing.T) {
ctx := setupTest(t)

Expand Down
9 changes: 7 additions & 2 deletions plugin/fetch_linux.go
View file
Open in desktop
Expand Up @@ -200,8 +200,13 @@ func withFetchProgress(cs content.Store, out progress.Output, ref reference.Name
switch desc.MediaType {
case ocispec.MediaTypeImageManifest, images.MediaTypeDockerSchema2Manifest:
tn := reference.TagNameOnly(ref)
tagged := tn.(reference.Tagged)
progress.Messagef(out, tagged.Tag(), "Pulling from %s", reference.FamiliarName(ref))
var tagOrDigest string
if tagged, ok := tn.(reference.Tagged); ok {
tagOrDigest = tagged.Tag()
} else {
tagOrDigest = tn.String()
}
progress.Messagef(out, tagOrDigest, "Pulling from %s", reference.FamiliarName(ref))
progress.Messagef(out, "", "Digest: %s", desc.Digest.String())
return nil, nil
case
Expand Down