From dc7a05ebf913ce9c92dd681f4bf9c01871a1ea5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 16 May 2016 20:06:12 +0200 Subject: [PATCH] Rename types.Image.Manifest to types.Image.Inspect Does not change behavior. This better expresses the purpose of this method (it is working with more, currently much more, than the manifest), and frees up the Manifest method name for a simple getter of the raw blob. --- cmd/skopeo/inspect.go | 2 +- docker/docker_image.go | 2 +- types/types.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go index 6b7035fb..e77cfa89 100644 --- a/cmd/skopeo/inspect.go +++ b/cmd/skopeo/inspect.go @@ -30,7 +30,7 @@ var inspectCmd = cli.Command{ fmt.Println(string(b)) return } - imgInspect, err := img.Manifest() + imgInspect, err := img.Inspect() if err != nil { logrus.Fatal(err) } diff --git a/docker/docker_image.go b/docker/docker_image.go index bd2bfe39..9b9245b6 100644 --- a/docker/docker_image.go +++ b/docker/docker_image.go @@ -62,7 +62,7 @@ func (i *dockerImage) GetSignatures() ([][]byte, error) { 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 m, err := i.getSchema1Manifest() if err != nil { diff --git a/types/types.go b/types/types.go index 3c579f93..f88c6c14 100644 --- a/types/types.go +++ b/types/types.go @@ -60,7 +60,7 @@ type Image interface { // GetSignatures is like ImageSource.GetSignatures, but the result is cached; it is OK to call this however often you need. GetSignatures() ([][]byte, error) Layers(layers ...string) error // configure download directory? Call it DownloadLayers? - Manifest() (ImageManifest, error) + Inspect() (ImageManifest, error) DockerTar() ([]byte, error) // ??? also, configure output directory }