From 5391721aa31a68bc658cda1d2de1e2d8381721d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Jul 2025 03:28:11 +0000 Subject: [PATCH] fix(deps): update common, image, and storage deps Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- .../v5/signature/internal/rekor_api_types.go | 2 ++ .../image/v5/signature/sigstore/rekor/rekor.go | 4 +++- vendor/github.com/containers/storage/Makefile | 2 +- .../tchap/go-patricia/v2/patricia/patricia.go | 2 +- vendor/modules.txt | 8 ++++---- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 68b5d24b9a..d9f407109f 100644 --- a/go.mod +++ b/go.mod @@ -12,14 +12,14 @@ require ( github.com/checkpoint-restore/go-criu/v7 v7.2.0 github.com/containernetworking/plugins v1.7.1 github.com/containers/buildah v1.40.1-0.20250604193037-b8d8cc375f30 - github.com/containers/common v0.63.2-0.20250627125909-bed7a8b142a3 + github.com/containers/common v0.63.2-0.20250701090630-c156ac84320e github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.8.6 - github.com/containers/image/v5 v5.35.1-0.20250627132650-84bfe041dbcc + github.com/containers/image/v5 v5.35.1-0.20250701145651-e3533743f666 github.com/containers/libhvee v0.10.0 github.com/containers/ocicrypt v1.2.1 github.com/containers/psgo v1.9.0 - github.com/containers/storage v1.58.1-0.20250625164029-83650abfa8de + github.com/containers/storage v1.58.1-0.20250701152554-3aa733962202 github.com/containers/winquit v1.1.0 github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09 github.com/crc-org/vfkit v0.6.1 @@ -166,7 +166,7 @@ require ( github.com/smallstep/pkcs7 v0.1.1 // indirect github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect github.com/sylabs/sif/v2 v2.21.1 // indirect - github.com/tchap/go-patricia/v2 v2.3.2 // indirect + github.com/tchap/go-patricia/v2 v2.3.3 // indirect github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.9.0 // indirect diff --git a/go.sum b/go.sum index e770d3f592..576c0de750 100644 --- a/go.sum +++ b/go.sum @@ -64,14 +64,14 @@ github.com/containernetworking/plugins v1.7.1 h1:CNAR0jviDj6FS5Vg85NTgKWLDzZPfi/ github.com/containernetworking/plugins v1.7.1/go.mod h1:xuMdjuio+a1oVQsHKjr/mgzuZ24leAsqUYRnzGoXHy0= github.com/containers/buildah v1.40.1-0.20250604193037-b8d8cc375f30 h1:kCt0fnVBvXY9J98pUDeUc0gHKrhRwaBTWWD3otLutCE= github.com/containers/buildah v1.40.1-0.20250604193037-b8d8cc375f30/go.mod h1:QDecwvjrr+e0VD5GYv2dw7tsiqrz673r8B4rIYFP11Y= -github.com/containers/common v0.63.2-0.20250627125909-bed7a8b142a3 h1:rdAIp2BR1tzfLhgf+CW6ERkUj1TDghUoBTf79+mYRS8= -github.com/containers/common v0.63.2-0.20250627125909-bed7a8b142a3/go.mod h1:gjzev1MLeaf3myYCfkeptujct/QKi1mJuzebRdwIul0= +github.com/containers/common v0.63.2-0.20250701090630-c156ac84320e h1:cCuLHWkEIdsMdvD8sqpXmTeujPdBqKQkk64bwp4toBM= +github.com/containers/common v0.63.2-0.20250701090630-c156ac84320e/go.mod h1:WyydvanMw4iZI2pnup5MbK7zyDvLUBTaTyva3fYwBwc= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/gvisor-tap-vsock v0.8.6 h1:9SeAXK+K2o36CtrgYk6zRXbU3zrayjvkrI8b7/O6u5A= github.com/containers/gvisor-tap-vsock v0.8.6/go.mod h1:+0mtKmm4STeSDnZe+DGnIwN4EH2f7AcWir7PwT28Ti0= -github.com/containers/image/v5 v5.35.1-0.20250627132650-84bfe041dbcc h1:mJ/fftOAdKuRp8hPlToXYXBDZBejK6kpIS45EoSDHEk= -github.com/containers/image/v5 v5.35.1-0.20250627132650-84bfe041dbcc/go.mod h1:XwvhNxeeqenT547u5y3haPiLr9wuRCH2TCcjkETRtBI= +github.com/containers/image/v5 v5.35.1-0.20250701145651-e3533743f666 h1:R3U1eWhAAOeoHnX0N8t+lewTqI1EeJPEemFRMnluaWU= +github.com/containers/image/v5 v5.35.1-0.20250701145651-e3533743f666/go.mod h1:5iH01tLpLfQd9QYOhmyIE9XGsvI1VF9AtkV8ZcIlvhs= github.com/containers/libhvee v0.10.0 h1:7VLv8keWZpHuGmWvyY4c1mVH5V1JYb1G78VC+8AlrM0= github.com/containers/libhvee v0.10.0/go.mod h1:at0h8lRcK5jCKfQgU/e6Io0Mw12F36zRLjXVOXRoDTM= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= @@ -82,8 +82,8 @@ github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpV github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ= github.com/containers/psgo v1.9.0 h1:eJ74jzSaCHnWt26OlKZROSyUyRcGDf+gYBdXnxrMW4g= github.com/containers/psgo v1.9.0/go.mod h1:0YoluUm43Mz2UnBIh1P+6V6NWcbpTL5uRtXyOcH0B5A= -github.com/containers/storage v1.58.1-0.20250625164029-83650abfa8de h1:Mlc8/KWeMJwmZ1ZXczZttOu3DvR9tyZxXxkPk796mFI= -github.com/containers/storage v1.58.1-0.20250625164029-83650abfa8de/go.mod h1:bgjPVDYMdJGvghV2oBHeAjha5QkgldLuV3qqUu6fpmk= +github.com/containers/storage v1.58.1-0.20250701152554-3aa733962202 h1:JV0pkbDShVyzX3c45WZU24Phq2LZ/dlG/SmlwTCQxXk= +github.com/containers/storage v1.58.1-0.20250701152554-3aa733962202/go.mod h1:uXFaVHnIkR0wMBWdK01TL8G0iVtZVYLJmFqZuqS4rCE= github.com/containers/winquit v1.1.0 h1:jArun04BNDQvt2W0Y78kh9TazN2EIEMG5Im6/JY7+pE= github.com/containers/winquit v1.1.0/go.mod h1:PsPeZlnbkmGGIToMPHF1zhWjBUkd8aHjMOr/vFcPxw8= github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk= @@ -420,8 +420,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/sylabs/sif/v2 v2.21.1 h1:GZ0b5//AFAqJEChd8wHV/uSKx/l1iuGYwjR8nx+4wPI= github.com/sylabs/sif/v2 v2.21.1/go.mod h1:YoqEGQnb5x/ItV653bawXHZJOXQaEWpGwHsSD3YePJI= -github.com/tchap/go-patricia/v2 v2.3.2 h1:xTHFutuitO2zqKAQ5rCROYgUb7Or/+IC3fts9/Yc7nM= -github.com/tchap/go-patricia/v2 v2.3.2/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= +github.com/tchap/go-patricia/v2 v2.3.3 h1:xfNEsODumaEcCcY3gI0hYPZ/PcpVv5ju6RMAhgwZDDc= +github.com/tchap/go-patricia/v2 v2.3.3/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs= github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= diff --git a/vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go b/vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go index a722ee385a..7b941f5365 100644 --- a/vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go +++ b/vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go @@ -81,6 +81,8 @@ type RekorHashedrekordV001SchemaDataHash struct { const ( RekorHashedrekordV001SchemaDataHashAlgorithmSha256 string = "sha256" + RekorHashedrekordV001SchemaDataHashAlgorithmSha384 string = "sha384" + RekorHashedrekordV001SchemaDataHashAlgorithmSha512 string = "sha512" ) type RekorHashedrekordV001SchemaSignature struct { diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor.go b/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor.go index 7b10fc8348..0518d88d1c 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor.go +++ b/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor.go @@ -14,6 +14,7 @@ import ( "github.com/containers/image/v5/signature/internal" signerInternal "github.com/containers/image/v5/signature/sigstore/internal" + "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-retryablehttp" "github.com/sirupsen/logrus" ) @@ -44,6 +45,7 @@ type rekorClient struct { // newRekorClient creates a rekorClient for rekorURL. func newRekorClient(rekorURL *url.URL) *rekorClient { retryableClient := retryablehttp.NewClient() + retryableClient.HTTPClient = cleanhttp.DefaultClient() retryableClient.RetryMax = defaultRetryCount retryableClient.Logger = leveledLoggerForLogrus(logrus.StandardLogger()) basePath := rekorURL.Path @@ -127,7 +129,7 @@ func stringPointer(s string) *string { // uploadKeyOrCert integrates this code into sigstore/internal.Signer. // Given components of the created signature, it returns a SET that should be added to the signature. func (r *rekorClient) uploadKeyOrCert(ctx context.Context, keyOrCertBytes []byte, signatureBytes []byte, payloadBytes []byte) ([]byte, error) { - payloadHash := sha256.Sum256(payloadBytes) // HashedRecord only accepts SHA-256 + payloadHash := sha256.Sum256(payloadBytes) // Consistent with cosign. hashedRekordSpec, err := json.Marshal(internal.RekorHashedrekordV001Schema{ Data: &internal.RekorHashedrekordV001SchemaData{ Hash: &internal.RekorHashedrekordV001SchemaDataHash{ diff --git a/vendor/github.com/containers/storage/Makefile b/vendor/github.com/containers/storage/Makefile index 91f925f412..5da38efdd3 100644 --- a/vendor/github.com/containers/storage/Makefile +++ b/vendor/github.com/containers/storage/Makefile @@ -35,7 +35,7 @@ TESTFLAGS := $(shell $(GO) test -race $(BUILDFLAGS) ./pkg/stringutils 2>&1 > /de # N/B: This value is managed by Renovate, manual changes are # possible, as long as they don't disturb the formatting # (i.e. DO NOT ADD A 'v' prefix!) -GOLANGCI_LINT_VERSION := 2.1.6 +GOLANGCI_LINT_VERSION := 2.2.1 default all: local-binary docs local-validate local-cross ## validate all checks, build and cross-build\nbinaries and docs diff --git a/vendor/github.com/tchap/go-patricia/v2/patricia/patricia.go b/vendor/github.com/tchap/go-patricia/v2/patricia/patricia.go index 7b9975e383..9bf8f4fec5 100644 --- a/vendor/github.com/tchap/go-patricia/v2/patricia/patricia.go +++ b/vendor/github.com/tchap/go-patricia/v2/patricia/patricia.go @@ -465,7 +465,7 @@ func (trie *Trie) compact() *Trie { // If any item is set, we cannot compact since we want to retain // the ability to do searching by key. This makes compaction less usable, // but that simply cannot be avoided. - if trie.item != nil || child.item != nil { + if child == nil || trie.item != nil || child.item != nil { return trie } diff --git a/vendor/modules.txt b/vendor/modules.txt index b8706a75ee..dbba298a43 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -141,7 +141,7 @@ github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/pkg/volumes github.com/containers/buildah/util -# github.com/containers/common v0.63.2-0.20250627125909-bed7a8b142a3 +# github.com/containers/common v0.63.2-0.20250701090630-c156ac84320e ## explicit; go 1.23.3 github.com/containers/common/internal github.com/containers/common/internal/attributedstring @@ -214,7 +214,7 @@ github.com/containers/conmon/runner/config # github.com/containers/gvisor-tap-vsock v0.8.6 ## explicit; go 1.23.0 github.com/containers/gvisor-tap-vsock/pkg/types -# github.com/containers/image/v5 v5.35.1-0.20250627132650-84bfe041dbcc +# github.com/containers/image/v5 v5.35.1-0.20250701145651-e3533743f666 ## explicit; go 1.23.3 github.com/containers/image/v5/copy github.com/containers/image/v5/directory @@ -324,7 +324,7 @@ github.com/containers/psgo/internal/dev github.com/containers/psgo/internal/host github.com/containers/psgo/internal/proc github.com/containers/psgo/internal/process -# github.com/containers/storage v1.58.1-0.20250625164029-83650abfa8de +# github.com/containers/storage v1.58.1-0.20250701152554-3aa733962202 ## explicit; go 1.23.0 github.com/containers/storage github.com/containers/storage/drivers @@ -883,7 +883,7 @@ github.com/stretchr/testify/require # github.com/sylabs/sif/v2 v2.21.1 ## explicit; go 1.23.0 github.com/sylabs/sif/v2/pkg/sif -# github.com/tchap/go-patricia/v2 v2.3.2 +# github.com/tchap/go-patricia/v2 v2.3.3 ## explicit; go 1.16 github.com/tchap/go-patricia/v2/patricia # github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399