vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1417 from redbaron/use-getref

Browse source 
small refactor: use imageService.getRef wherever possible
This commit is contained in:
Mrunal Patel 2018-03-05 15:10:23 -08:00 committed by GitHub
commit 0e0c820f0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkg/storage/image.go
View file

@ -320,18 +320,10 @@ func (svc *imageService) ListImages(systemContext *types.SystemContext, filter s
} }
func (svc *imageService) ImageStatus(systemContext *types.SystemContext, nameOrID string) (*ImageResult, error) { func (svc *imageService) ImageStatus(systemContext *types.SystemContext, nameOrID string) (*ImageResult, error) {
ref, err := alltransports.ParseImageName(nameOrID) ref, err := svc.getRef(nameOrID)
if err != nil { if err != nil {
ref2, err2 := istorage.Transport.ParseStoreReference(svc.store, "@"+nameOrID)
if err2 != nil {
ref3, err3 := istorage.Transport.ParseStoreReference(svc.store, nameOrID)
if err3 != nil {
return nil, err return nil, err
} }
ref2 = ref3
}
ref = ref2
}
image, err := istorage.Transport.GetStoreImage(svc.store, ref) image, err := istorage.Transport.GetStoreImage(svc.store, ref)
if err != nil { if err != nil {
return nil, err return nil, err
@ -500,19 +492,10 @@ func (svc *imageService) PullImage(systemContext *types.SystemContext, imageName
} }
func (svc *imageService) UntagImage(systemContext *types.SystemContext, nameOrID string) error { func (svc *imageService) UntagImage(systemContext *types.SystemContext, nameOrID string) error {
ref, err := alltransports.ParseImageName(nameOrID) ref, err := svc.getRef(nameOrID)
if err != nil { if err != nil {
ref2, err2 := istorage.Transport.ParseStoreReference(svc.store, "@"+nameOrID)
if err2 != nil {
ref3, err3 := istorage.Transport.ParseStoreReference(svc.store, nameOrID)
if err3 != nil {
return err return err
} }
ref2 = ref3
}
ref = ref2
}
img, err := istorage.Transport.GetStoreImage(svc.store, ref) img, err := istorage.Transport.GetStoreImage(svc.store, ref)
if err != nil { if err != nil {
return err return err
@ -551,18 +534,10 @@ func (svc *imageService) UntagImage(systemContext *types.SystemContext, nameOrID
} }
func (svc *imageService) RemoveImage(systemContext *types.SystemContext, nameOrID string) error { func (svc *imageService) RemoveImage(systemContext *types.SystemContext, nameOrID string) error {
ref, err := alltransports.ParseImageName(nameOrID) ref, err := svc.getRef(nameOrID)
if err != nil { if err != nil {
ref2, err2 := istorage.Transport.ParseStoreReference(svc.store, "@"+nameOrID)
if err2 != nil {
ref3, err3 := istorage.Transport.ParseStoreReference(svc.store, nameOrID)
if err3 != nil {
return err return err
} }
ref2 = ref3
}
ref = ref2
}
return ref.DeleteImage(systemContext) return ref.DeleteImage(systemContext)
} }