From 415555014ad1c50499658bf47c74554a5c9d998a Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Mon, 26 Jul 2021 15:41:35 -0400 Subject: [PATCH] Unexport pkg/cosign/remote.StaticLayer (#483) Signed-off-by: Jason Hall --- pkg/cosign/remote/index.go | 6 +++--- pkg/cosign/remote/remote.go | 42 ++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkg/cosign/remote/index.go b/pkg/cosign/remote/index.go index 8ec8c192b22..3430c70e46e 100644 --- a/pkg/cosign/remote/index.go +++ b/pkg/cosign/remote/index.go @@ -105,9 +105,9 @@ func UploadFiles(ref name.Reference, files []File, getMt MediaTypeGetter, remote } func UploadFile(b []byte, ref name.Reference, layerMt, configMt types.MediaType, remoteOpts ...remote.Option) (v1.Image, error) { - l := &StaticLayer{ - B: b, - Mt: layerMt, + l := &staticLayer{ + b: b, + mt: layerMt, } emptyOci := mutate.MediaType(empty.Image, types.OCIManifestSchema1) diff --git a/pkg/cosign/remote/remote.go b/pkg/cosign/remote/remote.go index 177f2abb076..b330a1d9a76 100644 --- a/pkg/cosign/remote/remote.go +++ b/pkg/cosign/remote/remote.go @@ -92,9 +92,9 @@ func SignatureImage(ref name.Reference, opts ...remote.Option) (v1.Image, error) } func findDuplicate(sigImage v1.Image, payload []byte, dupeDetector signature.Verifier, annotations map[string]string) ([]byte, error) { - l := &StaticLayer{ - B: payload, - Mt: SimpleSigningMediaType, + l := &staticLayer{ + b: payload, + mt: SimpleSigningMediaType, } sigDigest, err := l.Digest() @@ -150,9 +150,9 @@ type UploadOpts struct { } func UploadSignature(signature, payload []byte, dst name.Reference, opts UploadOpts) (uploadedSig []byte, err error) { - l := &StaticLayer{ - B: payload, - Mt: SimpleSigningMediaType, + l := &staticLayer{ + b: payload, + mt: SimpleSigningMediaType, } base, err := SignatureImage(dst, opts.RemoteOpts...) @@ -194,38 +194,38 @@ func UploadSignature(signature, payload []byte, dst name.Reference, opts UploadO return signature, nil } -type StaticLayer struct { - B []byte - Mt types.MediaType +type staticLayer struct { + b []byte + mt types.MediaType } -func (l *StaticLayer) Digest() (v1.Hash, error) { - h, _, err := v1.SHA256(bytes.NewReader(l.B)) +func (l *staticLayer) Digest() (v1.Hash, error) { + h, _, err := v1.SHA256(bytes.NewReader(l.b)) return h, err } // DiffID returns the Hash of the uncompressed layer. -func (l *StaticLayer) DiffID() (v1.Hash, error) { - h, _, err := v1.SHA256(bytes.NewReader(l.B)) +func (l *staticLayer) DiffID() (v1.Hash, error) { + h, _, err := v1.SHA256(bytes.NewReader(l.b)) return h, err } // Compressed returns an io.ReadCloser for the compressed layer contents. -func (l *StaticLayer) Compressed() (io.ReadCloser, error) { - return ioutil.NopCloser(bytes.NewReader(l.B)), nil +func (l *staticLayer) Compressed() (io.ReadCloser, error) { + return ioutil.NopCloser(bytes.NewReader(l.b)), nil } // Uncompressed returns an io.ReadCloser for the uncompressed layer contents. -func (l *StaticLayer) Uncompressed() (io.ReadCloser, error) { - return ioutil.NopCloser(bytes.NewReader(l.B)), nil +func (l *staticLayer) Uncompressed() (io.ReadCloser, error) { + return ioutil.NopCloser(bytes.NewReader(l.b)), nil } // Size returns the compressed size of the Layer. -func (l *StaticLayer) Size() (int64, error) { - return int64(len(l.B)), nil +func (l *staticLayer) Size() (int64, error) { + return int64(len(l.b)), nil } // MediaType returns the media type of the Layer. -func (l *StaticLayer) MediaType() (types.MediaType, error) { - return l.Mt, nil +func (l *staticLayer) MediaType() (types.MediaType, error) { + return l.mt, nil }