@@ -81,10 +81,10 @@ type Store interface {
8181 // GC removes all unused or partially downloaded images.
8282 GC () error
8383
84- // GetImagePathAndVirtualSize returns the path to image data
85- // and virtual size for the specified image. It accepts
86- // an image reference or a digest.
87- GetImagePathAndVirtualSize (ref string ) (string , uint64 , error )
84+ // GetImagePathDigestAndVirtualSize returns the path to image
85+ // data, the digest and the virtual size for the specified
86+ // image. It accepts an image reference or a digest.
87+ GetImagePathDigestAndVirtualSize (ref string ) (string , digest. Digest , uint64 , error )
8888
8989 // SetRefGetter sets a function that will be used to determine
9090 // the set of images that are currently in use.
@@ -472,30 +472,33 @@ func (s *FileStore) GC() error {
472472 return nil
473473}
474474
475- // GetImagePathAndVirtualSize implements GC method of Store interface.
476- func (s * FileStore ) GetImagePathAndVirtualSize (ref string ) (string , uint64 , error ) {
475+ // GetImagePathDigestAndVirtualSize implements GetImagePathDigestAndVirtualSize method of Store interface.
476+ func (s * FileStore ) GetImagePathDigestAndVirtualSize (ref string ) (string , digest. Digest , uint64 , error ) {
477477 s .Lock ()
478478 defer s .Unlock ()
479- glog .V (3 ).Infof ("GetImagePathAndVirtualSize (): %q" , ref )
479+ glog .V (3 ).Infof ("GetImagePathDigestAndVirtualSize (): %q" , ref )
480480
481481 var pathViaDigest , pathViaName string
482482 // parsing digest as ref gives bad results
483- if d , err := digest .Parse (ref ); err == nil {
483+ d , err := digest .Parse (ref )
484+ if err == nil {
484485 if d .Algorithm () != digest .SHA256 {
485- return "" , 0 , fmt .Errorf ("bad image digest (need sha256): %q" , d )
486+ return "" , "" , 0 , fmt .Errorf ("bad image digest (need sha256): %q" , d )
486487 }
487488 pathViaDigest = s .dataFileName (d .Hex ())
488489 } else {
489490 parsed , err := reference .Parse (ref )
490491 if err != nil {
491- return "" , 0 , fmt .Errorf ("bad image reference %q: %v" , ref , err )
492+ return "" , "" , 0 , fmt .Errorf ("bad image reference %q: %v" , ref , err )
492493 }
493494
495+ d = ""
494496 if digested , ok := parsed .(reference.Digested ); ok {
495497 if digested .Digest ().Algorithm () != digest .SHA256 {
496- return "" , 0 , fmt .Errorf ("bad image digest (need sha256): %q" , digested .Digest ())
498+ return "" , "" , 0 , fmt .Errorf ("bad image digest (need sha256): %q" , digested .Digest ())
497499 }
498- pathViaDigest = s .dataFileName (digested .Digest ().Hex ())
500+ d = digested .Digest ()
501+ pathViaDigest = s .dataFileName (d .Hex ())
499502 }
500503
501504 if named , ok := parsed .(reference.Named ); ok && named .Name () != "" {
@@ -504,35 +507,36 @@ func (s *FileStore) GetImagePathAndVirtualSize(ref string) (string, uint64, erro
504507 glog .Warningf ("error reading link %q: %v" , pathViaName , err )
505508 } else {
506509 pathViaName = filepath .Join (s .linkDir (), pathViaName )
510+ d = digest .NewDigestFromHex (string (digest .SHA256 ), filepath .Base (pathViaName ))
507511 }
508512 }
509513 }
510514
511515 path := pathViaDigest
512516 switch {
513517 case pathViaDigest == "" && pathViaName == "" :
514- return "" , 0 , fmt .Errorf ("bad image reference %q" , ref )
518+ return "" , "" , 0 , fmt .Errorf ("bad image reference %q" , ref )
515519 case pathViaDigest == "" :
516520 path = pathViaName
517521 case pathViaName != "" :
518522 fi1 , err := os .Stat (pathViaName )
519523 if err != nil {
520- return "" , 0 , err
524+ return "" , "" , 0 , err
521525 }
522526 fi2 , err := os .Stat (pathViaDigest )
523527 if err != nil {
524- return "" , 0 , err
528+ return "" , "" , 0 , err
525529 }
526530 if ! os .SameFile (fi1 , fi2 ) {
527- return "" , 0 , fmt .Errorf ("digest / name path mismatch: %q vs %q" , pathViaDigest , pathViaName )
531+ return "" , "" , 0 , fmt .Errorf ("digest / name path mismatch: %q vs %q" , pathViaDigest , pathViaName )
528532 }
529533 }
530534
531535 vsize , err := s .vsizeFunc (path )
532536 if err != nil {
533- return "" , 0 , fmt .Errorf ("error getting image size for %q: %v" , path , err )
537+ return "" , "" , 0 , fmt .Errorf ("error getting image size for %q: %v" , path , err )
534538 }
535- return path , vsize , nil
539+ return path , d , vsize , nil
536540}
537541
538542// SetRefGetter implements SetRefGetter method of Store interface.
0 commit comments