diff --git a/cmd/skopeo/layers.go b/cmd/skopeo/layers.go index 0ba56cf9..d3f11f9e 100644 --- a/cmd/skopeo/layers.go +++ b/cmd/skopeo/layers.go @@ -13,7 +13,7 @@ var layersCmd = cli.Command{ if err != nil { return err } - if err := img.Layers(c.Args().Tail()...); err != nil { + if err := img.LayersCommand(c.Args().Tail()...); err != nil { return err } return nil diff --git a/image/image.go b/image/image.go index a8c33e8a..2e49d3c2 100644 --- a/image/image.go +++ b/image/image.go @@ -172,7 +172,7 @@ func (i *genericImage) getSchema1Manifest() (genericManifest, error) { return mschema1, nil } -func (i *genericImage) Layers(layers ...string) error { +func (i *genericImage) LayersCommand(layers ...string) error { m, err := i.getSchema1Manifest() if err != nil { return err diff --git a/signature/policy_reference_match_test.go b/signature/policy_reference_match_test.go index 0b00214b..adbf2a3c 100644 --- a/signature/policy_reference_match_test.go +++ b/signature/policy_reference_match_test.go @@ -55,7 +55,7 @@ func (ref refImageMock) ManifestMatchesDigest(expectedDigest string) (bool, erro func (ref refImageMock) Signatures() ([][]byte, error) { panic("unexpected call to a mock function") } -func (ref refImageMock) Layers(layers ...string) error { +func (ref refImageMock) LayersCommand(layers ...string) error { panic("unexpected call to a mock function") } func (ref refImageMock) Inspect() (*types.ImageInspectInfo, error) { @@ -168,7 +168,7 @@ func (ref forbiddenImageMock) ManifestMatchesDigest(expectedDigest string) (bool func (ref forbiddenImageMock) Signatures() ([][]byte, error) { panic("unexpected call to a mock function") } -func (ref forbiddenImageMock) Layers(layers ...string) error { +func (ref forbiddenImageMock) LayersCommand(layers ...string) error { panic("unexpected call to a mock function") } func (ref forbiddenImageMock) Inspect() (*types.ImageInspectInfo, error) { diff --git a/types/types.go b/types/types.go index cacb58a5..c444718f 100644 --- a/types/types.go +++ b/types/types.go @@ -60,7 +60,10 @@ type Image interface { 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? + // LayersCommand implements (skopeo layers). Do not use for any other purpose. + // Longer-term we would like to move the command-specific code up to the command handler, + // but the command has functionality specific to util.DockerV2Schema1MIMEType manifests. + LayersCommand(layers ...string) error // configure download directory? // Inspect returns various information for (skopeo inspect) parsed from the manifest and configuration. Inspect() (*ImageInspectInfo, error) DockerTar() ([]byte, error) // ??? also, configure output directory