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

Merge pull request #1417 from redbaron/use-getref 

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
parent 9f37d3322f 8621fd907a
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

37
pkg/storage/image.go
View File

@ -320,17 +320,9 @@ func (svc *imageService) ListImages(systemContext *types.SystemContext, filter s
}
func (svc *imageService) ImageStatus(systemContext *types.SystemContext, nameOrID string) (*ImageResult, error) {
ref, err := alltransports.ParseImageName(nameOrID)
ref, err := svc.getRef(nameOrID)
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
}
ref2 = ref3
}
ref = ref2
return nil, err
}
image, err := istorage.Transport.GetStoreImage(svc.store, ref)
if err != nil {
@ -500,19 +492,10 @@ func (svc *imageService) PullImage(systemContext *types.SystemContext, imageName
}
func (svc *imageService) UntagImage(systemContext *types.SystemContext, nameOrID string) error {
ref, err := alltransports.ParseImageName(nameOrID)
ref, err := svc.getRef(nameOrID)
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
}
ref2 = ref3
}
ref = ref2
return err
}
img, err := istorage.Transport.GetStoreImage(svc.store, ref)
if err != nil {
return err
@ -551,17 +534,9 @@ func (svc *imageService) UntagImage(systemContext *types.SystemContext, nameOrID
}
func (svc *imageService) RemoveImage(systemContext *types.SystemContext, nameOrID string) error {
ref, err := alltransports.ParseImageName(nameOrID)
ref, err := svc.getRef(nameOrID)
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
}
ref2 = ref3
}
ref = ref2
return err
}
return ref.DeleteImage(systemContext)
}