diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go index e77cfa89..880bda91 100644 --- a/cmd/skopeo/inspect.go +++ b/cmd/skopeo/inspect.go @@ -23,7 +23,7 @@ var inspectCmd = cli.Command{ logrus.Fatal(err) } if c.Bool("raw") { - b, err := img.GetManifest() + b, err := img.Manifest() if err != nil { logrus.Fatal(err) } diff --git a/docker/docker_image.go b/docker/docker_image.go index 9b9245b6..c9ab31b8 100644 --- a/docker/docker_image.go +++ b/docker/docker_image.go @@ -22,7 +22,7 @@ type dockerImage struct { src *dockerImageSource digest string 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 @@ -42,16 +42,16 @@ func (i *dockerImage) GetIntendedDockerReference() string { return i.src.GetIntendedDockerReference() } -// GetManifest 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) { +// Manifest is like ImageSource.GetManifest, but the result is cached; it is OK to call this however often you need. +func (i *dockerImage) Manifest() ([]byte, error) { if err := i.retrieveRawManifest(); err != nil { return nil, err } return i.rawManifest, nil } -// GetSignatures 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) { +// Signatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need. +func (i *dockerImage) Signatures() ([][]byte, error) { if i.cachedSignatures == nil { sigs, err := i.src.GetSignatures() if err != nil { diff --git a/types/types.go b/types/types.go index f88c6c14..a8f0e82c 100644 --- a/types/types.go +++ b/types/types.go @@ -34,8 +34,10 @@ type ImageSource interface { // (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. GetIntendedDockerReference() string + // GetManifest returns the image's manifest. It may use a remote (= slow) service. GetManifest() (manifest []byte, unverifiedCanonicalDigest string, err error) GetLayer(digest string) (io.ReadCloser, error) + // GetSignatures returns the image's signatures. It may use a remote (= slow) service. GetSignatures() ([][]byte, error) } @@ -55,10 +57,10 @@ type Image interface { // (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. GetIntendedDockerReference() string - // GetManifest is like ImageSource.GetManifest, but the result is cached; it is OK to call this however often you need. - GetManifest() ([]byte, error) - // GetSignatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need. - GetSignatures() ([][]byte, error) + // Manifest is like ImageSource.GetManifest, but the result is cached; it is OK to call this however often you need. + Manifest() ([]byte, error) + // Signatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need. + Signatures() ([][]byte, error) Layers(layers ...string) error // configure download directory? Call it DownloadLayers? Inspect() (ImageManifest, error) DockerTar() ([]byte, error) // ??? also, configure output directory