From 33d09b87ee23c6af042eb64aa67afc9fb2b19381 Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Wed, 23 Dec 2020 09:51:14 -0800 Subject: [PATCH] Drop v1util now that 0.3 is cut Fixes: https://github.com/google/go-containerregistry/issues/873 --- pkg/v1/v1util/verify.go | 23 ---------------------- pkg/v1/v1util/zip.go | 43 ----------------------------------------- 2 files changed, 66 deletions(-) delete mode 100644 pkg/v1/v1util/verify.go delete mode 100644 pkg/v1/v1util/zip.go diff --git a/pkg/v1/v1util/verify.go b/pkg/v1/v1util/verify.go deleted file mode 100644 index fdfea7cd64..0000000000 --- a/pkg/v1/v1util/verify.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 Google LLC All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package v1util - -import "github.com/google/go-containerregistry/pkg/v1/internal/verify" - -// VerifyReadCloser wraps the given io.ReadCloser to verify that its contents match -// the provided v1.Hash before io.EOF is returned. -// TODO(#873): Remove this package. -// Deprecated: please use v1.VerifyReadCloser -var VerifyReadCloser = verify.ReadCloser diff --git a/pkg/v1/v1util/zip.go b/pkg/v1/v1util/zip.go deleted file mode 100644 index e0dd734e0a..0000000000 --- a/pkg/v1/v1util/zip.go +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2018 Google LLC All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package v1util - -import "github.com/google/go-containerregistry/pkg/v1/internal/gzip" - -// GzipReadCloser reads uncompressed input data from the io.ReadCloser and -// returns an io.ReadCloser from which compressed data may be read. -// This uses gzip.BestSpeed for the compression level. -// TODO(#873): Remove this package. -// Deprecated: please move off of this API -var GzipReadCloser = gzip.ReadCloser - -// GzipReadCloserLevel reads uncompressed input data from the io.ReadCloser and -// returns an io.ReadCloser from which compressed data may be read. -// Refer to compress/gzip for the level: -// https://golang.org/pkg/compress/gzip/#pkg-constants -// TODO(#873): Remove this package. -// Deprecated: please move off of this API -var GzipReadCloserLevel = gzip.ReadCloserLevel - -// GunzipReadCloser reads compressed input data from the io.ReadCloser and -// returns an io.ReadCloser from which uncompessed data may be read. -// TODO(#873): Remove this package. -// Deprecated: please move off of this API -var GunzipReadCloser = gzip.UnzipReadCloser - -// IsGzipped detects whether the input stream is compressed. -// TODO(#873): Remove this package. -// Deprecated: please move off of this API -var IsGzipped = gzip.Is