Skip to content

Commit

Permalink
daemon.images: ImageService.getImage: use named fields in struct lite…
Browse files Browse the repository at this point in the history
…rals

Prevent things from breaking if additional fields are added to this struct.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
thaJeztah committed Jan 19, 2024
1 parent 7c19144 commit 35789fc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions daemon/images/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,12 @@ func (i *ImageService) getImage(ctx context.Context, refOrID string, options ima
if !ok {
digested, ok := ref.(reference.Digested)
if !ok {
return nil, ErrImageDoesNotExist{ref}
return nil, ErrImageDoesNotExist{Ref: ref}
}
if img, err := i.imageStore.Get(image.ID(digested.Digest())); err == nil {
return img, nil
}
return nil, ErrImageDoesNotExist{ref}
return nil, ErrImageDoesNotExist{Ref: ref}
}

if dgst, err := i.referenceStore.Get(namedRef); err == nil {
Expand All @@ -267,12 +267,12 @@ func (i *ImageService) getImage(ctx context.Context, refOrID string, options ima
if id, err := i.imageStore.Search(refOrID); err == nil {
img, err := i.imageStore.Get(id)
if err != nil {
return nil, ErrImageDoesNotExist{ref}
return nil, ErrImageDoesNotExist{Ref: ref}
}
return img, nil
}

return nil, ErrImageDoesNotExist{ref}
return nil, ErrImageDoesNotExist{Ref: ref}
}

// OnlyPlatformWithFallback uses `platforms.Only` with a fallback to handle the case where the platform
Expand Down

0 comments on commit 35789fc

Please sign in to comment.