github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-02 07:17:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59 from mtrmac/api-for-signatures

Browse Source 
API for signatures - drop Get prefixes on quick getters
This commit is contained in:
Antonio Murdaca 2016-05-16 20:43:48 +02:00
commit c75f0f6780
6 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/skopeo/inspect.go
View File

@ -23,14 +23,14 @@ var inspectCmd = cli.Command{
logrus.Fatal(err) logrus.Fatal(err)
} }
if c.Bool("raw") { if c.Bool("raw") {
b, err := img.GetManifest() b, err := img.Manifest()
if err != nil { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
fmt.Println(string(b)) fmt.Println(string(b))
return return
} }
imgInspect, err := img.Manifest() imgInspect, err := img.Inspect()
if err != nil { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }

4
directory/directory.go
View File

@ -77,10 +77,10 @@ func NewDirImageSource(dir string) types.ImageSource {
return &dirImageSource{dir} return &dirImageSource{dir}
} }
// GetIntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_ // IntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_
// (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image. // (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image.
// May be "" if unknown. // May be "" if unknown.
func (s *dirImageSource) GetIntendedDockerReference() string { func (s *dirImageSource) IntendedDockerReference() string {
return "" return ""
} }

18
docker/docker_image.go
View File

@ -22,7 +22,7 @@ type dockerImage struct {
src *dockerImageSource src *dockerImageSource
digest string digest string
rawManifest []byte rawManifest []byte
cachedSignatures [][]byte // Private cache for GetSignatures; nil if not yet known. cachedSignatures [][]byte // Private cache for Signatures(); nil if not yet known.
} }
// NewDockerImage returns a new Image interface type after setting up // NewDockerImage returns a new Image interface type after setting up
@ -35,23 +35,23 @@ func NewDockerImage(img, certPath string, tlsVerify bool) (types.Image, error) {
return &dockerImage{src: s}, nil return &dockerImage{src: s}, nil
} }
// GetIntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_ // IntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_
// (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image. // (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image.
// May be "" if unknown. // May be "" if unknown.
func (i *dockerImage) GetIntendedDockerReference() string { func (i *dockerImage) IntendedDockerReference() string {
return i.src.GetIntendedDockerReference() return i.src.IntendedDockerReference()
} }
// GetManifest is like ImageSource.GetManifest, but the result is cached; it is OK to call this however often you need. // Manifest is like ImageSource.GetManifest, but the result is cached; it is OK to call this however often you need.
func (i *dockerImage) GetManifest() ([]byte, error) { func (i *dockerImage) Manifest() ([]byte, error) {
if err := i.retrieveRawManifest(); err != nil { if err := i.retrieveRawManifest(); err != nil {
return nil, err return nil, err
} }
return i.rawManifest, nil return i.rawManifest, nil
} }
// GetSignatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need. // Signatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need.
func (i *dockerImage) GetSignatures() ([][]byte, error) { func (i *dockerImage) Signatures() ([][]byte, error) {
if i.cachedSignatures == nil { if i.cachedSignatures == nil {
sigs, err := i.src.GetSignatures() sigs, err := i.src.GetSignatures()
if err != nil { if err != nil {
@ -62,7 +62,7 @@ func (i *dockerImage) GetSignatures() ([][]byte, error) {
return i.cachedSignatures, nil return i.cachedSignatures, nil
} }
func (i *dockerImage) Manifest() (types.ImageManifest, error) { func (i *dockerImage) Inspect() (types.ImageManifest, error) {
// TODO(runcom): unused version param for now, default to docker v2-1 // TODO(runcom): unused version param for now, default to docker v2-1
m, err := i.getSchema1Manifest() m, err := i.getSchema1Manifest()
if err != nil { if err != nil {

4
docker/docker_image_src.go
View File

@ -48,10 +48,10 @@ func NewDockerImageSource(img, certPath string, tlsVerify bool) (types.ImageSour
return newDockerImageSource(img, certPath, tlsVerify) return newDockerImageSource(img, certPath, tlsVerify)
} }
// GetIntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_ // IntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_
// (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image. // (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image.
// May be "" if unknown. // May be "" if unknown.
func (s *dockerImageSource) GetIntendedDockerReference() string { func (s *dockerImageSource) IntendedDockerReference() string {
return fmt.Sprintf("%s:%s", s.ref.Name(), s.tag) return fmt.Sprintf("%s:%s", s.ref.Name(), s.tag)
} }

4
openshift/openshift.go
View File

@ -186,10 +186,10 @@ func NewOpenshiftImageSource(imageName, certPath string, tlsVerify bool) (types.
}, nil }, nil
} }
// GetIntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_ // IntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_
// (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image. // (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image.
// May be "" if unknown. // May be "" if unknown.
func (s *openshiftImageSource) GetIntendedDockerReference() string { func (s *openshiftImageSource) IntendedDockerReference() string {
return s.client.canonicalDockerReference() return s.client.canonicalDockerReference()
} }

20
types/types.go
View File

@ -30,12 +30,14 @@ type Repository interface {
// ImageSource is a service, possibly remote (= slow), to download components of a single image. // ImageSource is a service, possibly remote (= slow), to download components of a single image.
type ImageSource interface { type ImageSource interface {
// GetIntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_ // IntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_
// (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image. // (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image.
// May be "" if unknown. // May be "" if unknown.
GetIntendedDockerReference() string IntendedDockerReference() string
// GetManifest returns the image's manifest. It may use a remote (= slow) service.
GetManifest() (manifest []byte, unverifiedCanonicalDigest string, err error) GetManifest() (manifest []byte, unverifiedCanonicalDigest string, err error)
GetLayer(digest string) (io.ReadCloser, error) GetLayer(digest string) (io.ReadCloser, error)
// GetSignatures returns the image's signatures. It may use a remote (= slow) service.
GetSignatures() ([][]byte, error) GetSignatures() ([][]byte, error)
} }
@ -51,16 +53,16 @@ type ImageDestination interface {
// Image is a Docker image in a repository. // Image is a Docker image in a repository.
type Image interface { type Image interface {
// ref to repository? // ref to repository?
// GetIntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_ // IntendedDockerReference returns the full, unambiguous, Docker reference for this image, _as specified by the user_
// (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image. // (not as the image itself, or its underlying storage, claims). This can be used e.g. to determine which public keys are trusted for this image.
// May be "" if unknown. // May be "" if unknown.
GetIntendedDockerReference() string IntendedDockerReference() string
// GetManifest is like ImageSource.GetManifest, but the result is cached; it is OK to call this however often you need. // Manifest is like ImageSource.GetManifest, but the result is cached; it is OK to call this however often you need.
GetManifest() ([]byte, error) Manifest() ([]byte, error)
// GetSignatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need. // Signatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need.
GetSignatures() ([][]byte, error) Signatures() ([][]byte, error)
Layers(layers ...string) error // configure download directory? Call it DownloadLayers? Layers(layers ...string) error // configure download directory? Call it DownloadLayers?
Manifest() (ImageManifest, error) Inspect() (ImageManifest, error)
DockerTar() ([]byte, error) // ??? also, configure output directory DockerTar() ([]byte, error) // ??? also, configure output directory
} }