diff --git a/cmd/catalogd/main.go b/cmd/catalogd/main.go index 84dbbe30b..e5f1678a0 100644 --- a/cmd/catalogd/main.go +++ b/cmd/catalogd/main.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/containers/image/v5/types" "github.com/spf13/cobra" + "go.podman.io/image/v5/types" "k8s.io/apimachinery/pkg/runtime" k8stypes "k8s.io/apimachinery/pkg/types" apimachineryrand "k8s.io/apimachinery/pkg/util/rand" diff --git a/cmd/operator-controller/main.go b/cmd/operator-controller/main.go index f1e7142ba..85f2e823d 100644 --- a/cmd/operator-controller/main.go +++ b/cmd/operator-controller/main.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/containers/image/v5/types" "github.com/spf13/cobra" + "go.podman.io/image/v5/types" rbacv1 "k8s.io/api/rbac/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" diff --git a/commitchecker.yaml b/commitchecker.yaml index ffc46417c..7f8f29178 100644 --- a/commitchecker.yaml +++ b/commitchecker.yaml @@ -1,4 +1,4 @@ -expectedMergeBase: 4867f92ba1bda49f4861627fb078177d2553f438 +expectedMergeBase: 27b05e75acd012f98e92adefe374303d13d5218d upstreamBranch: main upstreamOrg: operator-framework upstreamRepo: operator-controller diff --git a/go.mod b/go.mod index 83f3d2acd..5321a59d1 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/cert-manager/cert-manager v1.18.2 github.com/containerd/containerd v1.7.28 - github.com/containers/image/v5 v5.36.2 github.com/fsnotify/fsnotify v1.9.0 github.com/go-logr/logr v1.4.3 github.com/golang-jwt/jwt/v5 v5.3.0 @@ -21,11 +20,12 @@ require ( github.com/opencontainers/image-spec v1.1.1 github.com/operator-framework/api v0.34.0 github.com/operator-framework/helm-operator-plugins v0.8.0 - github.com/operator-framework/operator-registry v1.58.0 + github.com/operator-framework/operator-registry v1.59.0 github.com/prometheus/client_golang v1.23.2 github.com/prometheus/common v0.66.1 github.com/spf13/cobra v1.10.1 github.com/stretchr/testify v1.11.1 + go.podman.io/image/v5 v5.37.0 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b golang.org/x/mod v0.28.0 golang.org/x/sync v0.17.0 @@ -35,11 +35,11 @@ require ( k8s.io/apiextensions-apiserver v0.33.4 k8s.io/apimachinery v0.33.4 k8s.io/apiserver v0.33.4 - k8s.io/cli-runtime v0.33.3 + k8s.io/cli-runtime v0.33.4 k8s.io/client-go v0.33.4 k8s.io/component-base v0.33.4 k8s.io/klog/v2 v2.130.1 - k8s.io/kubernetes v1.33.2 + k8s.io/kubernetes v1.33.4 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 pkg.package-operator.run/boxcutter v0.7.0 sigs.k8s.io/controller-runtime v0.21.0 @@ -49,7 +49,7 @@ require ( ) require ( - k8s.io/component-helpers v0.33.2 // indirect + k8s.io/component-helpers v0.33.4 // indirect k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect ) @@ -79,13 +79,11 @@ require ( github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/platforms v0.2.1 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect github.com/containerd/ttrpc v1.2.7 // indirect github.com/containerd/typeurl/v2 v2.2.3 // indirect - github.com/containers/common v0.64.2 // indirect github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect github.com/containers/ocicrypt v1.2.1 // indirect - github.com/containers/storage v1.59.1 // indirect github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect github.com/cyphar/filepath-securejoin v0.4.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect @@ -94,7 +92,7 @@ require ( github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker v28.3.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.3 // indirect - github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-connections v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.13.0 // indirect github.com/evanphx/json-patch v5.9.11+incompatible // indirect @@ -187,14 +185,14 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/proglottis/gpgme v0.1.4 // indirect + github.com/proglottis/gpgme v0.1.5 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/procfs v0.17.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/rubenv/sql-migrate v1.8.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect - github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/sigstore/fulcio v1.7.1 // indirect github.com/sigstore/protobuf-specs v0.4.3 // indirect @@ -223,6 +221,8 @@ require ( go.opentelemetry.io/otel/sdk v1.37.0 // indirect go.opentelemetry.io/otel/trace v1.37.0 // indirect go.opentelemetry.io/proto/otlp v1.7.0 // indirect + go.podman.io/common v0.65.0 // indirect + go.podman.io/storage v1.60.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.42.0 // indirect @@ -258,62 +258,62 @@ require ( retract v1.5.0 // contains filename with ':' which causes failure creating module zip file -replace k8s.io/api => k8s.io/api v0.33.2 +replace k8s.io/api => k8s.io/api v0.33.4 -replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.2 +replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4 -replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.2 +replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.4 -replace k8s.io/apiserver => k8s.io/apiserver v0.33.2 +replace k8s.io/apiserver => k8s.io/apiserver v0.33.4 -replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.2 +replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4 -replace k8s.io/client-go => k8s.io/client-go v0.33.2 +replace k8s.io/client-go => k8s.io/client-go v0.33.4 -replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.2 +replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4 -replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2 +replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4 -replace k8s.io/code-generator => k8s.io/code-generator v0.33.2 +replace k8s.io/code-generator => k8s.io/code-generator v0.33.4 -replace k8s.io/component-base => k8s.io/component-base v0.33.2 +replace k8s.io/component-base => k8s.io/component-base v0.33.4 -replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.2 +replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.4 -replace k8s.io/controller-manager => k8s.io/controller-manager v0.33.2 +replace k8s.io/controller-manager => k8s.io/controller-manager v0.33.4 -replace k8s.io/cri-api => k8s.io/cri-api v0.33.2 +replace k8s.io/cri-api => k8s.io/cri-api v0.33.4 -replace k8s.io/cri-client => k8s.io/cri-client v0.33.2 +replace k8s.io/cri-client => k8s.io/cri-client v0.33.4 -replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.2 +replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4 -replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2 +replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.4 -replace k8s.io/endpointslice => k8s.io/endpointslice v0.33.2 +replace k8s.io/endpointslice => k8s.io/endpointslice v0.33.4 -replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.2 +replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.4 -replace k8s.io/kms => k8s.io/kms v0.33.2 +replace k8s.io/kms => k8s.io/kms v0.33.4 -replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2 +replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4 -replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2 +replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4 -replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2 +replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4 -replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2 +replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4 -replace k8s.io/kubectl => k8s.io/kubectl v0.33.2 +replace k8s.io/kubectl => k8s.io/kubectl v0.33.4 -replace k8s.io/kubelet => k8s.io/kubelet v0.33.2 +replace k8s.io/kubelet => k8s.io/kubelet v0.33.4 -replace k8s.io/kubernetes => k8s.io/kubernetes v1.33.2 +replace k8s.io/kubernetes => k8s.io/kubernetes v1.33.4 -replace k8s.io/metrics => k8s.io/metrics v0.33.2 +replace k8s.io/metrics => k8s.io/metrics v0.33.4 -replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.2 +replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.4 -replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.2 +replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4 -replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2 +replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4 diff --git a/go.sum b/go.sum index 8c09ff257..ccebb31a8 100644 --- a/go.sum +++ b/go.sum @@ -71,26 +71,20 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= -github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8= -github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU= +github.com/containerd/stargz-snapshotter/estargz v0.17.0 h1:+TyQIsR/zSFI1Rm31EQBwpAA1ovYgIKHy7kctL3sLcE= +github.com/containerd/stargz-snapshotter/estargz v0.17.0/go.mod h1:s06tWAiJcXQo9/8AReBCIo/QxcXFZ2n4qfsRnpl71SM= github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRqQ= github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40= github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= -github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSWf5I= -github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4= -github.com/containers/image/v5 v5.36.2 h1:GcxYQyAHRF/pLqR4p4RpvKllnNL8mOBn0eZnqJbfTwk= -github.com/containers/image/v5 v5.36.2/go.mod h1:b4GMKH2z/5t6/09utbse2ZiLK/c72GuGLFdp7K69eA4= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM= github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ= -github.com/containers/storage v1.59.1 h1:11Zu68MXsEQGBBd+GadPrHPpWeqjKS8hJDGiAHgIqDs= -github.com/containers/storage v1.59.1/go.mod h1:KoAYHnAjP3/cTsRS+mmWZGkufSY2GACiKQ4V3ZLQnR0= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= -github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= -github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo= +github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= @@ -118,8 +112,8 @@ github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjY github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= -github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= -github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94= +github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE= github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 h1:EHZfspsnLAz8Hzccd67D5abwLiqoqym2jz/jOS39mCk= github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= @@ -402,8 +396,8 @@ github.com/operator-framework/helm-operator-plugins v0.8.0 h1:0f6HOQC5likkf0b/Ov github.com/operator-framework/helm-operator-plugins v0.8.0/go.mod h1:Sc+8bE38xTCgCChBUvtq/PxatEg9fAypr7S5iAw8nlA= github.com/operator-framework/operator-lib v0.17.0 h1:cbz51wZ9+GpWR1ZYP4CSKSSBxDlWxmmnseaHVZZjZt4= github.com/operator-framework/operator-lib v0.17.0/go.mod h1:TGopBxIE8L6E/Cojzo26R3NFp1eNlqhQNmzqhOblaLw= -github.com/operator-framework/operator-registry v1.58.0 h1:CvfwYy19fBmsGBHEPQLwVvsYrQ3HQnqP9xQorBtz8nM= -github.com/operator-framework/operator-registry v1.58.0/go.mod h1:0MhOHp+BPGs9HBgbwtLSTKwmRKYIeD0aMnJesEXhIAw= +github.com/operator-framework/operator-registry v1.59.0 h1:SQhT0qMTYJXqStNhBOYXmLAMpS3eszzbcXAg5NLgJu8= +github.com/operator-framework/operator-registry v1.59.0/go.mod h1:QE1RRQGe+iau8sfY10DbP3+eoahH0G0l+coYrnEzJgI= github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8= github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I= github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs= @@ -419,8 +413,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= -github.com/proglottis/gpgme v0.1.4 h1:3nE7YNA70o2aLjcg63tXMOhPD7bplfE5CBdV+hLAm2M= -github.com/proglottis/gpgme v0.1.4/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM= +github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0= +github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM= github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o= github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -447,8 +441,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ= github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= -github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3mcNEL9NBPB0iuVjyxvq3LZc= -github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw= +github.com/secure-systems-lab/go-securesystemslib v0.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g= +github.com/secure-systems-lab/go-securesystemslib v0.9.1/go.mod h1:np53YzT0zXGMv6x4iEWc9Z59uR+x+ndLwCLqPYpLXVU= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= @@ -561,6 +555,12 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os= go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo= +go.podman.io/common v0.65.0 h1:8JNl25U4VpKDkFHSymSPm4te7ZQHJbfAB/l2FqtmYEg= +go.podman.io/common v0.65.0/go.mod h1:+lJu8KHeoDQsD9HDdiFaMaOUiqPLQnK406WuLnqM7Z0= +go.podman.io/image/v5 v5.37.0 h1:yzgQybwuWIIeK63hu+mQqna/wOh96XD5cpVc6j8Dg5M= +go.podman.io/image/v5 v5.37.0/go.mod h1:+s2Sx5dia/jVeT8tI3r2NAPrARMiDdbEq3QPIQogx3I= +go.podman.io/storage v1.60.0 h1:bWNSrR58nxg39VNFDSx3m0AswbvyzPGOo5XsUfomTao= +go.podman.io/storage v1.60.0/go.mod h1:NK+rsWJVuQeCM7ifv7cxD3abegWxwtW/3OkuSUJJoE4= go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -753,32 +753,32 @@ helm.sh/helm/v3 v3.18.6 h1:S/2CqcYnNfLckkHLI0VgQbxgcDaU3N4A/46E3n9wSNY= helm.sh/helm/v3 v3.18.6/go.mod h1:L/dXDR2r539oPlFP1PJqKAC1CUgqHJDLkxKpDGrWnyg= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY= -k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs= -k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8= -k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8= -k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY= -k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= -k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4= -k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M= -k8s.io/cli-runtime v0.33.2 h1:koNYQKSDdq5AExa/RDudXMhhtFasEg48KLS2KSAU74Y= -k8s.io/cli-runtime v0.33.2/go.mod h1:gnhsAWpovqf1Zj5YRRBBU7PFsRc6NkEkwYNQE+mXL88= -k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E= -k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo= -k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0= -k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k= -k8s.io/component-helpers v0.33.2 h1:AjCtYzst11NV8ensxV/2LEEXRwctqS7Bs44bje9Qcnw= -k8s.io/component-helpers v0.33.2/go.mod h1:PsPpiCk74n8pGWp1d6kjK/iSKBTyQfIacv02BNkMenU= -k8s.io/controller-manager v0.33.2 h1:HIs8PbdTOaY6wTOvKKLwoAHSO6GeDjmYS0Gjnd6rF+c= -k8s.io/controller-manager v0.33.2/go.mod h1:n8maAdN06E3cD0h5N0wuYBv9Qi9FePl7y6Iz3pfc9PY= +k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk= +k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc= +k8s.io/apiextensions-apiserver v0.33.4 h1:rtq5SeXiDbXmSwxsF0MLe2Mtv3SwprA6wp+5qh/CrOU= +k8s.io/apiextensions-apiserver v0.33.4/go.mod h1:mWXcZQkQV1GQyxeIjYApuqsn/081hhXPZwZ2URuJeSs= +k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s= +k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/apiserver v0.33.4 h1:6N0TEVA6kASUS3owYDIFJjUH6lgN8ogQmzZvaFFj1/Y= +k8s.io/apiserver v0.33.4/go.mod h1:8ODgXMnOoSPLMUg1aAzMFx+7wTJM+URil+INjbTZCok= +k8s.io/cli-runtime v0.33.4 h1:V8NSxGfh24XzZVhXmIGzsApdBpGq0RQS2u/Fz1GvJwk= +k8s.io/cli-runtime v0.33.4/go.mod h1:V+ilyokfqjT5OI+XE+O515K7jihtr0/uncwoyVqXaIU= +k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw= +k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY= +k8s.io/component-base v0.33.4 h1:Jvb/aw/tl3pfgnJ0E0qPuYLT0NwdYs1VXXYQmSuxJGY= +k8s.io/component-base v0.33.4/go.mod h1:567TeSdixWW2Xb1yYUQ7qk5Docp2kNznKL87eygY8Rc= +k8s.io/component-helpers v0.33.4 h1:DYHQPxWB3XIk7hwAQ4YczUelJ37PcUHfnLeee0qFqV8= +k8s.io/component-helpers v0.33.4/go.mod h1:kRgidIgCKFqOW/wy7D8IL3YOT3iaIRZu6FcTEyRr7WU= +k8s.io/controller-manager v0.33.4 h1:HmlzmmNPu8H+cKEpAIRz0ptqpveKcj7KrCx9G+HXRAg= +k8s.io/controller-manager v0.33.4/go.mod h1:CpO8RarLcs7zh0sE4pqz88quF3xU3Dc4ZDfshnB8hw4= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8= k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= -k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y= -k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI= -k8s.io/kubernetes v1.33.2 h1:Vk3hsCaazyMQ6CXhu029AEPlBoYsEnD8oEIC0bP2pWQ= -k8s.io/kubernetes v1.33.2/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00= +k8s.io/kubectl v0.33.4 h1:nXEI6Vi+oB9hXxoAHyHisXolm/l1qutK3oZQMak4N98= +k8s.io/kubectl v0.33.4/go.mod h1:Xe7P9X4DfILvKmlBsVqUtzktkI56lEj22SJW7cFy6nE= +k8s.io/kubernetes v1.33.4 h1:T1d5FLUYm3/KyUeV7YJhKTR980zHCHb7K2xhCSo3lE8= +k8s.io/kubernetes v1.33.4/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc= diff --git a/internal/catalogd/controllers/core/clustercatalog_controller.go b/internal/catalogd/controllers/core/clustercatalog_controller.go index b720af850..e968db7b9 100644 --- a/internal/catalogd/controllers/core/clustercatalog_controller.go +++ b/internal/catalogd/controllers/core/clustercatalog_controller.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/containers/image/v5/docker/reference" + "go.podman.io/image/v5/docker/reference" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/catalogd/controllers/core/clustercatalog_controller_test.go b/internal/catalogd/controllers/core/clustercatalog_controller_test.go index 95a18733a..76efafa22 100644 --- a/internal/catalogd/controllers/core/clustercatalog_controller_test.go +++ b/internal/catalogd/controllers/core/clustercatalog_controller_test.go @@ -10,11 +10,11 @@ import ( "testing/fstest" "time" - "github.com/containers/image/v5/docker/reference" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/image/v5/docker/reference" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" diff --git a/internal/shared/util/image/cache.go b/internal/shared/util/image/cache.go index d630a5d7a..a82505ed5 100644 --- a/internal/shared/util/image/cache.go +++ b/internal/shared/util/image/cache.go @@ -15,10 +15,10 @@ import ( "time" "github.com/containerd/containerd/archive" - "github.com/containers/image/v5/docker/reference" "github.com/google/renameio/v2" "github.com/opencontainers/go-digest" ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/registry" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/internal/shared/util/image/cache_test.go b/internal/shared/util/image/cache_test.go index 44f1a67ff..5f5e51b50 100644 --- a/internal/shared/util/image/cache_test.go +++ b/internal/shared/util/image/cache_test.go @@ -18,10 +18,10 @@ import ( "time" "github.com/containerd/containerd/archive" - "github.com/containers/image/v5/docker/reference" ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/image/v5/docker/reference" "helm.sh/helm/v3/pkg/registry" fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs" diff --git a/internal/shared/util/image/helm.go b/internal/shared/util/image/helm.go index c00d4000b..299f921df 100644 --- a/internal/shared/util/image/helm.go +++ b/internal/shared/util/image/helm.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/registry" diff --git a/internal/shared/util/image/helm_test.go b/internal/shared/util/image/helm_test.go index d7fa6d3de..b47162f2e 100644 --- a/internal/shared/util/image/helm_test.go +++ b/internal/shared/util/image/helm_test.go @@ -16,15 +16,15 @@ import ( "time" "github.com/containerd/containerd/archive" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/types" goregistry "github.com/google/go-containerregistry/pkg/registry" "github.com/opencontainers/go-digest" ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/types" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/registry" diff --git a/internal/shared/util/image/mocks.go b/internal/shared/util/image/mocks.go index 903983181..82e8226e2 100644 --- a/internal/shared/util/image/mocks.go +++ b/internal/shared/util/image/mocks.go @@ -6,8 +6,8 @@ import ( "iter" "time" - "github.com/containers/image/v5/docker/reference" ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" ) var _ Puller = (*MockPuller)(nil) diff --git a/internal/shared/util/image/pull.go b/internal/shared/util/image/pull.go index db9ea84c0..1fff90809 100644 --- a/internal/shared/util/image/pull.go +++ b/internal/shared/util/image/pull.go @@ -9,18 +9,18 @@ import ( "os" "time" - "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/types" "github.com/go-logr/logr" + "go.podman.io/image/v5/copy" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/types" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/internal/shared/util/image/pull_test.go b/internal/shared/util/image/pull_test.go index 5aca3d75e..45a04062f 100644 --- a/internal/shared/util/image/pull_test.go +++ b/internal/shared/util/image/pull_test.go @@ -15,15 +15,15 @@ import ( "github.com/BurntSushi/toml" "github.com/containerd/containerd/archive" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" "github.com/google/go-containerregistry/pkg/crane" "github.com/google/go-containerregistry/pkg/registry" "github.com/opencontainers/go-digest" ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" "sigs.k8s.io/controller-runtime/pkg/reconcile" fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs" diff --git a/requirements.txt b/requirements.txt index 9eebc12ae..ec821077a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ markdown2==2.5.4 MarkupSafe==3.0.2 mergedeep==1.3.4 mkdocs==1.6.1 -mkdocs-material==9.6.19 +mkdocs-material==9.6.20 mkdocs-material-extensions==1.3.1 packaging==25.0 paginate==0.5.7 diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go index 6aba0ef1f..8b804b7dd 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go +++ b/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go @@ -408,11 +408,11 @@ func readerFromEntries(entries ...*entry) io.Reader { defer tw.Close() for _, entry := range entries { if err := tw.WriteHeader(entry.header); err != nil { - pw.CloseWithError(fmt.Errorf("Failed to write tar header: %v", err)) + pw.CloseWithError(fmt.Errorf("failed to write tar header: %v", err)) return } if _, err := io.Copy(tw, entry.payload); err != nil { - pw.CloseWithError(fmt.Errorf("Failed to write tar payload: %v", err)) + pw.CloseWithError(fmt.Errorf("failed to write tar payload: %v", err)) return } } @@ -627,12 +627,12 @@ func (cr *countReadSeeker) Seek(offset int64, whence int) (int64, error) { switch whence { default: - return 0, fmt.Errorf("Unknown whence: %v", whence) + return 0, fmt.Errorf("unknown whence: %v", whence) case io.SeekStart: case io.SeekCurrent: offset += *cr.cPos case io.SeekEnd: - return 0, fmt.Errorf("Unsupported whence: %v", whence) + return 0, fmt.Errorf("unsupported whence: %v", whence) } if offset < 0 { diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/gzip.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/gzip.go index f24afe32f..88fa13b19 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/estargz/gzip.go +++ b/vendor/github.com/containerd/stargz-snapshotter/estargz/gzip.go @@ -109,7 +109,7 @@ func gzipFooterBytes(tocOff int64) []byte { header[0], header[1] = 'S', 'G' subfield := fmt.Sprintf("%016xSTARGZ", tocOff) binary.LittleEndian.PutUint16(header[2:4], uint16(len(subfield))) // little-endian per RFC1952 - gz.Header.Extra = append(header, []byte(subfield)...) + gz.Extra = append(header, []byte(subfield)...) gz.Close() if buf.Len() != FooterSize { panic(fmt.Sprintf("footer buffer = %d, not %d", buf.Len(), FooterSize)) @@ -136,7 +136,7 @@ func (gz *GzipDecompressor) ParseFooter(p []byte) (blobPayloadSize, tocOffset, t return 0, 0, 0, err } defer zr.Close() - extra := zr.Header.Extra + extra := zr.Extra si1, si2, subfieldlen, subfield := extra[0], extra[1], extra[2:4], extra[4:] if si1 != 'S' || si2 != 'G' { return 0, 0, 0, fmt.Errorf("invalid subfield IDs: %q, %q; want E, S", si1, si2) @@ -181,7 +181,7 @@ func (gz *LegacyGzipDecompressor) ParseFooter(p []byte) (blobPayloadSize, tocOff return 0, 0, 0, fmt.Errorf("legacy: failed to get footer gzip reader: %w", err) } defer zr.Close() - extra := zr.Header.Extra + extra := zr.Extra if len(extra) != 16+len("STARGZ") { return 0, 0, 0, fmt.Errorf("legacy: invalid stargz's extra field size") } diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/testutil.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/testutil.go index ba650b4d1..a8dcdb868 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/estargz/testutil.go +++ b/vendor/github.com/containerd/stargz-snapshotter/estargz/testutil.go @@ -357,14 +357,15 @@ func compressBlob(t *testing.T, src *io.SectionReader, srcCompression int) *io.S buf := new(bytes.Buffer) var w io.WriteCloser var err error - if srcCompression == gzipType { + switch srcCompression { + case gzipType: w = gzip.NewWriter(buf) - } else if srcCompression == zstdType { + case zstdType: w, err = zstd.NewWriter(buf) if err != nil { t.Fatalf("failed to init zstd writer: %v", err) } - } else { + default: return src } src.Seek(0, io.SeekStart) @@ -445,7 +446,7 @@ func contains(t *testing.T, a, b stargzEntry) bool { bbytes, bnext, bok := readOffset(t, bf, nr, b) if !aok && !bok { break - } else if !(aok && bok) || anext != bnext { + } else if !aok || !bok || anext != bnext { t.Logf("%q != %q (offset=%d): chunk existence a=%v vs b=%v, anext=%v vs bnext=%v", ae.Name, be.Name, nr, aok, bok, anext, bnext) return false @@ -2346,8 +2347,8 @@ func CheckGzipHasStreams(t *testing.T, b []byte, streams []int64) { t.Fatalf("countStreams(gzip), Copy: %v", err) } var extra string - if len(zr.Header.Extra) > 0 { - extra = fmt.Sprintf("; extra=%q", zr.Header.Extra) + if len(zr.Extra) > 0 { + extra = fmt.Sprintf("; extra=%q", zr.Extra) } t.Logf(" [%d] at %d in stargz, uncompressed length %d%s", numStreams, zoff, n, extra) delete(wants, int64(zoff)) diff --git a/vendor/github.com/docker/go-connections/tlsconfig/config.go b/vendor/github.com/docker/go-connections/tlsconfig/config.go index 606c98a38..8b0264f68 100644 --- a/vendor/github.com/docker/go-connections/tlsconfig/config.go +++ b/vendor/github.com/docker/go-connections/tlsconfig/config.go @@ -34,51 +34,37 @@ type Options struct { // the system pool will be used. ExclusiveRootPools bool MinVersion uint16 - // If Passphrase is set, it will be used to decrypt a TLS private key - // if the key is encrypted. - // - // Deprecated: Use of encrypted TLS private keys has been deprecated, and - // will be removed in a future release. Golang has deprecated support for - // legacy PEM encryption (as specified in RFC 1423), as it is insecure by - // design (see https://go-review.googlesource.com/c/go/+/264159). - Passphrase string -} - -// Extra (server-side) accepted CBC cipher suites - will phase out in the future -var acceptedCBCCiphers = []uint16{ - tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, - tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, - tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, - tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, } // DefaultServerAcceptedCiphers should be uses by code which already has a crypto/tls // options struct but wants to use a commonly accepted set of TLS cipher suites, with // known weak algorithms removed. -var DefaultServerAcceptedCiphers = append(clientCipherSuites, acceptedCBCCiphers...) +var DefaultServerAcceptedCiphers = defaultCipherSuites + +// defaultCipherSuites is shared by both client and server as the default set. +var defaultCipherSuites = []uint16{ + tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, + tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, + tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, + tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, +} // ServerDefault returns a secure-enough TLS configuration for the server TLS configuration. func ServerDefault(ops ...func(*tls.Config)) *tls.Config { - tlsConfig := &tls.Config{ - // Avoid fallback by default to SSL protocols < TLS1.2 - MinVersion: tls.VersionTLS12, - PreferServerCipherSuites: true, - CipherSuites: DefaultServerAcceptedCiphers, - } - - for _, op := range ops { - op(tlsConfig) - } - - return tlsConfig + return defaultConfig(ops...) } // ClientDefault returns a secure-enough TLS configuration for the client TLS configuration. func ClientDefault(ops ...func(*tls.Config)) *tls.Config { + return defaultConfig(ops...) +} + +// defaultConfig is the default config used by both client and server TLS configuration. +func defaultConfig(ops ...func(*tls.Config)) *tls.Config { tlsConfig := &tls.Config{ - // Prefer TLS1.2 as the client minimum + // Avoid fallback by default to SSL protocols < TLS1.2 MinVersion: tls.VersionTLS12, - CipherSuites: clientCipherSuites, + CipherSuites: defaultCipherSuites, } for _, op := range ops { @@ -92,13 +78,13 @@ func ClientDefault(ops ...func(*tls.Config)) *tls.Config { func certPool(caFile string, exclusivePool bool) (*x509.CertPool, error) { // If we should verify the server, we need to load a trusted ca var ( - certPool *x509.CertPool - err error + pool *x509.CertPool + err error ) if exclusivePool { - certPool = x509.NewCertPool() + pool = x509.NewCertPool() } else { - certPool, err = SystemCertPool() + pool, err = SystemCertPool() if err != nil { return nil, fmt.Errorf("failed to read system certificates: %v", err) } @@ -107,10 +93,10 @@ func certPool(caFile string, exclusivePool bool) (*x509.CertPool, error) { if err != nil { return nil, fmt.Errorf("could not read CA certificate %q: %v", caFile, err) } - if !certPool.AppendCertsFromPEM(pemData) { + if !pool.AppendCertsFromPEM(pemData) { return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile) } - return certPool, nil + return pool, nil } // allTLSVersions lists all the TLS versions and is used by the code that validates @@ -144,34 +130,32 @@ func adjustMinVersion(options Options, config *tls.Config) error { return nil } -// IsErrEncryptedKey returns true if the 'err' is an error of incorrect -// password when trying to decrypt a TLS private key. +// errEncryptedKeyDeprecated is produced when we encounter an encrypted +// (password-protected) key. From https://go-review.googlesource.com/c/go/+/264159; // -// Deprecated: Use of encrypted TLS private keys has been deprecated, and -// will be removed in a future release. Golang has deprecated support for -// legacy PEM encryption (as specified in RFC 1423), as it is insecure by -// design (see https://go-review.googlesource.com/c/go/+/264159). -func IsErrEncryptedKey(err error) bool { - return errors.Is(err, x509.IncorrectPasswordError) -} +// > Legacy PEM encryption as specified in RFC 1423 is insecure by design. Since +// > it does not authenticate the ciphertext, it is vulnerable to padding oracle +// > attacks that can let an attacker recover the plaintext +// > +// > It's unfortunate that we don't implement PKCS#8 encryption so we can't +// > recommend an alternative but PEM encryption is so broken that it's worth +// > deprecating outright. +// +// Also see https://docs.docker.com/go/deprecated/ +var errEncryptedKeyDeprecated = errors.New("private key is encrypted; encrypted private keys are obsolete, and not supported") // getPrivateKey returns the private key in 'keyBytes', in PEM-encoded format. -// If the private key is encrypted, 'passphrase' is used to decrypted the -// private key. -func getPrivateKey(keyBytes []byte, passphrase string) ([]byte, error) { +// It returns an error if the file could not be decoded or was protected by +// a passphrase. +func getPrivateKey(keyBytes []byte) ([]byte, error) { // this section makes some small changes to code from notary/tuf/utils/x509.go pemBlock, _ := pem.Decode(keyBytes) if pemBlock == nil { return nil, fmt.Errorf("no valid private key found") } - var err error if x509.IsEncryptedPEMBlock(pemBlock) { //nolint:staticcheck // Ignore SA1019 (IsEncryptedPEMBlock is deprecated) - keyBytes, err = x509.DecryptPEMBlock(pemBlock, []byte(passphrase)) //nolint:staticcheck // Ignore SA1019 (DecryptPEMBlock is deprecated) - if err != nil { - return nil, fmt.Errorf("private key is encrypted, but could not decrypt it: %w", err) - } - keyBytes = pem.EncodeToMemory(&pem.Block{Type: pemBlock.Type, Bytes: keyBytes}) + return nil, errEncryptedKeyDeprecated } return keyBytes, nil @@ -195,7 +179,7 @@ func getCert(options Options) ([]tls.Certificate, error) { return nil, err } - prKeyBytes, err = getPrivateKey(prKeyBytes, options.Passphrase) + prKeyBytes, err = getPrivateKey(prKeyBytes) if err != nil { return nil, err } @@ -210,7 +194,7 @@ func getCert(options Options) ([]tls.Certificate, error) { // Client returns a TLS configuration meant to be used by a client. func Client(options Options) (*tls.Config, error) { - tlsConfig := ClientDefault() + tlsConfig := defaultConfig() tlsConfig.InsecureSkipVerify = options.InsecureSkipVerify if !options.InsecureSkipVerify && options.CAFile != "" { CAs, err := certPool(options.CAFile, options.ExclusiveRootPools) @@ -235,7 +219,7 @@ func Client(options Options) (*tls.Config, error) { // Server returns a TLS configuration meant to be used by a server. func Server(options Options) (*tls.Config, error) { - tlsConfig := ServerDefault() + tlsConfig := defaultConfig() tlsConfig.ClientAuth = options.ClientAuth tlsCert, err := tls.LoadX509KeyPair(options.CertFile, options.KeyFile) if err != nil { diff --git a/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go deleted file mode 100644 index a82f9fa52..000000000 --- a/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go +++ /dev/null @@ -1,14 +0,0 @@ -// Package tlsconfig provides primitives to retrieve secure-enough TLS configurations for both clients and servers. -package tlsconfig - -import ( - "crypto/tls" -) - -// Client TLS cipher suites (dropping CBC ciphers for client preferred suite set) -var clientCipherSuites = []uint16{ - tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, - tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, - tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, -} diff --git a/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/registry.go b/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/registry.go index 9c421dc68..9d9575942 100644 --- a/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/registry.go +++ b/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/registry.go @@ -19,9 +19,9 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" "github.com/containerd/errdefs" - "github.com/containers/image/v5/docker/reference" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" diff --git a/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/resolver.go b/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/resolver.go index 95e343f4c..5d0366f81 100644 --- a/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/resolver.go +++ b/vendor/github.com/operator-framework/operator-registry/pkg/image/containerdregistry/resolver.go @@ -7,10 +7,10 @@ import ( "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" - "github.com/containers/common/pkg/auth" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/types" dockerconfig "github.com/docker/cli/cli/config" + "go.podman.io/common/pkg/auth" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/types" ) func NewResolver(client *http.Client, configDir string, plainHTTP bool, repo string) (remotes.Resolver, error) { diff --git a/vendor/github.com/proglottis/gpgme/gpgme.go b/vendor/github.com/proglottis/gpgme/gpgme.go index 15af69c86..62a095c12 100644 --- a/vendor/github.com/proglottis/gpgme/gpgme.go +++ b/vendor/github.com/proglottis/gpgme/gpgme.go @@ -877,6 +877,12 @@ func (k *Key) KeyListMode() KeyListMode { return res } +func (k *Key) Fingerprint() string { + res := C.GoString(k.k.fpr) + runtime.KeepAlive(k) + return res +} + type SubKey struct { k C.gpgme_subkey_t parent *Key // make sure the key is not released when we have a reference to a subkey diff --git a/vendor/github.com/containers/common/LICENSE b/vendor/go.podman.io/common/LICENSE similarity index 100% rename from vendor/github.com/containers/common/LICENSE rename to vendor/go.podman.io/common/LICENSE diff --git a/vendor/github.com/containers/common/pkg/auth/auth.go b/vendor/go.podman.io/common/pkg/auth/auth.go similarity index 96% rename from vendor/github.com/containers/common/pkg/auth/auth.go rename to vendor/go.podman.io/common/pkg/auth/auth.go index 4bcd490db..8cb9f3a63 100644 --- a/vendor/github.com/containers/common/pkg/auth/auth.go +++ b/vendor/go.podman.io/common/pkg/auth/auth.go @@ -10,15 +10,15 @@ import ( "path/filepath" "strings" - passwd "github.com/containers/common/pkg/password" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/sirupsen/logrus" + passwd "go.podman.io/common/pkg/password" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) // ErrNewCredentialsInvalid means that the new user-provided credentials are @@ -320,7 +320,7 @@ func getUserAndPass(opts *LoginOptions, password, userFromAuthFile string) (user return strings.TrimSpace(username), password, err } -// Logout implements a “log out” command with the provided opts and args +// Logout implements a “log out” command with the provided opts and args. func Logout(systemContext *types.SystemContext, opts *LogoutOptions, args []string) error { if err := CheckAuthFile(opts.AuthFile); err != nil { return err @@ -390,7 +390,7 @@ func Logout(systemContext *types.SystemContext, opts *LogoutOptions, args []stri } // defaultRegistryWhenUnspecified returns first registry from search list of registry.conf -// used by login/logout when registry argument is not specified +// used by login/logout when registry argument is not specified. func defaultRegistryWhenUnspecified(systemContext *types.SystemContext) (string, error) { registriesFromFile, err := sysregistriesv2.UnqualifiedSearchRegistries(systemContext) if err != nil { diff --git a/vendor/github.com/containers/common/pkg/auth/cli.go b/vendor/go.podman.io/common/pkg/auth/cli.go similarity index 96% rename from vendor/github.com/containers/common/pkg/auth/cli.go rename to vendor/go.podman.io/common/pkg/auth/cli.go index 60e02e51e..3546ccbeb 100644 --- a/vendor/github.com/containers/common/pkg/auth/cli.go +++ b/vendor/go.podman.io/common/pkg/auth/cli.go @@ -3,13 +3,13 @@ package auth import ( "io" - "github.com/containers/common/pkg/completion" "github.com/spf13/pflag" + "go.podman.io/common/pkg/completion" ) // LoginOptions represents common flags in login // In addition, the caller should probably provide a --tls-verify flag (that affects the provided -// *types.SystemContest) +// *types.SystemContest). type LoginOptions struct { // CLI flags managed by the FlagSet returned by GetLoginFlags // Callers that use GetLoginFlags should not need to touch these values at all; callers that use @@ -30,7 +30,7 @@ type LoginOptions struct { NoWriteBack bool // set to true to not write the credentials to the authfile/cred helpers } -// LogoutOptions represents the results for flags in logout +// LogoutOptions represents the results for flags in logout. type LogoutOptions struct { // CLI flags managed by the FlagSet returned by GetLogoutFlags // Callers that use GetLogoutFlags should not need to touch these values at all; callers that use @@ -44,7 +44,7 @@ type LogoutOptions struct { AcceptUnspecifiedRegistry bool // set to true if allows logout with unspecified registry } -// GetLoginFlags defines and returns login flags for containers tools +// GetLoginFlags defines and returns login flags for containers tools. func GetLoginFlags(flags *LoginOptions) *pflag.FlagSet { fs := pflag.FlagSet{} fs.StringVar(&flags.AuthFile, "authfile", "", "path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") @@ -58,7 +58,7 @@ func GetLoginFlags(flags *LoginOptions) *pflag.FlagSet { return &fs } -// GetLoginFlagsCompletions returns the FlagCompletions for the login flags +// GetLoginFlagsCompletions returns the FlagCompletions for the login flags. func GetLoginFlagsCompletions() completion.FlagCompletions { flagCompletion := completion.FlagCompletions{} flagCompletion["authfile"] = completion.AutocompleteDefault @@ -69,7 +69,7 @@ func GetLoginFlagsCompletions() completion.FlagCompletions { return flagCompletion } -// GetLogoutFlags defines and returns logout flags for containers tools +// GetLogoutFlags defines and returns logout flags for containers tools. func GetLogoutFlags(flags *LogoutOptions) *pflag.FlagSet { fs := pflag.FlagSet{} fs.StringVar(&flags.AuthFile, "authfile", "", "path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") @@ -78,7 +78,7 @@ func GetLogoutFlags(flags *LogoutOptions) *pflag.FlagSet { return &fs } -// GetLogoutFlagsCompletions returns the FlagCompletions for the logout flags +// GetLogoutFlagsCompletions returns the FlagCompletions for the logout flags. func GetLogoutFlagsCompletions() completion.FlagCompletions { flagCompletion := completion.FlagCompletions{} flagCompletion["authfile"] = completion.AutocompleteDefault diff --git a/vendor/github.com/containers/common/pkg/capabilities/capabilities.go b/vendor/go.podman.io/common/pkg/capabilities/capabilities.go similarity index 99% rename from vendor/github.com/containers/common/pkg/capabilities/capabilities.go rename to vendor/go.podman.io/common/pkg/capabilities/capabilities.go index 371fbba9a..d88d747ff 100644 --- a/vendor/github.com/containers/common/pkg/capabilities/capabilities.go +++ b/vendor/go.podman.io/common/pkg/capabilities/capabilities.go @@ -127,7 +127,7 @@ func ValidateCapabilities(caps []string) error { // // Note that: // "ALL" in capAdd adds returns known capabilities -// "All" in capDrop returns only the capabilities specified in capAdd +// "All" in capDrop returns only the capabilities specified in capAdd. func MergeCapabilities(base, adds, drops []string) ([]string, error) { // Normalize the base capabilities base, err := NormalizeCapabilities(base) diff --git a/vendor/github.com/containers/common/pkg/completion/completion.go b/vendor/go.podman.io/common/pkg/completion/completion.go similarity index 94% rename from vendor/github.com/containers/common/pkg/completion/completion.go rename to vendor/go.podman.io/common/pkg/completion/completion.go index 908d568ff..fef95b7f3 100644 --- a/vendor/github.com/containers/common/pkg/completion/completion.go +++ b/vendor/go.podman.io/common/pkg/completion/completion.go @@ -6,11 +6,11 @@ import ( "strings" "unicode" - "github.com/containers/common/pkg/capabilities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/capabilities" ) -// FlagCompletions - hold flag completion functions to be applied later with CompleteCommandFlags() +// FlagCompletions - hold flag completion functions to be applied later with CompleteCommandFlags(). type FlagCompletions map[string]func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) // CompleteCommandFlags - Add completion functions for each flagname in FlagCompletions. @@ -22,7 +22,7 @@ func CompleteCommandFlags(cmd *cobra.Command, flags FlagCompletions) { /* Autocomplete Functions for cobra ValidArgsFunction */ -// AutocompleteNone - Block the default shell completion (no paths) +// AutocompleteNone - Block the default shell completion (no paths). func AutocompleteNone(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { return nil, cobra.ShellCompDirectiveNoFileComp } @@ -61,7 +61,7 @@ func AutocompleteCapabilities(_ *cobra.Command, _ []string, toComplete string) ( return completions, cobra.ShellCompDirectiveNoFileComp } -// autocompleteSubIDName - autocomplete the names in /etc/subuid or /etc/subgid +// autocompleteSubIDName - autocomplete the names in /etc/subuid or /etc/subgid. func autocompleteSubIDName(filename string) ([]string, cobra.ShellCompDirective) { file, err := os.Open(filename) if err != nil { @@ -92,7 +92,7 @@ func AutocompleteSubuidName(_ *cobra.Command, _ []string, _ string) ([]string, c return autocompleteSubIDName("/etc/subuid") } -// AutocompleteArch - Autocomplete platform supported by container engines +// AutocompletePlatform - Autocomplete platform supported by container engines. func AutocompletePlatform(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { completions := []string{ "linux/386", @@ -114,7 +114,7 @@ func AutocompletePlatform(_ *cobra.Command, _ []string, _ string) ([]string, cob return completions, cobra.ShellCompDirectiveNoFileComp } -// AutocompleteArch - Autocomplete architectures supported by container engines +// AutocompleteArch - Autocomplete architectures supported by container engines. func AutocompleteArch(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { completions := []string{ "386", @@ -134,19 +134,19 @@ func AutocompleteArch(_ *cobra.Command, _ []string, _ string) ([]string, cobra.S return completions, cobra.ShellCompDirectiveNoFileComp } -// AutocompleteOS - Autocomplete OS supported by container engines +// AutocompleteOS - Autocomplete OS supported by container engines. func AutocompleteOS(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { completions := []string{"linux", "windows"} return completions, cobra.ShellCompDirectiveNoFileComp } // AutocompleteJSONFormat - Autocomplete format flag option. -// -> "json" +// -> "json". func AutocompleteJSONFormat(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { return []string{"json"}, cobra.ShellCompDirectiveNoFileComp } -// AutocompleteOneArg - Autocomplete one random arg +// AutocompleteOneArg - Autocomplete one random arg. func AutocompleteOneArg(_ *cobra.Command, args []string, _ string) ([]string, cobra.ShellCompDirective) { if len(args) == 1 { return nil, cobra.ShellCompDirectiveDefault diff --git a/vendor/github.com/containers/common/pkg/password/password_supported.go b/vendor/go.podman.io/common/pkg/password/password_supported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/password/password_supported.go rename to vendor/go.podman.io/common/pkg/password/password_supported.go diff --git a/vendor/github.com/containers/common/pkg/password/password_windows.go b/vendor/go.podman.io/common/pkg/password/password_windows.go similarity index 100% rename from vendor/github.com/containers/common/pkg/password/password_windows.go rename to vendor/go.podman.io/common/pkg/password/password_windows.go diff --git a/vendor/github.com/containers/image/v5/LICENSE b/vendor/go.podman.io/image/v5/LICENSE similarity index 100% rename from vendor/github.com/containers/image/v5/LICENSE rename to vendor/go.podman.io/image/v5/LICENSE diff --git a/vendor/github.com/containers/image/v5/copy/blob.go b/vendor/go.podman.io/image/v5/copy/blob.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/blob.go rename to vendor/go.podman.io/image/v5/copy/blob.go index 8d5580d7c..a881e0623 100644 --- a/vendor/github.com/containers/image/v5/copy/blob.go +++ b/vendor/go.podman.io/image/v5/copy/blob.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/private" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/private" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // copyBlobFromStream copies a blob with srcInfo (with known Digest and Annotations and possibly known Size) from srcReader to dest, diff --git a/vendor/github.com/containers/image/v5/copy/compression.go b/vendor/go.podman.io/image/v5/copy/compression.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/compression.go rename to vendor/go.podman.io/image/v5/copy/compression.go index fb5e1b174..0ecc85186 100644 --- a/vendor/github.com/containers/image/v5/copy/compression.go +++ b/vendor/go.podman.io/image/v5/copy/compression.go @@ -6,14 +6,14 @@ import ( "io" "maps" - internalblobinfocache "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" - chunkedToc "github.com/containers/storage/pkg/chunked/toc" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + internalblobinfocache "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" + chunkedToc "go.podman.io/storage/pkg/chunked/toc" ) var ( diff --git a/vendor/github.com/containers/image/v5/copy/copy.go b/vendor/go.podman.io/image/v5/copy/copy.go similarity index 96% rename from vendor/github.com/containers/image/v5/copy/copy.go rename to vendor/go.podman.io/image/v5/copy/copy.go index 44675f37c..eed5f8d96 100644 --- a/vendor/github.com/containers/image/v5/copy/copy.go +++ b/vendor/go.podman.io/image/v5/copy/copy.go @@ -9,23 +9,23 @@ import ( "slices" "time" - "github.com/containers/image/v5/docker/reference" - internalblobinfocache "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/imagedestination" - "github.com/containers/image/v5/internal/imagesource" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/signature/signer" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + internalblobinfocache "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/imagedestination" + "go.podman.io/image/v5/internal/imagesource" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/signature/signer" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" "golang.org/x/sync/semaphore" "golang.org/x/term" ) diff --git a/vendor/github.com/containers/image/v5/copy/digesting_reader.go b/vendor/go.podman.io/image/v5/copy/digesting_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/copy/digesting_reader.go rename to vendor/go.podman.io/image/v5/copy/digesting_reader.go diff --git a/vendor/github.com/containers/image/v5/copy/encryption.go b/vendor/go.podman.io/image/v5/copy/encryption.go similarity index 99% rename from vendor/github.com/containers/image/v5/copy/encryption.go rename to vendor/go.podman.io/image/v5/copy/encryption.go index b5a88a914..59aecf1a1 100644 --- a/vendor/github.com/containers/image/v5/copy/encryption.go +++ b/vendor/go.podman.io/image/v5/copy/encryption.go @@ -6,9 +6,9 @@ import ( "slices" "strings" - "github.com/containers/image/v5/types" "github.com/containers/ocicrypt" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/types" ) // isOciEncrypted returns a bool indicating if a mediatype is encrypted diff --git a/vendor/github.com/containers/image/v5/copy/manifest.go b/vendor/go.podman.io/image/v5/copy/manifest.go similarity index 97% rename from vendor/github.com/containers/image/v5/copy/manifest.go rename to vendor/go.podman.io/image/v5/copy/manifest.go index 97837f9f2..2fce87a48 100644 --- a/vendor/github.com/containers/image/v5/copy/manifest.go +++ b/vendor/go.podman.io/image/v5/copy/manifest.go @@ -7,13 +7,13 @@ import ( "slices" "strings" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // preferredManifestMIMETypes lists manifest MIME types in order of our preference, if we can't use the original manifest and need to convert. diff --git a/vendor/github.com/containers/image/v5/copy/multiple.go b/vendor/go.podman.io/image/v5/copy/multiple.go similarity index 97% rename from vendor/github.com/containers/image/v5/copy/multiple.go rename to vendor/go.podman.io/image/v5/copy/multiple.go index b0c107e8c..0594aa20f 100644 --- a/vendor/github.com/containers/image/v5/copy/multiple.go +++ b/vendor/go.podman.io/image/v5/copy/multiple.go @@ -10,15 +10,15 @@ import ( "sort" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" ) type instanceCopyKind int diff --git a/vendor/github.com/containers/image/v5/copy/progress_bars.go b/vendor/go.podman.io/image/v5/copy/progress_bars.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/progress_bars.go rename to vendor/go.podman.io/image/v5/copy/progress_bars.go index 59f41d216..533634682 100644 --- a/vendor/github.com/containers/image/v5/copy/progress_bars.go +++ b/vendor/go.podman.io/image/v5/copy/progress_bars.go @@ -7,10 +7,10 @@ import ( "math" "time" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // newProgressPool creates a *mpb.Progress. diff --git a/vendor/github.com/containers/image/v5/copy/progress_channel.go b/vendor/go.podman.io/image/v5/copy/progress_channel.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/progress_channel.go rename to vendor/go.podman.io/image/v5/copy/progress_channel.go index d5e9e09bd..f57646156 100644 --- a/vendor/github.com/containers/image/v5/copy/progress_channel.go +++ b/vendor/go.podman.io/image/v5/copy/progress_channel.go @@ -4,7 +4,7 @@ import ( "io" "time" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // progressReader is a reader that reports its progress to a types.ProgressProperties channel on an interval. diff --git a/vendor/github.com/containers/image/v5/copy/sign.go b/vendor/go.podman.io/image/v5/copy/sign.go similarity index 90% rename from vendor/github.com/containers/image/v5/copy/sign.go rename to vendor/go.podman.io/image/v5/copy/sign.go index 7ddfe917b..96038f3f8 100644 --- a/vendor/github.com/containers/image/v5/copy/sign.go +++ b/vendor/go.podman.io/image/v5/copy/sign.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/private" - internalsig "github.com/containers/image/v5/internal/signature" - internalSigner "github.com/containers/image/v5/internal/signer" - "github.com/containers/image/v5/signature/sigstore" - "github.com/containers/image/v5/signature/simplesigning" - "github.com/containers/image/v5/transports" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/private" + internalsig "go.podman.io/image/v5/internal/signature" + internalSigner "go.podman.io/image/v5/internal/signer" + "go.podman.io/image/v5/signature/sigstore" + "go.podman.io/image/v5/signature/simplesigning" + "go.podman.io/image/v5/transports" ) // setupSigners initializes c.signers. diff --git a/vendor/github.com/containers/image/v5/copy/single.go b/vendor/go.podman.io/image/v5/copy/single.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/single.go rename to vendor/go.podman.io/image/v5/copy/single.go index 19d410a61..5c81fd2d5 100644 --- a/vendor/github.com/containers/image/v5/copy/single.go +++ b/vendor/go.podman.io/image/v5/copy/single.go @@ -13,21 +13,21 @@ import ( "strings" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/pkg/platform" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - chunkedToc "github.com/containers/storage/pkg/chunked/toc" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" "github.com/vbauerster/mpb/v8" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/pkg/platform" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + chunkedToc "go.podman.io/storage/pkg/chunked/toc" ) // imageCopier tracks state specific to a single image (possibly an item of a manifest list) diff --git a/vendor/github.com/containers/image/v5/directory/explicitfilepath/path.go b/vendor/go.podman.io/image/v5/directory/explicitfilepath/path.go similarity index 98% rename from vendor/github.com/containers/image/v5/directory/explicitfilepath/path.go rename to vendor/go.podman.io/image/v5/directory/explicitfilepath/path.go index 69c1e0727..0f92d4a5e 100644 --- a/vendor/github.com/containers/image/v5/directory/explicitfilepath/path.go +++ b/vendor/go.podman.io/image/v5/directory/explicitfilepath/path.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) // ResolvePathToFullyExplicit returns the input path converted to an absolute, no-symlinks, cleaned up path. diff --git a/vendor/github.com/containers/image/v5/docker/body_reader.go b/vendor/go.podman.io/image/v5/docker/body_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/body_reader.go rename to vendor/go.podman.io/image/v5/docker/body_reader.go diff --git a/vendor/github.com/containers/image/v5/docker/cache.go b/vendor/go.podman.io/image/v5/docker/cache.go similarity index 89% rename from vendor/github.com/containers/image/v5/docker/cache.go rename to vendor/go.podman.io/image/v5/docker/cache.go index 728d32d17..35fe37b38 100644 --- a/vendor/github.com/containers/image/v5/docker/cache.go +++ b/vendor/go.podman.io/image/v5/docker/cache.go @@ -1,8 +1,8 @@ package docker import ( - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" ) // bicTransportScope returns a BICTransportScope appropriate for ref. diff --git a/vendor/github.com/containers/image/v5/docker/distribution_error.go b/vendor/go.podman.io/image/v5/docker/distribution_error.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/distribution_error.go rename to vendor/go.podman.io/image/v5/docker/distribution_error.go diff --git a/vendor/github.com/containers/image/v5/docker/docker_client.go b/vendor/go.podman.io/image/v5/docker/docker_client.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_client.go rename to vendor/go.podman.io/image/v5/docker/docker_client.go index 851d3e082..a83e19a36 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_client.go +++ b/vendor/go.podman.io/image/v5/docker/docker_client.go @@ -17,24 +17,24 @@ import ( "sync" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/internal/useragent" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/pkg/tlsclientconfig" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/docker/distribution/registry/api/errcode" v2 "github.com/docker/distribution/registry/api/v2" "github.com/docker/go-connections/tlsconfig" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/internal/useragent" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/pkg/tlsclientconfig" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) const ( @@ -228,7 +228,12 @@ func newDockerClient(sys *types.SystemContext, registry, reference string) (*doc registry = dockerRegistry } tlsClientConfig := &tls.Config{ - CipherSuites: tlsconfig.DefaultServerAcceptedCiphers, + // As of 2025-08, tlsconfig.ClientDefault() differs from Go 1.23 defaults only in CipherSuites; + // so, limit us to only using that value. If go-connections/tlsconfig changes its policy, we + // will want to consider that and make a decision whether to follow suit. + // There is some chance that eventually the Go default will be to require TLS 1.3, and that point + // we might want to drop the dependency on go-connections entirely. + CipherSuites: tlsconfig.ClientDefault().CipherSuites, } // It is undefined whether the host[:port] string for dockerHostname should be dockerHostname or dockerRegistry, diff --git a/vendor/github.com/containers/image/v5/docker/docker_image.go b/vendor/go.podman.io/image/v5/docker/docker_image.go similarity index 96% rename from vendor/github.com/containers/image/v5/docker/docker_image.go rename to vendor/go.podman.io/image/v5/docker/docker_image.go index 74f559dce..1e5de65a7 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image.go @@ -9,12 +9,12 @@ import ( "net/url" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // Image is a Docker-specific implementation of types.ImageCloser with a few extra methods diff --git a/vendor/github.com/containers/image/v5/docker/docker_image_dest.go b/vendor/go.podman.io/image/v5/docker/docker_image_dest.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_image_dest.go rename to vendor/go.podman.io/image/v5/docker/docker_image_dest.go index 76e48a384..86077fe93 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image_dest.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image_dest.go @@ -16,26 +16,26 @@ import ( "slices" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/internal/streamdigest" - "github.com/containers/image/v5/internal/uploadreader" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/docker/distribution/registry/api/errcode" v2 "github.com/docker/distribution/registry/api/v2" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/internal/streamdigest" + "go.podman.io/image/v5/internal/uploadreader" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) type dockerImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/docker/docker_image_src.go b/vendor/go.podman.io/image/v5/docker/docker_image_src.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/docker_image_src.go rename to vendor/go.podman.io/image/v5/docker/docker_image_src.go index 4eb9cdfba..553dddeef 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image_src.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image_src.go @@ -17,19 +17,19 @@ import ( "strings" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/regexp" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/regexp" ) // maxLookasideSignatures is an arbitrary limit for the total number of signatures we would try to read from a lookaside server, diff --git a/vendor/github.com/containers/image/v5/docker/docker_transport.go b/vendor/go.podman.io/image/v5/docker/docker_transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_transport.go rename to vendor/go.podman.io/image/v5/docker/docker_transport.go index c10463a43..5831dc3ce 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_transport.go +++ b/vendor/go.podman.io/image/v5/docker/docker_transport.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/policyconfiguration" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/policyconfiguration" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) // UnknownDigestSuffix can be appended to a reference when the caller diff --git a/vendor/github.com/containers/image/v5/docker/errors.go b/vendor/go.podman.io/image/v5/docker/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/errors.go rename to vendor/go.podman.io/image/v5/docker/errors.go diff --git a/vendor/github.com/containers/image/v5/docker/paths_common.go b/vendor/go.podman.io/image/v5/docker/paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/paths_common.go rename to vendor/go.podman.io/image/v5/docker/paths_common.go diff --git a/vendor/github.com/containers/image/v5/docker/paths_freebsd.go b/vendor/go.podman.io/image/v5/docker/paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/paths_freebsd.go rename to vendor/go.podman.io/image/v5/docker/paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go b/vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go rename to vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go index e1f1f1f2b..ddb0bce12 100644 --- a/vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go +++ b/vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" + "go.podman.io/image/v5/docker/reference" ) // DockerReferenceIdentity returns a string representation of the reference, suitable for policy lookup, diff --git a/vendor/github.com/containers/image/v5/docker/reference/README.md b/vendor/go.podman.io/image/v5/docker/reference/README.md similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/README.md rename to vendor/go.podman.io/image/v5/docker/reference/README.md diff --git a/vendor/github.com/containers/image/v5/docker/reference/helpers.go b/vendor/go.podman.io/image/v5/docker/reference/helpers.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/helpers.go rename to vendor/go.podman.io/image/v5/docker/reference/helpers.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/normalize.go b/vendor/go.podman.io/image/v5/docker/reference/normalize.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/normalize.go rename to vendor/go.podman.io/image/v5/docker/reference/normalize.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/reference.go b/vendor/go.podman.io/image/v5/docker/reference/reference.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/reference.go rename to vendor/go.podman.io/image/v5/docker/reference/reference.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/regexp-additions.go b/vendor/go.podman.io/image/v5/docker/reference/regexp-additions.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/regexp-additions.go rename to vendor/go.podman.io/image/v5/docker/reference/regexp-additions.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/regexp.go b/vendor/go.podman.io/image/v5/docker/reference/regexp.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/reference/regexp.go rename to vendor/go.podman.io/image/v5/docker/reference/regexp.go index 76ba5c2d5..db656fe6a 100644 --- a/vendor/github.com/containers/image/v5/docker/reference/regexp.go +++ b/vendor/go.podman.io/image/v5/docker/reference/regexp.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - storageRegexp "github.com/containers/storage/pkg/regexp" + storageRegexp "go.podman.io/storage/pkg/regexp" ) const ( diff --git a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendor/go.podman.io/image/v5/docker/registries_d.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/registries_d.go rename to vendor/go.podman.io/image/v5/docker/registries_d.go index 89d48cc4f..53bbb53cb 100644 --- a/vendor/github.com/containers/image/v5/docker/registries_d.go +++ b/vendor/go.podman.io/image/v5/docker/registries_d.go @@ -10,19 +10,19 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" "gopkg.in/yaml.v3" ) // systemRegistriesDirPath is the path to registries.d, used for locating lookaside Docker signature storage. // You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/docker.systemRegistriesDirPath=$your_path' +// -ldflags '-X go.podman.io/image/v5/docker.systemRegistriesDirPath=$your_path' var systemRegistriesDirPath = builtinRegistriesDirPath // builtinRegistriesDirPath is the path to registries.d. diff --git a/vendor/github.com/containers/image/v5/docker/wwwauthenticate.go b/vendor/go.podman.io/image/v5/docker/wwwauthenticate.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/wwwauthenticate.go rename to vendor/go.podman.io/image/v5/docker/wwwauthenticate.go diff --git a/vendor/github.com/containers/image/v5/image/docker_schema2.go b/vendor/go.podman.io/image/v5/image/docker_schema2.go similarity index 91% rename from vendor/github.com/containers/image/v5/image/docker_schema2.go rename to vendor/go.podman.io/image/v5/image/docker_schema2.go index e5a3b8991..617d499e4 100644 --- a/vendor/github.com/containers/image/v5/image/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/image/docker_schema2.go @@ -1,7 +1,7 @@ package image import ( - "github.com/containers/image/v5/internal/image" + "go.podman.io/image/v5/internal/image" ) // GzippedEmptyLayer is a gzip-compressed version of an empty tar file (1024 NULL bytes) diff --git a/vendor/github.com/containers/image/v5/image/sourced.go b/vendor/go.podman.io/image/v5/image/sourced.go similarity index 95% rename from vendor/github.com/containers/image/v5/image/sourced.go rename to vendor/go.podman.io/image/v5/image/sourced.go index 2b7f6b144..76375c5f5 100644 --- a/vendor/github.com/containers/image/v5/image/sourced.go +++ b/vendor/go.podman.io/image/v5/image/sourced.go @@ -6,8 +6,8 @@ package image import ( "context" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/types" ) // FromSource returns a types.ImageCloser implementation for the default instance of source. diff --git a/vendor/github.com/containers/image/v5/image/unparsed.go b/vendor/go.podman.io/image/v5/image/unparsed.go similarity index 90% rename from vendor/github.com/containers/image/v5/image/unparsed.go rename to vendor/go.podman.io/image/v5/image/unparsed.go index f530824a9..79d446d70 100644 --- a/vendor/github.com/containers/image/v5/image/unparsed.go +++ b/vendor/go.podman.io/image/v5/image/unparsed.go @@ -1,11 +1,11 @@ package image import ( - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/unparsedimage" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/unparsedimage" + "go.podman.io/image/v5/types" ) // UnparsedImage implements types.UnparsedImage . diff --git a/vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go b/vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go rename to vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go index f31ee3124..5399c2961 100644 --- a/vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go +++ b/vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go @@ -1,8 +1,8 @@ package blobinfocache import ( - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // FromBlobInfoCache returns a BlobInfoCache2 based on a BlobInfoCache, returning the original diff --git a/vendor/github.com/containers/image/v5/internal/blobinfocache/types.go b/vendor/go.podman.io/image/v5/internal/blobinfocache/types.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/blobinfocache/types.go rename to vendor/go.podman.io/image/v5/internal/blobinfocache/types.go index acf82ee63..d9d27ec95 100644 --- a/vendor/github.com/containers/image/v5/internal/blobinfocache/types.go +++ b/vendor/go.podman.io/image/v5/internal/blobinfocache/types.go @@ -1,9 +1,9 @@ package blobinfocache import ( - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_list.go b/vendor/go.podman.io/image/v5/internal/image/docker_list.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/image/docker_list.go rename to vendor/go.podman.io/image/v5/internal/image/docker_list.go index 617a451aa..2b49964a1 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_list.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_list.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) func manifestSchema2FromManifestList(ctx context.Context, sys *types.SystemContext, src types.ImageSource, manblob []byte) (genericManifest, error) { diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_schema1.go b/vendor/go.podman.io/image/v5/internal/image/docker_schema1.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/docker_schema1.go rename to vendor/go.podman.io/image/v5/internal/image/docker_schema1.go index 3ef8e144d..da7a943b3 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_schema1.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_schema1.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) type manifestSchema1 struct { @@ -202,7 +202,7 @@ func (m *manifestSchema1) convertToManifestSchema2(_ context.Context, options *t d = layerDiffIDs[v2Index] } layers = append(layers, manifest.Schema2Descriptor{ - MediaType: "application/vnd.docker.image.rootfs.diff.tar.gzip", + MediaType: manifest.DockerV2Schema2LayerMediaType, Size: size, Digest: m.m.FSLayers[v1Index].BlobSum, }) @@ -217,7 +217,7 @@ func (m *manifestSchema1) convertToManifestSchema2(_ context.Context, options *t return nil, err } configDescriptor := manifest.Schema2Descriptor{ - MediaType: "application/vnd.docker.container.image.v1+json", + MediaType: manifest.DockerV2Schema2ConfigMediaType, Size: int64(len(configJSON)), Digest: digest.FromBytes(configJSON), } diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_schema2.go b/vendor/go.podman.io/image/v5/internal/image/docker_schema2.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/image/docker_schema2.go rename to vendor/go.podman.io/image/v5/internal/image/docker_schema2.go index 01219e391..9305524a0 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_schema2.go @@ -10,14 +10,14 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" ) // GzippedEmptyLayer is a gzip-compressed version of an empty tar file (1024 NULL bytes) diff --git a/vendor/github.com/containers/image/v5/internal/image/manifest.go b/vendor/go.podman.io/image/v5/internal/image/manifest.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/manifest.go rename to vendor/go.podman.io/image/v5/internal/image/manifest.go index ed57e08dd..d6ae8b6fa 100644 --- a/vendor/github.com/containers/image/v5/internal/image/manifest.go +++ b/vendor/go.podman.io/image/v5/internal/image/manifest.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // genericManifest is an interface for parsing, modifying image manifests and related data. diff --git a/vendor/github.com/containers/image/v5/internal/image/memory.go b/vendor/go.podman.io/image/v5/internal/image/memory.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/image/memory.go rename to vendor/go.podman.io/image/v5/internal/image/memory.go index e22c7aafd..9dff39197 100644 --- a/vendor/github.com/containers/image/v5/internal/image/memory.go +++ b/vendor/go.podman.io/image/v5/internal/image/memory.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // memoryImage is a mostly-implementation of types.Image assembled from data diff --git a/vendor/github.com/containers/image/v5/internal/image/oci.go b/vendor/go.podman.io/image/v5/internal/image/oci.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/oci.go rename to vendor/go.podman.io/image/v5/internal/image/oci.go index aaef95ff3..8b73b91ff 100644 --- a/vendor/github.com/containers/image/v5/internal/image/oci.go +++ b/vendor/go.podman.io/image/v5/internal/image/oci.go @@ -7,15 +7,15 @@ import ( "fmt" "slices" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" ociencspec "github.com/containers/ocicrypt/spec" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" ) type manifestOCI1 struct { diff --git a/vendor/github.com/containers/image/v5/internal/image/oci_index.go b/vendor/go.podman.io/image/v5/internal/image/oci_index.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/image/oci_index.go rename to vendor/go.podman.io/image/v5/internal/image/oci_index.go index 0e945c851..b9071b55d 100644 --- a/vendor/github.com/containers/image/v5/internal/image/oci_index.go +++ b/vendor/go.podman.io/image/v5/internal/image/oci_index.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) func manifestOCI1FromImageIndex(ctx context.Context, sys *types.SystemContext, src types.ImageSource, manblob []byte) (genericManifest, error) { diff --git a/vendor/github.com/containers/image/v5/internal/image/sourced.go b/vendor/go.podman.io/image/v5/internal/image/sourced.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/image/sourced.go rename to vendor/go.podman.io/image/v5/internal/image/sourced.go index 661891aa5..ba2eaa0c9 100644 --- a/vendor/github.com/containers/image/v5/internal/image/sourced.go +++ b/vendor/go.podman.io/image/v5/internal/image/sourced.go @@ -6,7 +6,7 @@ package image import ( "context" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // FromReference returns a types.ImageCloser implementation for the default instance reading from reference. diff --git a/vendor/github.com/containers/image/v5/internal/image/unparsed.go b/vendor/go.podman.io/image/v5/internal/image/unparsed.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/image/unparsed.go rename to vendor/go.podman.io/image/v5/internal/image/unparsed.go index 1cffe4311..45c372383 100644 --- a/vendor/github.com/containers/image/v5/internal/image/unparsed.go +++ b/vendor/go.podman.io/image/v5/internal/image/unparsed.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagesource" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagesource" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // UnparsedImage implements types.UnparsedImage . diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go index 70b207d9b..9a8d18713 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go @@ -4,11 +4,11 @@ import ( "context" "io" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // Compat implements the obsolete parts of types.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go similarity index 82% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go index 9b42cfbec..b12beff07 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go @@ -1,8 +1,8 @@ package impl import ( - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" ) // OriginalCandidateMatchesTryReusingBlobOptions returns true if the original blob passed to TryReusingBlobWithOptions diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go index 704812e9a..1aab4b061 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go @@ -1,6 +1,6 @@ package impl -import "github.com/containers/image/v5/types" +import "go.podman.io/image/v5/types" // Properties collects properties of an ImageDestination that are constant throughout its lifetime // (but might differ across instances). diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/original_oci_config.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/original_oci_config.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/original_oci_config.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/original_oci_config.go diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go similarity index 95% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go index 22bed4b0f..573ad832e 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // NoPutBlobPartialInitialize implements parts of private.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go index 7015fd068..c046449b1 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/signature" ) // NoSignaturesInitialize implements parts of private.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/stubs.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/stubs.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/stubs.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/stubs.go diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/wrapper.go b/vendor/go.podman.io/image/v5/internal/imagedestination/wrapper.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagedestination/wrapper.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/wrapper.go index b2462a3bc..cbbb6b42a 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/wrapper.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/wrapper.go @@ -4,11 +4,11 @@ import ( "context" "io" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // wrapped provides the private.ImageDestination operations diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go index 7d859c312..4d56f4359 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go @@ -3,9 +3,9 @@ package impl import ( "context" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" ) // Compat implements the obsolete parts of types.ImageSource diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go index d5eae6351..63016f333 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go @@ -3,8 +3,8 @@ package impl import ( "context" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // DoesNotAffectLayerInfosForCopy implements LayerInfosForCopy() that returns nothing. diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/properties.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/properties.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/properties.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/properties.go diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go similarity index 93% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go index b3a8c7e88..749e42a0c 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go @@ -3,8 +3,8 @@ package impl import ( "context" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/signature" ) // NoSignatures implements GetSignatures() that returns nothing. diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go similarity index 95% rename from vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go rename to vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go index 286ae524b..b1fe9b9a6 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // NoGetBlobAtInitialize implements parts of private.ImageSource diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/stubs.go b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/stubs.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagesource/stubs/stubs.go rename to vendor/go.podman.io/image/v5/internal/imagesource/stubs/stubs.go diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go b/vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go similarity index 90% rename from vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go rename to vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go index f0d1d042b..00bf8893f 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go @@ -3,11 +3,11 @@ package imagesource import ( "context" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // wrapped provides the private.ImageSource operations diff --git a/vendor/github.com/containers/image/v5/internal/iolimits/iolimits.go b/vendor/go.podman.io/image/v5/internal/iolimits/iolimits.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/iolimits/iolimits.go rename to vendor/go.podman.io/image/v5/internal/iolimits/iolimits.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/common.go b/vendor/go.podman.io/image/v5/internal/manifest/common.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/common.go rename to vendor/go.podman.io/image/v5/internal/manifest/common.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2.go b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/docker_schema2.go rename to vendor/go.podman.io/image/v5/internal/manifest/docker_schema2.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go rename to vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go index 4c1589ef0..fdcc42083 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go @@ -5,11 +5,11 @@ import ( "fmt" "slices" - platform "github.com/containers/image/v5/internal/pkg/platform" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + platform "go.podman.io/image/v5/internal/pkg/platform" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // Schema2PlatformSpec describes the platform which a particular manifest is diff --git a/vendor/github.com/containers/image/v5/internal/manifest/errors.go b/vendor/go.podman.io/image/v5/internal/manifest/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/errors.go rename to vendor/go.podman.io/image/v5/internal/manifest/errors.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/list.go b/vendor/go.podman.io/image/v5/internal/manifest/list.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/manifest/list.go rename to vendor/go.podman.io/image/v5/internal/manifest/list.go index 1c614d124..100d1c86b 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/list.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/list.go @@ -3,10 +3,10 @@ package manifest import ( "fmt" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // ListPublic is a subset of List which is a part of the public API; diff --git a/vendor/github.com/containers/image/v5/internal/manifest/manifest.go b/vendor/go.podman.io/image/v5/internal/manifest/manifest.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/manifest/manifest.go rename to vendor/go.podman.io/image/v5/internal/manifest/manifest.go index 3fb52104a..7dfe77844 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/manifest.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/manifest.go @@ -4,10 +4,10 @@ import ( "encoding/json" "slices" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" "github.com/containers/libtrust" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" ) // FIXME: Should we just use docker/distribution and docker/docker implementations directly? diff --git a/vendor/github.com/containers/image/v5/internal/manifest/oci_index.go b/vendor/go.podman.io/image/v5/internal/manifest/oci_index.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/manifest/oci_index.go rename to vendor/go.podman.io/image/v5/internal/manifest/oci_index.go index 719deccbb..046d8e607 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/oci_index.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/oci_index.go @@ -9,12 +9,12 @@ import ( "runtime" "slices" - platform "github.com/containers/image/v5/internal/pkg/platform" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + platform "go.podman.io/image/v5/internal/pkg/platform" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/internal/multierr/multierr.go b/vendor/go.podman.io/image/v5/internal/multierr/multierr.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/multierr/multierr.go rename to vendor/go.podman.io/image/v5/internal/multierr/multierr.go diff --git a/vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go b/vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go rename to vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go index 3a16dad63..171438891 100644 --- a/vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go +++ b/vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go @@ -24,9 +24,9 @@ import ( "slices" "strings" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" ) // For Linux, the kernel has already detected the ABI, ISA and Features. diff --git a/vendor/github.com/containers/image/v5/internal/private/private.go b/vendor/go.podman.io/image/v5/internal/private/private.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/private/private.go rename to vendor/go.podman.io/image/v5/internal/private/private.go index ae0cbdf22..a5d2057ae 100644 --- a/vendor/github.com/containers/image/v5/internal/private/private.go +++ b/vendor/go.podman.io/image/v5/internal/private/private.go @@ -5,13 +5,13 @@ import ( "io" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/signature" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/signature" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // ImageSourceInternalOnly is the part of private.ImageSource that is not diff --git a/vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go b/vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go rename to vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go index b8d3a7e56..ce5054275 100644 --- a/vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go +++ b/vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go @@ -3,8 +3,8 @@ package putblobdigest import ( "io" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // Digester computes a digest of the provided stream, if not known yet. diff --git a/vendor/github.com/containers/image/v5/internal/rootless/rootless.go b/vendor/go.podman.io/image/v5/internal/rootless/rootless.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/rootless/rootless.go rename to vendor/go.podman.io/image/v5/internal/rootless/rootless.go diff --git a/vendor/github.com/containers/image/v5/internal/set/set.go b/vendor/go.podman.io/image/v5/internal/set/set.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/set/set.go rename to vendor/go.podman.io/image/v5/internal/set/set.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/signature.go b/vendor/go.podman.io/image/v5/internal/signature/signature.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/signature.go rename to vendor/go.podman.io/image/v5/internal/signature/signature.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/sigstore.go b/vendor/go.podman.io/image/v5/internal/signature/sigstore.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/sigstore.go rename to vendor/go.podman.io/image/v5/internal/signature/sigstore.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/simple.go b/vendor/go.podman.io/image/v5/internal/signature/simple.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/simple.go rename to vendor/go.podman.io/image/v5/internal/signature/simple.go diff --git a/vendor/github.com/containers/image/v5/internal/signer/signer.go b/vendor/go.podman.io/image/v5/internal/signer/signer.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/signer/signer.go rename to vendor/go.podman.io/image/v5/internal/signer/signer.go index 5720254d1..526565d93 100644 --- a/vendor/github.com/containers/image/v5/internal/signer/signer.go +++ b/vendor/go.podman.io/image/v5/internal/signer/signer.go @@ -3,8 +3,8 @@ package signer import ( "context" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/signature" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/signature" ) // Signer is an object, possibly carrying state, that can be used by copy.Image to sign one or more container images. diff --git a/vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go b/vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go similarity index 89% rename from vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go rename to vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go index d5a5436a4..83608e04a 100644 --- a/vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go +++ b/vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/types" ) // ComputeBlobInfo streams a blob to a temporary file and populates Digest and Size in inputInfo. diff --git a/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go b/vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go rename to vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go index bab73ee33..634b2d062 100644 --- a/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go +++ b/vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go @@ -4,12 +4,12 @@ import ( "os" "runtime" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // unixTempDirForBigFiles is the directory path to store big files on non Windows systems. // You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=$your_path' +// -ldflags '-X go.podman.io/image/v5/internal/tmpdir.unixTempDirForBigFiles=$your_path' var unixTempDirForBigFiles = builtinUnixTempDirForBigFiles // builtinUnixTempDirForBigFiles is the directory path to store big files. diff --git a/vendor/github.com/containers/image/v5/internal/unparsedimage/wrapper.go b/vendor/go.podman.io/image/v5/internal/unparsedimage/wrapper.go similarity index 86% rename from vendor/github.com/containers/image/v5/internal/unparsedimage/wrapper.go rename to vendor/go.podman.io/image/v5/internal/unparsedimage/wrapper.go index fe65b1a98..ef314d4b3 100644 --- a/vendor/github.com/containers/image/v5/internal/unparsedimage/wrapper.go +++ b/vendor/go.podman.io/image/v5/internal/unparsedimage/wrapper.go @@ -3,9 +3,9 @@ package unparsedimage import ( "context" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // wrapped provides the private.UnparsedImage operations diff --git a/vendor/github.com/containers/image/v5/internal/uploadreader/upload_reader.go b/vendor/go.podman.io/image/v5/internal/uploadreader/upload_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/uploadreader/upload_reader.go rename to vendor/go.podman.io/image/v5/internal/uploadreader/upload_reader.go diff --git a/vendor/github.com/containers/image/v5/internal/useragent/useragent.go b/vendor/go.podman.io/image/v5/internal/useragent/useragent.go similarity index 83% rename from vendor/github.com/containers/image/v5/internal/useragent/useragent.go rename to vendor/go.podman.io/image/v5/internal/useragent/useragent.go index 7ac49693e..54d8fcb70 100644 --- a/vendor/github.com/containers/image/v5/internal/useragent/useragent.go +++ b/vendor/go.podman.io/image/v5/internal/useragent/useragent.go @@ -1,6 +1,6 @@ package useragent -import "github.com/containers/image/v5/version" +import "go.podman.io/image/v5/version" // DefaultUserAgent is a value that should be used by User-Agent headers, unless the user specifically instructs us otherwise. var DefaultUserAgent = "containers/" + version.Version + " (github.com/containers/image)" diff --git a/vendor/github.com/containers/image/v5/manifest/common.go b/vendor/go.podman.io/image/v5/manifest/common.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/common.go rename to vendor/go.podman.io/image/v5/manifest/common.go index 8d9d5795f..dde1bf3c8 100644 --- a/vendor/github.com/containers/image/v5/manifest/common.go +++ b/vendor/go.podman.io/image/v5/manifest/common.go @@ -3,9 +3,9 @@ package manifest import ( "fmt" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // layerInfosToStrings converts a list of layer infos, presumably obtained from a Manifest.LayerInfos() diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema1.go b/vendor/go.podman.io/image/v5/manifest/docker_schema1.go similarity index 97% rename from vendor/github.com/containers/image/v5/manifest/docker_schema1.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema1.go index f4b1fc033..28c9fea30 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema1.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema1.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/set" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/regexp" "github.com/docker/docker/api/types/versions" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/set" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/regexp" ) // Schema1FSLayers is an entry of the "fsLayers" array in docker/distribution schema 1. diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema2.go b/vendor/go.podman.io/image/v5/manifest/docker_schema2.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/docker_schema2.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema2.go index 7e53f4f54..b4255d886 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema2.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/containers/image/v5/internal/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/pkg/strslice" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/pkg/strslice" + "go.podman.io/image/v5/types" ) // Schema2Descriptor is a “descriptor” in docker/distribution schema 2. diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go b/vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go similarity index 95% rename from vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go index c958a3fa3..158f7949e 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go @@ -1,7 +1,7 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/manifest" ) // Schema2PlatformSpec describes the platform which a particular manifest is diff --git a/vendor/github.com/containers/image/v5/manifest/list.go b/vendor/go.podman.io/image/v5/manifest/list.go similarity index 95% rename from vendor/github.com/containers/image/v5/manifest/list.go rename to vendor/go.podman.io/image/v5/manifest/list.go index 1d6fdc9f5..846ea7d43 100644 --- a/vendor/github.com/containers/image/v5/manifest/list.go +++ b/vendor/go.podman.io/image/v5/manifest/list.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" ) var ( diff --git a/vendor/github.com/containers/image/v5/manifest/manifest.go b/vendor/go.podman.io/image/v5/manifest/manifest.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/manifest.go rename to vendor/go.podman.io/image/v5/manifest/manifest.go index d8f37eb45..45118fa4e 100644 --- a/vendor/github.com/containers/image/v5/manifest/manifest.go +++ b/vendor/go.podman.io/image/v5/manifest/manifest.go @@ -3,11 +3,11 @@ package manifest import ( "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" "github.com/containers/libtrust" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) // FIXME: Should we just use docker/distribution and docker/docker implementations directly? diff --git a/vendor/github.com/containers/image/v5/manifest/oci.go b/vendor/go.podman.io/image/v5/manifest/oci.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/oci.go rename to vendor/go.podman.io/image/v5/manifest/oci.go index a18425d0e..286d58c42 100644 --- a/vendor/github.com/containers/image/v5/manifest/oci.go +++ b/vendor/go.podman.io/image/v5/manifest/oci.go @@ -6,13 +6,13 @@ import ( "slices" "strings" - "github.com/containers/image/v5/internal/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" ociencspec "github.com/containers/ocicrypt/spec" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // BlobInfoFromOCI1Descriptor returns a types.BlobInfo based on the input OCI1 descriptor. diff --git a/vendor/github.com/containers/image/v5/manifest/oci_index.go b/vendor/go.podman.io/image/v5/manifest/oci_index.go similarity index 94% rename from vendor/github.com/containers/image/v5/manifest/oci_index.go rename to vendor/go.podman.io/image/v5/manifest/oci_index.go index 193b08935..84dae6070 100644 --- a/vendor/github.com/containers/image/v5/manifest/oci_index.go +++ b/vendor/go.podman.io/image/v5/manifest/oci_index.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" ) // OCI1Index is just an alias for the OCI index type, but one which we can diff --git a/vendor/github.com/containers/image/v5/oci/internal/oci_util.go b/vendor/go.podman.io/image/v5/oci/internal/oci_util.go similarity index 100% rename from vendor/github.com/containers/image/v5/oci/internal/oci_util.go rename to vendor/go.podman.io/image/v5/oci/internal/oci_util.go diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_delete.go b/vendor/go.podman.io/image/v5/oci/layout/oci_delete.go similarity index 98% rename from vendor/github.com/containers/image/v5/oci/layout/oci_delete.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_delete.go index 7978229d3..7eaf6f088 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_delete.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_delete.go @@ -8,11 +8,11 @@ import ( "os" "slices" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/types" ) // DeleteImage deletes the named image from the directory, if supported. diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_dest.go b/vendor/go.podman.io/image/v5/oci/layout/oci_dest.go similarity index 97% rename from vendor/github.com/containers/image/v5/oci/layout/oci_dest.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_dest.go index 492ede591..48fe812df 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_dest.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_dest.go @@ -12,16 +12,16 @@ import ( "runtime" "slices" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" digest "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" ) type ociImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_src.go b/vendor/go.podman.io/image/v5/oci/layout/oci_src.go similarity index 88% rename from vendor/github.com/containers/image/v5/oci/layout/oci_src.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_src.go index 49c070c21..f265a21d7 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_src.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_src.go @@ -2,6 +2,7 @@ package layout import ( "context" + "crypto/tls" "errors" "fmt" "io" @@ -10,16 +11,16 @@ import ( "os" "strconv" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/pkg/tlsclientconfig" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" "github.com/docker/go-connections/tlsconfig" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/pkg/tlsclientconfig" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" ) // ImageNotFoundError is used when the OCI structure, in principle, exists and seems valid enough, @@ -50,7 +51,14 @@ type ociImageSource struct { // newImageSource returns an ImageSource for reading from an existing directory. func newImageSource(sys *types.SystemContext, ref ociReference) (private.ImageSource, error) { tr := tlsclientconfig.NewTransport() - tr.TLSClientConfig = tlsconfig.ServerDefault() + tr.TLSClientConfig = &tls.Config{ + // As of 2025-08, tlsconfig.ClientDefault() differs from Go 1.23 defaults only in CipherSuites; + // so, limit us to only using that value. If go-connections/tlsconfig changes its policy, we + // will want to consider that and make a decision whether to follow suit. + // There is some chance that eventually the Go default will be to require TLS 1.3, and that point + // we might want to drop the dependency on go-connections entirely. + CipherSuites: tlsconfig.ClientDefault().CipherSuites, + } if sys != nil && sys.OCICertPath != "" { if err := tlsclientconfig.SetupCertificates(sys.OCICertPath, tr.TLSClientConfig); err != nil { diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_transport.go b/vendor/go.podman.io/image/v5/oci/layout/oci_transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/oci/layout/oci_transport.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_transport.go index 832f89080..7b5086cd8 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_transport.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_transport.go @@ -9,15 +9,15 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/directory/explicitfilepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/oci/internal" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/directory/explicitfilepath" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/oci/internal" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) func init() { diff --git a/vendor/github.com/containers/image/v5/oci/layout/reader.go b/vendor/go.podman.io/image/v5/oci/layout/reader.go similarity index 96% rename from vendor/github.com/containers/image/v5/oci/layout/reader.go rename to vendor/go.podman.io/image/v5/oci/layout/reader.go index 112db2d70..0a88e945e 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/reader.go +++ b/vendor/go.podman.io/image/v5/oci/layout/reader.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/types" ) // This file is named reader.go for consistency with other transports’ diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/default.go similarity index 94% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/default.go index b413ec513..7fe615e34 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/default.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/pkg/blobinfocache/memory" - "github.com/containers/image/v5/pkg/blobinfocache/sqlite" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/pkg/blobinfocache/memory" + "go.podman.io/image/v5/pkg/blobinfocache/sqlite" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go index d73aafbdb..993c78030 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go @@ -7,12 +7,12 @@ import ( "slices" "time" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/types" ) // replacementAttempts is the number of blob replacement candidates with known location returned by destructivelyPrioritizeReplacementCandidates, diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/memory/memory.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/memory/memory.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/memory/memory.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/memory/memory.go index 8e513d41e..84e9b7d6d 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/memory/memory.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/memory/memory.go @@ -5,12 +5,12 @@ import ( "sync" "time" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize" + "go.podman.io/image/v5/types" ) // locationKey only exists to make lookup in knownLocations easier. diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go index 9a2219e79..88c9024fd 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go @@ -2,9 +2,9 @@ package none import ( - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/types" ) // noCache implements a dummy BlobInfoCache which records no data. diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/sqlite/sqlite.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/sqlite/sqlite.go similarity index 99% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/sqlite/sqlite.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/sqlite/sqlite.go index 719c8edaf..1d0127573 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/sqlite/sqlite.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/sqlite/sqlite.go @@ -9,12 +9,12 @@ import ( "sync" "time" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize" - "github.com/containers/image/v5/types" _ "github.com/mattn/go-sqlite3" // Registers the "sqlite3" backend backend for database/sql "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/pkg/compression/compression.go b/vendor/go.podman.io/image/v5/pkg/compression/compression.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/compression/compression.go rename to vendor/go.podman.io/image/v5/pkg/compression/compression.go index 782c86d06..6a6c4d4a3 100644 --- a/vendor/github.com/containers/image/v5/pkg/compression/compression.go +++ b/vendor/go.podman.io/image/v5/pkg/compression/compression.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "github.com/containers/image/v5/pkg/compression/internal" - "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/storage/pkg/chunked/compressor" "github.com/klauspost/pgzip" "github.com/sirupsen/logrus" "github.com/ulikunitz/xz" + "go.podman.io/image/v5/pkg/compression/internal" + "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/storage/pkg/chunked/compressor" ) // Algorithm is a compression algorithm that can be used for CompressStream. diff --git a/vendor/github.com/containers/image/v5/pkg/compression/internal/types.go b/vendor/go.podman.io/image/v5/pkg/compression/internal/types.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/compression/internal/types.go rename to vendor/go.podman.io/image/v5/pkg/compression/internal/types.go diff --git a/vendor/github.com/containers/image/v5/pkg/compression/types/types.go b/vendor/go.podman.io/image/v5/pkg/compression/types/types.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/compression/types/types.go rename to vendor/go.podman.io/image/v5/pkg/compression/types/types.go index 43d03b601..197122c7b 100644 --- a/vendor/github.com/containers/image/v5/pkg/compression/types/types.go +++ b/vendor/go.podman.io/image/v5/pkg/compression/types/types.go @@ -1,7 +1,7 @@ package types import ( - "github.com/containers/image/v5/pkg/compression/internal" + "go.podman.io/image/v5/pkg/compression/internal" ) // DecompressorFunc returns the decompressed stream, given a compressed stream. diff --git a/vendor/github.com/containers/image/v5/pkg/compression/zstd.go b/vendor/go.podman.io/image/v5/pkg/compression/zstd.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/compression/zstd.go rename to vendor/go.podman.io/image/v5/pkg/compression/zstd.go diff --git a/vendor/github.com/containers/image/v5/pkg/docker/config/config.go b/vendor/go.podman.io/image/v5/pkg/docker/config/config.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/docker/config/config.go rename to vendor/go.podman.io/image/v5/pkg/docker/config/config.go index 243b13c88..56d4eb916 100644 --- a/vendor/github.com/containers/image/v5/pkg/docker/config/config.go +++ b/vendor/go.podman.io/image/v5/pkg/docker/config/config.go @@ -14,17 +14,17 @@ import ( "runtime" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/ioutils" helperclient "github.com/docker/docker-credential-helpers/client" "github.com/docker/docker-credential-helpers/credentials" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/ioutils" ) type dockerAuthConfig struct { diff --git a/vendor/github.com/containers/image/v5/pkg/strslice/README.md b/vendor/go.podman.io/image/v5/pkg/strslice/README.md similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/strslice/README.md rename to vendor/go.podman.io/image/v5/pkg/strslice/README.md diff --git a/vendor/github.com/containers/image/v5/pkg/strslice/strslice.go b/vendor/go.podman.io/image/v5/pkg/strslice/strslice.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/strslice/strslice.go rename to vendor/go.podman.io/image/v5/pkg/strslice/strslice.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_common.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go index 677629c5d..8c72ce7ff 100644 --- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go +++ b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go @@ -9,13 +9,13 @@ import ( "strings" "github.com/BurntSushi/toml" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/lockfile" ) // defaultShortNameMode is the default mode of registries.conf files if the diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go index 318988f05..1a1fcccf8 100644 --- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go +++ b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go @@ -14,24 +14,24 @@ import ( "sync" "github.com/BurntSushi/toml" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/regexp" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/regexp" ) // systemRegistriesConfPath is the path to the system-wide registry // configuration file and is used to add/subtract potential registries for // obtaining images. You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/sysregistries.systemRegistriesConfPath=$your_path' +// -ldflags '-X go.podman.io/image/v5/sysregistries.systemRegistriesConfPath=$your_path' var systemRegistriesConfPath = builtinRegistriesConfPath // systemRegistriesConfDirPath is the path to the system-wide registry // configuration directory and is used to add/subtract potential registries for // obtaining images. You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/sysregistries.systemRegistriesConfDirectoryPath=$your_path' +// -ldflags '-X go.podman.io/image/v5/sysregistries.systemRegistriesConfDirectoryPath=$your_path' var systemRegistriesConfDirPath = builtinRegistriesConfDirPath // AuthenticationFileHelper is a special key for credential helpers indicating diff --git a/vendor/github.com/containers/image/v5/pkg/tlsclientconfig/tlsclientconfig.go b/vendor/go.podman.io/image/v5/pkg/tlsclientconfig/tlsclientconfig.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/tlsclientconfig/tlsclientconfig.go rename to vendor/go.podman.io/image/v5/pkg/tlsclientconfig/tlsclientconfig.go diff --git a/vendor/github.com/containers/image/v5/signature/docker.go b/vendor/go.podman.io/image/v5/signature/docker.go similarity index 85% rename from vendor/github.com/containers/image/v5/signature/docker.go rename to vendor/go.podman.io/image/v5/signature/docker.go index b313231a8..954eda4a5 100644 --- a/vendor/github.com/containers/image/v5/signature/docker.go +++ b/vendor/go.podman.io/image/v5/signature/docker.go @@ -5,13 +5,12 @@ package signature import ( "errors" "fmt" - "slices" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/signature/internal" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/signature/internal" ) // SignOptions includes optional parameters for signing container images. @@ -64,15 +63,8 @@ func VerifyImageManifestSignatureUsingKeyIdentityList(unverifiedSignature, unver if err != nil { return nil, "", err } - var matchedKeyIdentity string - sig, err := verifyAndExtractSignature(mech, unverifiedSignature, signatureAcceptanceRules{ - validateKeyIdentity: func(keyIdentity string) error { - if !slices.Contains(expectedKeyIdentities, keyIdentity) { - return internal.NewInvalidSignatureError(fmt.Sprintf("Signature by %s does not match expected fingerprints %v", keyIdentity, expectedKeyIdentities)) - } - matchedKeyIdentity = keyIdentity - return nil - }, + sig, matchedKeyIdentity, err := verifyAndExtractSignature(mech, unverifiedSignature, signatureAcceptanceRules{ + acceptedKeyIdentities: expectedKeyIdentities, validateSignedDockerReference: func(signedDockerReference string) error { signedRef, err := reference.ParseNormalizedNamed(signedDockerReference) if err != nil { diff --git a/vendor/github.com/containers/image/v5/signature/fulcio_cert.go b/vendor/go.podman.io/image/v5/signature/fulcio_cert.go similarity index 99% rename from vendor/github.com/containers/image/v5/signature/fulcio_cert.go rename to vendor/go.podman.io/image/v5/signature/fulcio_cert.go index 908dd0fd5..e9d98368f 100644 --- a/vendor/github.com/containers/image/v5/signature/fulcio_cert.go +++ b/vendor/go.podman.io/image/v5/signature/fulcio_cert.go @@ -10,9 +10,9 @@ import ( "slices" "time" - "github.com/containers/image/v5/signature/internal" "github.com/sigstore/fulcio/pkg/certificate" "github.com/sigstore/sigstore/pkg/cryptoutils" + "go.podman.io/image/v5/signature/internal" ) // fulcioTrustRoot contains policy allow validating Fulcio-issued certificates. diff --git a/vendor/github.com/containers/image/v5/signature/internal/errors.go b/vendor/go.podman.io/image/v5/signature/internal/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/internal/errors.go rename to vendor/go.podman.io/image/v5/signature/internal/errors.go diff --git a/vendor/github.com/containers/image/v5/signature/internal/json.go b/vendor/go.podman.io/image/v5/signature/internal/json.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/internal/json.go rename to vendor/go.podman.io/image/v5/signature/internal/json.go index f9efafb8e..246905d78 100644 --- a/vendor/github.com/containers/image/v5/signature/internal/json.go +++ b/vendor/go.podman.io/image/v5/signature/internal/json.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/set" + "go.podman.io/image/v5/internal/set" ) // JSONFormatError is returned when JSON does not match expected format. diff --git a/vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go b/vendor/go.podman.io/image/v5/signature/internal/rekor_api_types.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go rename to vendor/go.podman.io/image/v5/signature/internal/rekor_api_types.go diff --git a/vendor/github.com/containers/image/v5/signature/internal/rekor_set.go b/vendor/go.podman.io/image/v5/signature/internal/rekor_set.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/internal/rekor_set.go rename to vendor/go.podman.io/image/v5/signature/internal/rekor_set.go diff --git a/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoia.c b/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoia.c new file mode 100644 index 000000000..d5314016a --- /dev/null +++ b/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoia.c @@ -0,0 +1,200 @@ +/* + * Copying and distribution of this file, with or without modification, + * are permitted in any medium without royalty provided the copyright + * notice and this notice are preserved. This file is offered as-is, + * without any warranty. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gosequoia.h" + +#if defined(GO_SEQUOIA_ENABLE_DLOPEN) && GO_SEQUOIA_ENABLE_DLOPEN + +#include +#include +#include +#include + +/* If SEQUOIA_SONAME is defined, dlopen handle can be automatically + * set; otherwise, the caller needs to call + * go_sequoia_ensure_library with soname determined at run time. + */ +#ifdef SEQUOIA_SONAME + +static void +ensure_library (void) +{ + if (go_sequoia_ensure_library (SEQUOIA_SONAME, RTLD_LAZY | RTLD_LOCAL) < 0) + abort (); +} + +#if defined(GO_SEQUOIA_ENABLE_PTHREAD) && GO_SEQUOIA_ENABLE_PTHREAD +#include + +static pthread_once_t dlopen_once = PTHREAD_ONCE_INIT; + +#define ENSURE_LIBRARY pthread_once(&dlopen_once, ensure_library) + +#else /* GO_SEQUOIA_ENABLE_PTHREAD */ + +#define ENSURE_LIBRARY do { \ + if (!go_sequoia_dlhandle) \ + ensure_library(); \ + } while (0) + +#endif /* !GO_SEQUOIA_ENABLE_PTHREAD */ + +#else /* SEQUOIA_SONAME */ + +#define ENSURE_LIBRARY do {} while (0) + +#endif /* !SEQUOIA_SONAME */ + +static void *go_sequoia_dlhandle; + +/* Define redirection symbols */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-macros" + +#if (2 <= __GNUC__ || (4 <= __clang_major__)) +#define FUNC(ret, name, args, cargs) \ + static __typeof__(name)(*go_sequoia_sym_##name); +#else +#define FUNC(ret, name, args, cargs) \ + static ret(*go_sequoia_sym_##name)args; +#endif +#define VOID_FUNC FUNC +#include "gosequoiafuncs.h" +#undef VOID_FUNC +#undef FUNC + +#pragma GCC diagnostic pop + +/* Define redirection wrapper functions */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-macros" + +#define FUNC(ret, name, args, cargs) \ +ret go_##name args \ +{ \ + ENSURE_LIBRARY; \ + assert (go_sequoia_sym_##name); \ + return go_sequoia_sym_##name cargs; \ +} +#define VOID_FUNC(ret, name, args, cargs) \ +ret go_##name args \ +{ \ + ENSURE_LIBRARY; \ + assert (go_sequoia_sym_##name); \ + go_sequoia_sym_##name cargs; \ +} +#include "gosequoiafuncs.h" +#undef VOID_FUNC +#undef FUNC + +#pragma GCC diagnostic pop + +static int +ensure_symbol (const char *name, void **symp) +{ + if (!*symp) + { + void *sym = dlsym (go_sequoia_dlhandle, name); + if (!sym) + return -EINVAL; + *symp = sym; + } + return 0; +} + +int +go_sequoia_ensure_library (const char *soname, int flags) +{ + int err; + + if (!go_sequoia_dlhandle) + { + go_sequoia_dlhandle = dlopen (soname, flags); + if (!go_sequoia_dlhandle) + return -EINVAL; + } + +#define ENSURE_SYMBOL(name) \ + ensure_symbol(#name, (void **)&go_sequoia_sym_##name) + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-macros" + +#define FUNC(ret, name, args, cargs) \ + err = ENSURE_SYMBOL(name); \ + if (err < 0) \ + { \ + dlclose (go_sequoia_dlhandle); \ + go_sequoia_dlhandle = NULL; \ + return err; \ + } +#define VOID_FUNC FUNC +#include "gosequoiafuncs.h" +#undef VOID_FUNC +#undef FUNC + +#pragma GCC diagnostic pop + +#undef ENSURE_SYMBOL + return 0; +} + +void +go_sequoia_unload_library (void) +{ + if (go_sequoia_dlhandle) + { + dlclose (go_sequoia_dlhandle); + go_sequoia_dlhandle = NULL; + } + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-macros" + +#define FUNC(ret, name, args, cargs) \ + go_sequoia_sym_##name = NULL; +#define VOID_FUNC FUNC +#include "gosequoiafuncs.h" +#undef VOID_FUNC +#undef FUNC + +#pragma GCC diagnostic pop +} + +unsigned +go_sequoia_is_usable (void) +{ + return go_sequoia_dlhandle != NULL; +} + +#else /* GO_SEQUOIA_ENABLE_DLOPEN */ + +int +go_sequoia_ensure_library (const char *soname, int flags) +{ + (void) soname; + (void) flags; + return 0; +} + +void +go_sequoia_unload_library (void) +{ +} + +unsigned +go_sequoia_is_usable (void) +{ + /* The library is linked at build time, thus always usable */ + return 1; +} + +#endif /* !GO_SEQUOIA_ENABLE_DLOPEN */ diff --git a/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoia.h b/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoia.h new file mode 100644 index 000000000..477b985ba --- /dev/null +++ b/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoia.h @@ -0,0 +1,54 @@ +/* + * Copying and distribution of this file, with or without modification, + * are permitted in any medium without royalty provided the copyright + * notice and this notice are preserved. This file is offered as-is, + * without any warranty. + */ + +#ifndef GO_SEQUOIA_H_ +#define GO_SEQUOIA_H_ + +#include + +#if defined(GO_SEQUOIA_ENABLE_DLOPEN) && GO_SEQUOIA_ENABLE_DLOPEN + +#define FUNC(ret, name, args, cargs) \ + ret go_##name args; +#define VOID_FUNC FUNC +#include "gosequoiafuncs.h" +#undef VOID_FUNC +#undef FUNC + +#define GO_SEQUOIA_FUNC(name) go_##name + +#else + +#define GO_SEQUOIA_FUNC(name) name + +#endif /* GO_SEQUOIA_ENABLE_DLOPEN */ + +/* Ensure SONAME to be loaded with dlopen FLAGS, and all the necessary + * symbols are resolved. + * + * Returns 0 on success; negative error code otherwise. + * + * Note that this function is NOT thread-safe; when calling it from + * multi-threaded programs, protect it with a locking mechanism. + */ +int go_sequoia_ensure_library (const char *soname, int flags); + +/* Unload library and reset symbols. + * + * Note that this function is NOT thread-safe; when calling it from + * multi-threaded programs, protect it with a locking mechanism. + */ +void go_sequoia_unload_library (void); + +/* Return 1 if the library is loaded and usable. + * + * Note that this function is NOT thread-safe; when calling it from + * multi-threaded programs, protect it with a locking mechanism. + */ +unsigned go_sequoia_is_usable (void); + +#endif /* GO_SEQUOIA_H_ */ diff --git a/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoiafuncs.h b/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoiafuncs.h new file mode 100644 index 000000000..3d7ae5fac --- /dev/null +++ b/vendor/go.podman.io/image/v5/signature/internal/sequoia/gosequoiafuncs.h @@ -0,0 +1,21 @@ +/* + * This file was automatically generated from sequoia.h, + * which is covered by the following license: + * SPDX-License-Identifier: Apache-2.0 + */ +VOID_FUNC(void, sequoia_error_free, (struct SequoiaError *err_ptr), (err_ptr)) +FUNC(struct SequoiaMechanism *, sequoia_mechanism_new_from_directory, (const char *dir_ptr, struct SequoiaError **err_ptr), (dir_ptr, err_ptr)) +FUNC(struct SequoiaMechanism *, sequoia_mechanism_new_ephemeral, (struct SequoiaError **err_ptr), (err_ptr)) +VOID_FUNC(void, sequoia_mechanism_free, (struct SequoiaMechanism *mechanism_ptr), (mechanism_ptr)) +VOID_FUNC(void, sequoia_signature_free, (struct SequoiaSignature *signature_ptr), (signature_ptr)) +FUNC(const uint8_t *, sequoia_signature_get_data, (const struct SequoiaSignature *signature_ptr, size_t *data_len), (signature_ptr, data_len)) +VOID_FUNC(void, sequoia_verification_result_free, (struct SequoiaVerificationResult *result_ptr), (result_ptr)) +FUNC(const uint8_t *, sequoia_verification_result_get_content, (const struct SequoiaVerificationResult *result_ptr, size_t *data_len), (result_ptr, data_len)) +FUNC(const char *, sequoia_verification_result_get_signer, (const struct SequoiaVerificationResult *result_ptr), (result_ptr)) +FUNC(struct SequoiaSignature *, sequoia_sign, (struct SequoiaMechanism *mechanism_ptr, const char *key_handle_ptr, const char *password_ptr, const uint8_t *data_ptr, size_t data_len, struct SequoiaError **err_ptr), (mechanism_ptr, key_handle_ptr, password_ptr, data_ptr, data_len, err_ptr)) +FUNC(struct SequoiaVerificationResult *, sequoia_verify, (struct SequoiaMechanism *mechanism_ptr, const uint8_t *signature_ptr, size_t signature_len, struct SequoiaError **err_ptr), (mechanism_ptr, signature_ptr, signature_len, err_ptr)) +VOID_FUNC(void, sequoia_import_result_free, (struct SequoiaImportResult *result_ptr), (result_ptr)) +FUNC(size_t, sequoia_import_result_get_count, (const struct SequoiaImportResult *result_ptr), (result_ptr)) +FUNC(const char *, sequoia_import_result_get_content, (const struct SequoiaImportResult *result_ptr, size_t index, struct SequoiaError **err_ptr), (result_ptr, index, err_ptr)) +FUNC(struct SequoiaImportResult *, sequoia_import_keys, (struct SequoiaMechanism *mechanism_ptr, const uint8_t *blob_ptr, size_t blob_len, struct SequoiaError **err_ptr), (mechanism_ptr, blob_ptr, blob_len, err_ptr)) +FUNC(int, sequoia_set_logger_consumer, (void (*consumer)(enum SequoiaLogLevel, const char *), struct SequoiaError **err_ptr), (consumer, err_ptr)) diff --git a/vendor/go.podman.io/image/v5/signature/internal/sequoia/sequoia.go b/vendor/go.podman.io/image/v5/signature/internal/sequoia/sequoia.go new file mode 100644 index 000000000..46d9084b0 --- /dev/null +++ b/vendor/go.podman.io/image/v5/signature/internal/sequoia/sequoia.go @@ -0,0 +1,223 @@ +//go:build containers_image_sequoia + +package sequoia + +// #cgo CFLAGS: -I. -DGO_SEQUOIA_ENABLE_DLOPEN=1 +// #include "gosequoia.h" +// #include +// #include +// typedef void (*sequoia_logger_consumer_t) (enum SequoiaLogLevel level, char *message); +// extern void sequoia_logrus_logger (enum SequoiaLogLevel level, char *message); +import "C" + +import ( + "errors" + "fmt" + "path/filepath" + "runtime" + "sync" + "unsafe" + + "github.com/sirupsen/logrus" +) + +// sequoiaLibraryDir is the path to the directory where libpodman_sequoia is installed, +// if it is not in the platform’s default library path. +// You can override this at build time with +// -ldflags '-X go.podman.io/image/v5/signature/sequoia.sequoiaLibraryDir=$your_path' +var sequoiaLibraryDir = "" + +type SigningMechanism struct { + mechanism *C.SequoiaMechanism +} + +// NewMechanismFromDirectory initializes a mechanism using (user-managed) Sequoia state +// in dir, which can be "" to indicate the default (using $SEQUOIA_HOME or the default home directory location). +func NewMechanismFromDirectory( + dir string, +) (*SigningMechanism, error) { + var cerr *C.SequoiaError + var cDir *C.char + if dir != "" { + cDir = C.CString(dir) + defer C.free(unsafe.Pointer(cDir)) + } + cMechanism := C.go_sequoia_mechanism_new_from_directory(cDir, &cerr) + if cMechanism == nil { + defer C.go_sequoia_error_free(cerr) + return nil, errors.New(C.GoString(cerr.message)) + } + return &SigningMechanism{ + mechanism: cMechanism, + }, nil +} + +func NewEphemeralMechanism() (*SigningMechanism, error) { + var cerr *C.SequoiaError + cMechanism := C.go_sequoia_mechanism_new_ephemeral(&cerr) + if cMechanism == nil { + defer C.go_sequoia_error_free(cerr) + return nil, errors.New(C.GoString(cerr.message)) + } + return &SigningMechanism{ + mechanism: cMechanism, + }, nil +} + +func (m *SigningMechanism) SignWithPassphrase( + input []byte, + keyIdentity string, + passphrase string, +) ([]byte, error) { + var cerr *C.SequoiaError + var cPassphrase *C.char + if passphrase == "" { + cPassphrase = nil + } else { + cPassphrase = C.CString(passphrase) + defer C.free(unsafe.Pointer(cPassphrase)) + } + cKeyIdentity := C.CString(keyIdentity) + defer C.free(unsafe.Pointer(cKeyIdentity)) + sig := C.go_sequoia_sign( + m.mechanism, + cKeyIdentity, + cPassphrase, + (*C.uchar)(unsafe.Pointer(unsafe.SliceData(input))), + C.size_t(len(input)), + &cerr, + ) + if sig == nil { + defer C.go_sequoia_error_free(cerr) + return nil, errors.New(C.GoString(cerr.message)) + } + defer C.go_sequoia_signature_free(sig) + var size C.size_t + cData := C.go_sequoia_signature_get_data(sig, &size) + if size > C.size_t(C.INT_MAX) { + return nil, errors.New("overflow") // Coverage: This should not reasonably happen, and we don’t want to generate gigabytes of input to test this. + } + return C.GoBytes(unsafe.Pointer(cData), C.int(size)), nil +} + +func (m *SigningMechanism) Sign( + input []byte, + keyIdentity string, +) ([]byte, error) { + return m.SignWithPassphrase(input, keyIdentity, "") +} + +func (m *SigningMechanism) Verify( + unverifiedSignature []byte, +) (contents []byte, keyIdentity string, err error) { + var cerr *C.SequoiaError + result := C.go_sequoia_verify( + m.mechanism, + (*C.uchar)(unsafe.Pointer(unsafe.SliceData(unverifiedSignature))), + C.size_t(len(unverifiedSignature)), + &cerr, + ) + if result == nil { + defer C.go_sequoia_error_free(cerr) + return nil, "", errors.New(C.GoString(cerr.message)) + } + defer C.go_sequoia_verification_result_free(result) + var size C.size_t + cContent := C.go_sequoia_verification_result_get_content(result, &size) + if size > C.size_t(C.INT_MAX) { + return nil, "", errors.New("overflow") // Coverage: This should not reasonably happen, and we don’t want to generate gigabytes of input to test this. + } + contents = C.GoBytes(unsafe.Pointer(cContent), C.int(size)) + cSigner := C.go_sequoia_verification_result_get_signer(result) + keyIdentity = C.GoString(cSigner) + return contents, keyIdentity, nil +} + +func (m *SigningMechanism) ImportKeys(blob []byte) ([]string, error) { + var cerr *C.SequoiaError + result := C.go_sequoia_import_keys( + m.mechanism, + (*C.uchar)(unsafe.Pointer(unsafe.SliceData(blob))), + C.size_t(len(blob)), + &cerr, + ) + if result == nil { + defer C.go_sequoia_error_free(cerr) + return nil, errors.New(C.GoString(cerr.message)) + } + defer C.go_sequoia_import_result_free(result) + + keyIdentities := []string{} + count := C.go_sequoia_import_result_get_count(result) + for i := C.size_t(0); i < count; i++ { + var cerr *C.SequoiaError + cKeyIdentity := C.go_sequoia_import_result_get_content(result, i, &cerr) + if cerr != nil { + defer C.go_sequoia_error_free(cerr) // Coverage: this can fail only if i is out of range. + return nil, errors.New(C.GoString(cerr.message)) + } + keyIdentities = append(keyIdentities, C.GoString(cKeyIdentity)) + } + + return keyIdentities, nil +} + +func (m *SigningMechanism) Close() error { + C.go_sequoia_mechanism_free(m.mechanism) + return nil +} + +//export sequoia_logrus_logger +func sequoia_logrus_logger(level C.enum_SequoiaLogLevel, message *C.char) { + var logrusLevel logrus.Level + switch level { // Coverage: We are not in control of whether / how the Rust code chooses to log things. + case C.SEQUOIA_LOG_LEVEL_ERROR: + logrusLevel = logrus.ErrorLevel + case C.SEQUOIA_LOG_LEVEL_WARN: + logrusLevel = logrus.WarnLevel + case C.SEQUOIA_LOG_LEVEL_INFO: + logrusLevel = logrus.InfoLevel + case C.SEQUOIA_LOG_LEVEL_DEBUG: + logrusLevel = logrus.DebugLevel + case C.SEQUOIA_LOG_LEVEL_TRACE: + logrusLevel = logrus.TraceLevel + case C.SEQUOIA_LOG_LEVEL_UNKNOWN: + fallthrough + default: + logrusLevel = logrus.ErrorLevel // Should never happen + } + logrus.StandardLogger().Log(logrusLevel, C.GoString(message)) +} + +// initOnce should only be called by Init. +func initOnce() error { + var soName string + switch runtime.GOOS { + case "linux": + soName = "libpodman_sequoia.so.0" + case "darwin": + soName = "libpodman_sequoia.dylib" + default: + return fmt.Errorf("Unhandled OS %q in sequoia initialization", runtime.GOOS) // Coverage: This is ~by definition not reached in tests. + } + if sequoiaLibraryDir != "" { + soName = filepath.Join(sequoiaLibraryDir, soName) + } + cSOName := C.CString(soName) + defer C.free(unsafe.Pointer(cSOName)) + if C.go_sequoia_ensure_library(cSOName, + C.RTLD_NOW|C.RTLD_GLOBAL) < 0 { + return fmt.Errorf("unable to load %q", soName) // Coverage: This is impractical to test in-process, with the static go_sequoia_dlhandle. + } + + var cerr *C.SequoiaError + if C.go_sequoia_set_logger_consumer(C.sequoia_logger_consumer_t(C.sequoia_logrus_logger), &cerr) != 0 { + defer C.go_sequoia_error_free(cerr) // Coverage: This is impractical to test in-process, with the static go_sequoia_dlhandle. + return fmt.Errorf("initializing logging: %s", C.GoString(cerr.message)) + } + return nil +} + +// Init ensures the libpodman_sequoia library is available. +// It is safe to call from arbitrary goroutines. +var Init = sync.OnceValue(initOnce) diff --git a/vendor/go.podman.io/image/v5/signature/internal/sequoia/sequoia.h b/vendor/go.podman.io/image/v5/signature/internal/sequoia/sequoia.h new file mode 100644 index 000000000..e0e218926 --- /dev/null +++ b/vendor/go.podman.io/image/v5/signature/internal/sequoia/sequoia.h @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: Apache-2.0 + +#pragma once + +#include +#include +#include +#include + +typedef enum SequoiaErrorKind { + SEQUOIA_ERROR_KIND_UNKNOWN, + SEQUOIA_ERROR_KIND_INVALID_ARGUMENT, + SEQUOIA_ERROR_KIND_IO_ERROR, +} SequoiaErrorKind; + +typedef enum SequoiaLogLevel { + SEQUOIA_LOG_LEVEL_UNKNOWN, + SEQUOIA_LOG_LEVEL_ERROR, + SEQUOIA_LOG_LEVEL_WARN, + SEQUOIA_LOG_LEVEL_INFO, + SEQUOIA_LOG_LEVEL_DEBUG, + SEQUOIA_LOG_LEVEL_TRACE, +} SequoiaLogLevel; + +typedef struct SequoiaImportResult SequoiaImportResult; + +typedef struct SequoiaMechanism SequoiaMechanism; + +typedef struct SequoiaSignature SequoiaSignature; + +typedef struct SequoiaVerificationResult SequoiaVerificationResult; + +typedef struct SequoiaError { + enum SequoiaErrorKind kind; + char *message; +} SequoiaError; + +void sequoia_error_free(struct SequoiaError *err_ptr); + +struct SequoiaMechanism *sequoia_mechanism_new_from_directory(const char *dir_ptr, + struct SequoiaError **err_ptr); + +struct SequoiaMechanism *sequoia_mechanism_new_ephemeral(struct SequoiaError **err_ptr); + +void sequoia_mechanism_free(struct SequoiaMechanism *mechanism_ptr); + +void sequoia_signature_free(struct SequoiaSignature *signature_ptr); + +const uint8_t *sequoia_signature_get_data(const struct SequoiaSignature *signature_ptr, + size_t *data_len); + +void sequoia_verification_result_free(struct SequoiaVerificationResult *result_ptr); + +const uint8_t *sequoia_verification_result_get_content(const struct SequoiaVerificationResult *result_ptr, + size_t *data_len); + +const char *sequoia_verification_result_get_signer(const struct SequoiaVerificationResult *result_ptr); + +struct SequoiaSignature *sequoia_sign(struct SequoiaMechanism *mechanism_ptr, + const char *key_handle_ptr, + const char *password_ptr, + const uint8_t *data_ptr, + size_t data_len, + struct SequoiaError **err_ptr); + +struct SequoiaVerificationResult *sequoia_verify(struct SequoiaMechanism *mechanism_ptr, + const uint8_t *signature_ptr, + size_t signature_len, + struct SequoiaError **err_ptr); + +void sequoia_import_result_free(struct SequoiaImportResult *result_ptr); + +size_t sequoia_import_result_get_count(const struct SequoiaImportResult *result_ptr); + +const char *sequoia_import_result_get_content(const struct SequoiaImportResult *result_ptr, + size_t index, + struct SequoiaError **err_ptr); + +struct SequoiaImportResult *sequoia_import_keys(struct SequoiaMechanism *mechanism_ptr, + const uint8_t *blob_ptr, + size_t blob_len, + struct SequoiaError **err_ptr); + +int sequoia_set_logger_consumer(void (*consumer)(enum SequoiaLogLevel level, const char *message), + struct SequoiaError **err_ptr); diff --git a/vendor/github.com/containers/image/v5/signature/internal/sigstore_payload.go b/vendor/go.podman.io/image/v5/signature/internal/sigstore_payload.go similarity index 99% rename from vendor/github.com/containers/image/v5/signature/internal/sigstore_payload.go rename to vendor/go.podman.io/image/v5/signature/internal/sigstore_payload.go index 90a81dc1c..682360bae 100644 --- a/vendor/github.com/containers/image/v5/signature/internal/sigstore_payload.go +++ b/vendor/go.podman.io/image/v5/signature/internal/sigstore_payload.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/containers/image/v5/version" digest "github.com/opencontainers/go-digest" sigstoreSignature "github.com/sigstore/sigstore/pkg/signature" + "go.podman.io/image/v5/version" ) const ( diff --git a/vendor/github.com/containers/image/v5/signature/mechanism.go b/vendor/go.podman.io/image/v5/signature/mechanism.go similarity index 83% rename from vendor/github.com/containers/image/v5/signature/mechanism.go rename to vendor/go.podman.io/image/v5/signature/mechanism.go index 1d3fe0fdc..897fc4997 100644 --- a/vendor/github.com/containers/image/v5/signature/mechanism.go +++ b/vendor/go.podman.io/image/v5/signature/mechanism.go @@ -27,7 +27,10 @@ type SigningMechanism interface { // Sign creates a (non-detached) signature of input using keyIdentity. // Fails with a SigningNotSupportedError if the mechanism does not support signing. Sign(input []byte, keyIdentity string) ([]byte, error) - // Verify parses unverifiedSignature and returns the content and the signer's identity + // Verify parses unverifiedSignature and returns the content and the signer's identity. + // For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity + // is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, + // or the mechanism should implement signingMechanismWithVerificationIdentityLookup. Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) // UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, // along with a short identifier of the key used for signing. @@ -46,6 +49,16 @@ type signingMechanismWithPassphrase interface { SignWithPassphrase(input []byte, keyIdentity string, passphrase string) ([]byte, error) } +// signingMechanismWithVerificationIdentityLookup is an internal extension of SigningMechanism. +type signingMechanismWithVerificationIdentityLookup interface { + SigningMechanism + // keyIdentityForVerificationKeyIdentity re-checks the key identity returned by Verify + // if it doesn't match an identity returned by NewEphemeralGPGSigningMechanism, trying to match it. + // (To be more specific, for mechanisms which return a subkey fingerprint from Verify, + // this converts the subkey fingerprint into the corresponding primary key fingerprint.) + keyIdentityForVerificationKeyIdentity(keyIdentity string) (string, error) +} + // SigningNotSupportedError is returned when trying to sign using a mechanism which does not support that. type SigningNotSupportedError string diff --git a/vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go b/vendor/go.podman.io/image/v5/signature/mechanism_gpgme.go similarity index 72% rename from vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go rename to vendor/go.podman.io/image/v5/signature/mechanism_gpgme.go index 8a8c5878a..38b458911 100644 --- a/vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go +++ b/vendor/go.podman.io/image/v5/signature/mechanism_gpgme.go @@ -2,14 +2,17 @@ package signature +// This is shared by mechanism_gpgme_only.go and mechanism_sequoia.go; in both situations +// newGPGSigningMechanismInDirectory is implemented using GPGME. + import ( "bytes" "errors" "fmt" "os" - "github.com/containers/image/v5/signature/internal" "github.com/proglottis/gpgme" + "go.podman.io/image/v5/signature/internal" ) // A GPG/OpenPGP signing mechanism, implemented using gpgme. @@ -18,53 +21,24 @@ type gpgmeSigningMechanism struct { ephemeralDir string // If not "", a directory to be removed on Close() } -// newGPGSigningMechanismInDirectory returns a new GPG/OpenPGP signing mechanism, using optionalDir if not empty. -// The caller must call .Close() on the returned SigningMechanism. -func newGPGSigningMechanismInDirectory(optionalDir string) (signingMechanismWithPassphrase, error) { - ctx, err := newGPGMEContext(optionalDir) - if err != nil { - return nil, err - } +// newGPGMESigningMechanism returns a new GPG/OpenPGP signing mechanism for ctx. +// The caller must call .Close() on the returned SigningMechanism; if ephemeralDir is set, +// the .Close() call will remove its contents. +func newGPGMESigningMechanism(ctx *gpgme.Context, ephemeralDir string) signingMechanismWithPassphrase { return &gpgmeSigningMechanism{ ctx: ctx, - ephemeralDir: "", - }, nil + ephemeralDir: ephemeralDir, + } } -// newEphemeralGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism which -// recognizes _only_ public keys from the supplied blobs, and returns the identities -// of these keys. +// newGPGSigningMechanismInDirectory returns a new GPG/OpenPGP signing mechanism, using optionalDir if not empty. // The caller must call .Close() on the returned SigningMechanism. -func newEphemeralGPGSigningMechanism(blobs [][]byte) (signingMechanismWithPassphrase, []string, error) { - dir, err := os.MkdirTemp("", "containers-ephemeral-gpg-") - if err != nil { - return nil, nil, err - } - removeDir := true - defer func() { - if removeDir { - os.RemoveAll(dir) - } - }() - ctx, err := newGPGMEContext(dir) +func newGPGSigningMechanismInDirectory(optionalDir string) (signingMechanismWithPassphrase, error) { + ctx, err := newGPGMEContext(optionalDir) if err != nil { - return nil, nil, err - } - mech := &gpgmeSigningMechanism{ - ctx: ctx, - ephemeralDir: dir, - } - keyIdentities := []string{} - for _, blob := range blobs { - ki, err := mech.importKeysFromBytes(blob) - if err != nil { - return nil, nil, err - } - keyIdentities = append(keyIdentities, ki...) + return nil, err } - - removeDir = false - return mech, keyIdentities, nil + return newGPGMESigningMechanism(ctx, ""), nil } // newGPGMEContext returns a new *gpgme.Context, using optionalDir if not empty. @@ -94,28 +68,6 @@ func (m *gpgmeSigningMechanism) Close() error { return nil } -// importKeysFromBytes imports public keys from the supplied blob and returns their identities. -// The blob is assumed to have an appropriate format (the caller is expected to know which one). -// NOTE: This may modify long-term state (e.g. key storage in a directory underlying the mechanism); -// but we do not make this public, it can only be used through newEphemeralGPGSigningMechanism. -func (m *gpgmeSigningMechanism) importKeysFromBytes(blob []byte) ([]string, error) { - inputData, err := gpgme.NewDataBytes(blob) - if err != nil { - return nil, err - } - res, err := m.ctx.Import(inputData) - if err != nil { - return nil, err - } - keyIdentities := []string{} - for _, i := range res.Imports { - if i.Result == nil { - keyIdentities = append(keyIdentities, i.Fingerprint) - } - } - return keyIdentities, nil -} - // SupportsSigning returns nil if the mechanism supports signing, or a SigningNotSupportedError. func (m *gpgmeSigningMechanism) SupportsSigning() error { return nil @@ -169,7 +121,10 @@ func (m *gpgmeSigningMechanism) Sign(input []byte, keyIdentity string) ([]byte, return m.SignWithPassphrase(input, keyIdentity, "") } -// Verify parses unverifiedSignature and returns the content and the signer's identity +// Verify parses unverifiedSignature and returns the content and the signer's identity. +// For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity +// is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, +// or the mechanism should implement signingMechanismWithVerificationIdentityLookup. func (m *gpgmeSigningMechanism) Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) { signedBuffer := bytes.Buffer{} signedData, err := gpgme.NewDataWriter(&signedBuffer) @@ -196,6 +151,24 @@ func (m *gpgmeSigningMechanism) Verify(unverifiedSignature []byte) (contents []b return signedBuffer.Bytes(), sig.Fingerprint, nil } +// keyIdentityForVerificationKeyIdentity re-checks the key identity returned by Verify +// if it doesn't match an identity returned by NewEphemeralGPGSigningMechanism, trying to match it. +// (To be more specific, for mechanisms which return a subkey fingerprint from Verify, +// this converts the subkey fingerprint into the corresponding primary key fingerprint.) +func (m *gpgmeSigningMechanism) keyIdentityForVerificationKeyIdentity(keyIdentity string) (string, error) { + // In theory, if keyIdentity refers to a subkey, the same subkey could be attached to different primary keys; + // in that case, GetKey fails with “ambiguous name”. + // We _could_ handle that, by using KeyList* (GetKey is internally just a helper for KeyList*), but sharing + // a subkey that way is very unexpected, so, for now, prefer the much simpler implementation. + key, err := m.ctx.GetKey(keyIdentity, false) + if err != nil { + return "", err + } + // In theory this value could be nil if (gpg --list-keys --with-colons) misses a "pub:" line + // or a "fpr:" line, but gpg (in recent enough versions) prints that unconditionally. // codespell:ignore fpr + return key.Fingerprint(), nil +} + // UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, // along with a short identifier of the key used for signing. // WARNING: The short key identifier (which corresponds to "Key ID" for OpenPGP keys) diff --git a/vendor/go.podman.io/image/v5/signature/mechanism_gpgme_only.go b/vendor/go.podman.io/image/v5/signature/mechanism_gpgme_only.go new file mode 100644 index 000000000..0f971ac6a --- /dev/null +++ b/vendor/go.podman.io/image/v5/signature/mechanism_gpgme_only.go @@ -0,0 +1,64 @@ +//go:build !containers_image_openpgp && !containers_image_sequoia + +package signature + +import ( + "os" + + "github.com/proglottis/gpgme" +) + +// newEphemeralGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism which +// recognizes _only_ public keys from the supplied blobs, and returns the identities +// of these keys. +// The caller must call .Close() on the returned SigningMechanism. +func newEphemeralGPGSigningMechanism(blobs [][]byte) (signingMechanismWithPassphrase, []string, error) { + dir, err := os.MkdirTemp("", "containers-ephemeral-gpg-") + if err != nil { + return nil, nil, err + } + removeDir := true + defer func() { + if removeDir { + os.RemoveAll(dir) + } + }() + ctx, err := newGPGMEContext(dir) + if err != nil { + return nil, nil, err + } + keyIdentities := []string{} + for _, blob := range blobs { + ki, err := importKeysFromBytes(ctx, blob) + if err != nil { + return nil, nil, err + } + keyIdentities = append(keyIdentities, ki...) + } + + mech := newGPGMESigningMechanism(ctx, dir) + removeDir = false + return mech, keyIdentities, nil +} + +// importKeysFromBytes imports public keys from the supplied blob and returns their identities. +// The blob is assumed to have an appropriate format (the caller is expected to know which one). +// NOTE: This may modify long-term state (e.g. key storage in a directory underlying the mechanism); +// but we do not make this public, it can only be used through newEphemeralGPGSigningMechanism. +func importKeysFromBytes(ctx *gpgme.Context, blob []byte) ([]string, error) { + inputData, err := gpgme.NewDataBytes(blob) + if err != nil { + return nil, err + } + res, err := ctx.Import(inputData) + if err != nil { + return nil, err + } + keyIdentities := []string{} + for _, i := range res.Imports { + if i.Result == nil { + keyIdentities = append(keyIdentities, i.Fingerprint) + } + } + return keyIdentities, nil +} diff --git a/vendor/github.com/containers/image/v5/signature/mechanism_openpgp.go b/vendor/go.podman.io/image/v5/signature/mechanism_openpgp.go similarity index 90% rename from vendor/github.com/containers/image/v5/signature/mechanism_openpgp.go rename to vendor/go.podman.io/image/v5/signature/mechanism_openpgp.go index fea8590e1..2f1b99d18 100644 --- a/vendor/github.com/containers/image/v5/signature/mechanism_openpgp.go +++ b/vendor/go.podman.io/image/v5/signature/mechanism_openpgp.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/containers/image/v5/signature/internal" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/image/v5/signature/internal" + "go.podman.io/storage/pkg/homedir" // This is a fallback code; the primary recommendation is to use the gpgme mechanism // implementation, which is out-of-process and more appropriate for handling long-term private key material @@ -112,13 +112,13 @@ func (m *openpgpSigningMechanism) importKeysFromBytes(blob []byte) ([]string, er // SupportsSigning returns nil if the mechanism supports signing, or a SigningNotSupportedError. func (m *openpgpSigningMechanism) SupportsSigning() error { - return SigningNotSupportedError("signing is not supported in github.com/containers/image built with the containers_image_openpgp build tag") + return SigningNotSupportedError("signing is not supported in go.podman.io/image built with the containers_image_openpgp build tag") } // Sign creates a (non-detached) signature of input using keyIdentity. // Fails with a SigningNotSupportedError if the mechanism does not support signing. func (m *openpgpSigningMechanism) SignWithPassphrase(input []byte, keyIdentity string, passphrase string) ([]byte, error) { - return nil, SigningNotSupportedError("signing is not supported in github.com/containers/image built with the containers_image_openpgp build tag") + return nil, SigningNotSupportedError("signing is not supported in go.podman.io/image built with the containers_image_openpgp build tag") } // Sign creates a (non-detached) signature of input using keyIdentity. @@ -127,7 +127,10 @@ func (m *openpgpSigningMechanism) Sign(input []byte, keyIdentity string) ([]byte return m.SignWithPassphrase(input, keyIdentity, "") } -// Verify parses unverifiedSignature and returns the content and the signer's identity +// Verify parses unverifiedSignature and returns the content and the signer's identity. +// For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity +// is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, +// or the mechanism should implement signingMechanismWithVerificationIdentityLookup. func (m *openpgpSigningMechanism) Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) { md, err := openpgp.ReadMessage(bytes.NewReader(unverifiedSignature), m.keyring, nil, nil) if err != nil { @@ -166,7 +169,7 @@ func (m *openpgpSigningMechanism) Verify(unverifiedSignature []byte) (contents [ } // Uppercase the fingerprint to be compatible with gpgme - return content, strings.ToUpper(fmt.Sprintf("%x", md.SignedBy.PublicKey.Fingerprint)), nil + return content, strings.ToUpper(fmt.Sprintf("%x", md.SignedBy.Entity.PrimaryKey.Fingerprint)), nil } // UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, diff --git a/vendor/go.podman.io/image/v5/signature/mechanism_sequoia.go b/vendor/go.podman.io/image/v5/signature/mechanism_sequoia.go new file mode 100644 index 000000000..0a6f002f2 --- /dev/null +++ b/vendor/go.podman.io/image/v5/signature/mechanism_sequoia.go @@ -0,0 +1,84 @@ +//go:build containers_image_sequoia + +package signature + +import ( + "go.podman.io/image/v5/signature/internal/sequoia" +) + +// A GPG/OpenPGP signing mechanism, implemented using Sequoia and only supporting verification. +// Legacy users who reach newGPGSigningMechanismInDirectory will use GPGME. +// Signing using Sequoia is preferable, but should happen via signature/simplesequoia.NewSigner, not using +// the legacy mechanism API. +type sequoiaEphemeralSigningMechanism struct { + inner *sequoia.SigningMechanism +} + +// newEphemeralGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism which +// recognizes _only_ public keys from the supplied blobs, and returns the identities +// of these keys. +// The caller must call .Close() on the returned SigningMechanism. +func newEphemeralGPGSigningMechanism(blobs [][]byte) (signingMechanismWithPassphrase, []string, error) { + if err := sequoia.Init(); err != nil { + return nil, nil, err // Coverage: This is impractical to test in-process, with the static go_sequoia_dlhandle. + } + + mech, err := sequoia.NewEphemeralMechanism() + if err != nil { + return nil, nil, err + } + keyIdentities := []string{} + for _, blob := range blobs { + ki, err := mech.ImportKeys(blob) + if err != nil { + return nil, nil, err + } + keyIdentities = append(keyIdentities, ki...) + } + + return &sequoiaEphemeralSigningMechanism{ + inner: mech, + }, keyIdentities, nil +} + +func (m *sequoiaEphemeralSigningMechanism) Close() error { + return m.inner.Close() +} + +// SupportsSigning returns nil if the mechanism supports signing, or a SigningNotSupportedError. +func (m *sequoiaEphemeralSigningMechanism) SupportsSigning() error { + // This code is externally reachable via NewEphemeralGPGSigningMechanism(), but that API provides no way to + // import or generate a key. + return SigningNotSupportedError("caller error: Attempt to sign using a mechanism created via NewEphemeralGPGSigningMechanism().") +} + +// Sign creates a (non-detached) signature of input using keyIdentity and passphrase. +// Fails with a SigningNotSupportedError if the mechanism does not support signing. +func (m *sequoiaEphemeralSigningMechanism) SignWithPassphrase(input []byte, keyIdentity string, passphrase string) ([]byte, error) { + // This code is externally reachable via NewEphemeralGPGSigningMechanism(), but that API provides no way to + // import or generate a key. + return nil, SigningNotSupportedError("caller error: Attempt to sign using a mechanism created via NewEphemeralGPGSigningMechanism().") +} + +// Sign creates a (non-detached) signature of input using keyIdentity. +// Fails with a SigningNotSupportedError if the mechanism does not support signing. +func (m *sequoiaEphemeralSigningMechanism) Sign(input []byte, keyIdentity string) ([]byte, error) { + return m.SignWithPassphrase(input, keyIdentity, "") +} + +// Verify parses unverifiedSignature and returns the content and the signer's identity. +// For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity +// is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, +// or the mechanism should implement signingMechanismWithVerificationIdentityLookup. +func (m *sequoiaEphemeralSigningMechanism) Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) { + return m.inner.Verify(unverifiedSignature) +} + +// UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, +// along with a short identifier of the key used for signing. +// WARNING: The short key identifier (which corresponds to "Key ID" for OpenPGP keys) +// is NOT the same as a "key identity" used in other calls to this interface, and +// the values may have no recognizable relationship if the public key is not available. +func (m *sequoiaEphemeralSigningMechanism) UntrustedSignatureContents(untrustedSignature []byte) (untrustedContents []byte, shortKeyIdentifier string, err error) { + return gpgUntrustedSignatureContents(untrustedSignature) +} diff --git a/vendor/github.com/containers/image/v5/signature/pki_cert.go b/vendor/go.podman.io/image/v5/signature/pki_cert.go similarity index 97% rename from vendor/github.com/containers/image/v5/signature/pki_cert.go rename to vendor/go.podman.io/image/v5/signature/pki_cert.go index 20624540f..6e3a40b79 100644 --- a/vendor/github.com/containers/image/v5/signature/pki_cert.go +++ b/vendor/go.podman.io/image/v5/signature/pki_cert.go @@ -7,8 +7,8 @@ import ( "fmt" "slices" - "github.com/containers/image/v5/signature/internal" "github.com/sigstore/sigstore/pkg/cryptoutils" + "go.podman.io/image/v5/signature/internal" ) type pkiTrustRoot struct { diff --git a/vendor/github.com/containers/image/v5/signature/policy_config.go b/vendor/go.podman.io/image/v5/signature/policy_config.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/policy_config.go rename to vendor/go.podman.io/image/v5/signature/policy_config.go index 8de705c22..50f445148 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_config.go +++ b/vendor/go.podman.io/image/v5/signature/policy_config.go @@ -20,18 +20,18 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/signature/internal" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/signature/internal" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/regexp" ) // systemDefaultPolicyPath is the policy path used for DefaultPolicy(). // You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/signature.systemDefaultPolicyPath=$your_path' +// -ldflags '-X go.podman.io/image/v5/signature.systemDefaultPolicyPath=$your_path' var systemDefaultPolicyPath = builtinDefaultPolicyPath // userPolicyFile is the path to the per user policy path. diff --git a/vendor/github.com/containers/image/v5/signature/policy_config_sigstore.go b/vendor/go.podman.io/image/v5/signature/policy_config_sigstore.go similarity index 99% rename from vendor/github.com/containers/image/v5/signature/policy_config_sigstore.go rename to vendor/go.podman.io/image/v5/signature/policy_config_sigstore.go index 6393b66ea..87fb45558 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_config_sigstore.go +++ b/vendor/go.podman.io/image/v5/signature/policy_config_sigstore.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/containers/image/v5/signature/internal" + "go.podman.io/image/v5/signature/internal" ) // PRSigstoreSignedOption is way to pass values to NewPRSigstoreSigned diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval.go b/vendor/go.podman.io/image/v5/signature/policy_eval.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/policy_eval.go rename to vendor/go.podman.io/image/v5/signature/policy_eval.go index ab6b89c26..2d0db05ae 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval.go @@ -9,10 +9,10 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/unparsedimage" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/unparsedimage" + "go.podman.io/image/v5/types" ) // PolicyRequirementError is an explanatory text for rejecting a signature or an image. diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_baselayer.go b/vendor/go.podman.io/image/v5/signature/policy_eval_baselayer.go similarity index 92% rename from vendor/github.com/containers/image/v5/signature/policy_eval_baselayer.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_baselayer.go index a8bc01301..f310342d1 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_baselayer.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_baselayer.go @@ -5,8 +5,8 @@ package signature import ( "context" - "github.com/containers/image/v5/internal/private" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/private" ) func (pr *prSignedBaseLayer) isSignatureAuthorAccepted(ctx context.Context, image private.UnparsedImage, sig []byte) (signatureAcceptanceResult, *Signature, error) { diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_signedby.go b/vendor/go.podman.io/image/v5/signature/policy_eval_signedby.go similarity index 85% rename from vendor/github.com/containers/image/v5/signature/policy_eval_signedby.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_signedby.go index e5c932918..21ed59494 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_signedby.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_signedby.go @@ -6,12 +6,11 @@ import ( "context" "errors" "fmt" - "slices" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/manifest" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/manifest" ) func (pr *prSignedBy) isSignatureAuthorAccepted(ctx context.Context, image private.UnparsedImage, sig []byte) (signatureAcceptanceResult, *Signature, error) { @@ -50,15 +49,8 @@ func (pr *prSignedBy) isSignatureAuthorAccepted(ctx context.Context, image priva return sarRejected, nil, PolicyRequirementError("No public keys imported") } - signature, err := verifyAndExtractSignature(mech, sig, signatureAcceptanceRules{ - validateKeyIdentity: func(keyIdentity string) error { - if slices.Contains(trustedIdentities, keyIdentity) { - return nil - } - // Coverage: We use a private GPG home directory and only import trusted keys, so this should - // not be reachable. - return PolicyRequirementError(fmt.Sprintf("Signature by key %s is not accepted", keyIdentity)) - }, + signature, _, err := verifyAndExtractSignature(mech, sig, signatureAcceptanceRules{ + acceptedKeyIdentities: trustedIdentities, validateSignedDockerReference: func(ref string) error { if !pr.SignedIdentity.matchesDockerReference(image, ref) { return PolicyRequirementError(fmt.Sprintf("Signature for identity %q is not accepted", ref)) diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_sigstore.go b/vendor/go.podman.io/image/v5/signature/policy_eval_sigstore.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/policy_eval_sigstore.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_sigstore.go index faede787a..cee04dc4e 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_sigstore.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_sigstore.go @@ -12,13 +12,13 @@ import ( "os" "strings" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/signature/internal" digest "github.com/opencontainers/go-digest" "github.com/sigstore/sigstore/pkg/cryptoutils" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/signature/internal" ) // configBytesSources contains configuration fields which may result in one or more []byte values diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_simple.go b/vendor/go.podman.io/image/v5/signature/policy_eval_simple.go similarity index 92% rename from vendor/github.com/containers/image/v5/signature/policy_eval_simple.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_simple.go index 031866f0d..4ef35e3ad 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_simple.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_simple.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/transports" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/transports" ) func (pr *prInsecureAcceptAnything) isSignatureAuthorAccepted(ctx context.Context, image private.UnparsedImage, sig []byte) (signatureAcceptanceResult, *Signature, error) { diff --git a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go b/vendor/go.podman.io/image/v5/signature/policy_paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/policy_paths_common.go rename to vendor/go.podman.io/image/v5/signature/policy_paths_common.go diff --git a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go b/vendor/go.podman.io/image/v5/signature/policy_paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go rename to vendor/go.podman.io/image/v5/signature/policy_paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/signature/policy_reference_match.go b/vendor/go.podman.io/image/v5/signature/policy_reference_match.go similarity index 97% rename from vendor/github.com/containers/image/v5/signature/policy_reference_match.go rename to vendor/go.podman.io/image/v5/signature/policy_reference_match.go index 390957b02..0755c0399 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_reference_match.go +++ b/vendor/go.podman.io/image/v5/signature/policy_reference_match.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/transports" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/transports" ) // parseImageAndDockerReference converts an image and a reference string into two parsed entities, failing on any error and handling unidentified images. diff --git a/vendor/github.com/containers/image/v5/signature/policy_types.go b/vendor/go.podman.io/image/v5/signature/policy_types.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/policy_types.go rename to vendor/go.podman.io/image/v5/signature/policy_types.go diff --git a/vendor/github.com/containers/image/v5/signature/signer/signer.go b/vendor/go.podman.io/image/v5/signature/signer/signer.go similarity index 85% rename from vendor/github.com/containers/image/v5/signature/signer/signer.go rename to vendor/go.podman.io/image/v5/signature/signer/signer.go index 73ae550aa..0a70338aa 100644 --- a/vendor/github.com/containers/image/v5/signature/signer/signer.go +++ b/vendor/go.podman.io/image/v5/signature/signer/signer.go @@ -1,6 +1,6 @@ package signer -import "github.com/containers/image/v5/internal/signer" +import "go.podman.io/image/v5/internal/signer" // Signer is an object, possibly carrying state, that can be used by copy.Image to sign one or more container images. // It can only be created from within the containers/image package; it can’t be implemented externally. diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/copied.go b/vendor/go.podman.io/image/v5/signature/sigstore/copied.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/sigstore/copied.go rename to vendor/go.podman.io/image/v5/signature/sigstore/copied.go diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/generate.go b/vendor/go.podman.io/image/v5/signature/sigstore/generate.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/sigstore/generate.go rename to vendor/go.podman.io/image/v5/signature/sigstore/generate.go diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/internal/signer.go b/vendor/go.podman.io/image/v5/signature/sigstore/internal/signer.go similarity index 94% rename from vendor/github.com/containers/image/v5/signature/sigstore/internal/signer.go rename to vendor/go.podman.io/image/v5/signature/sigstore/internal/signer.go index c6258f408..5a4c244bd 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/internal/signer.go +++ b/vendor/go.podman.io/image/v5/signature/sigstore/internal/signer.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/signature/internal" sigstoreSignature "github.com/sigstore/sigstore/pkg/signature" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/signature/internal" ) type Option func(*SigstoreSigner) error diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/signer.go b/vendor/go.podman.io/image/v5/signature/sigstore/signer.go similarity index 89% rename from vendor/github.com/containers/image/v5/signature/sigstore/signer.go rename to vendor/go.podman.io/image/v5/signature/sigstore/signer.go index fb825ada9..80ebfb2a5 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/signer.go +++ b/vendor/go.podman.io/image/v5/signature/sigstore/signer.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - internalSigner "github.com/containers/image/v5/internal/signer" - "github.com/containers/image/v5/signature/signer" - "github.com/containers/image/v5/signature/sigstore/internal" "github.com/sigstore/sigstore/pkg/cryptoutils" + internalSigner "go.podman.io/image/v5/internal/signer" + "go.podman.io/image/v5/signature/signer" + "go.podman.io/image/v5/signature/sigstore/internal" ) type Option = internal.Option diff --git a/vendor/github.com/containers/image/v5/signature/simple.go b/vendor/go.podman.io/image/v5/signature/simple.go similarity index 89% rename from vendor/github.com/containers/image/v5/signature/simple.go rename to vendor/go.podman.io/image/v5/signature/simple.go index 94a846593..8711f6908 100644 --- a/vendor/github.com/containers/image/v5/signature/simple.go +++ b/vendor/go.podman.io/image/v5/signature/simple.go @@ -8,11 +8,12 @@ import ( "encoding/json" "errors" "fmt" + "slices" "time" - "github.com/containers/image/v5/signature/internal" - "github.com/containers/image/v5/version" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/signature/internal" + "go.podman.io/image/v5/version" ) const ( @@ -207,37 +208,52 @@ func (s untrustedSignature) sign(mech SigningMechanism, keyIdentity string, pass // because the functions have the same or similar types, so there is a risk of exchanging the functions; // named members of this struct are more explicit. type signatureAcceptanceRules struct { - validateKeyIdentity func(string) error + acceptedKeyIdentities []string validateSignedDockerReference func(string) error validateSignedDockerManifestDigest func(digest.Digest) error } // verifyAndExtractSignature verifies that unverifiedSignature has been signed, and that its principal components -// match expected values, both as specified by rules, and returns it -func verifyAndExtractSignature(mech SigningMechanism, unverifiedSignature []byte, rules signatureAcceptanceRules) (*Signature, error) { +// match expected values, both as specified by rules. +// Returns the signature, and an identity of the key that signed it. +func verifyAndExtractSignature(mech SigningMechanism, unverifiedSignature []byte, rules signatureAcceptanceRules) (*Signature, string, error) { signed, keyIdentity, err := mech.Verify(unverifiedSignature) if err != nil { - return nil, err + return nil, "", err } - if err := rules.validateKeyIdentity(keyIdentity); err != nil { - return nil, err + if !slices.Contains(rules.acceptedKeyIdentities, keyIdentity) { + withLookup, ok := mech.(signingMechanismWithVerificationIdentityLookup) + if !ok { + return nil, "", internal.NewInvalidSignatureError(fmt.Sprintf("signature by key %s is not accepted", keyIdentity)) + } + + primaryKey, err := withLookup.keyIdentityForVerificationKeyIdentity(keyIdentity) + if err != nil { + // Coverage: This only fails if lookup by keyIdentity fails, but we just found and used that key. + // Or maybe on some unexpected I/O error. + return nil, "", err + } + if !slices.Contains(rules.acceptedKeyIdentities, primaryKey) { + return nil, "", internal.NewInvalidSignatureError(fmt.Sprintf("signature by key %s of %s is not accepted", keyIdentity, primaryKey)) + } + keyIdentity = primaryKey } var unmatchedSignature untrustedSignature if err := json.Unmarshal(signed, &unmatchedSignature); err != nil { - return nil, internal.NewInvalidSignatureError(err.Error()) + return nil, "", internal.NewInvalidSignatureError(err.Error()) } if err := rules.validateSignedDockerManifestDigest(unmatchedSignature.untrustedDockerManifestDigest); err != nil { - return nil, err + return nil, "", err } if err := rules.validateSignedDockerReference(unmatchedSignature.untrustedDockerReference); err != nil { - return nil, err + return nil, "", err } // signatureAcceptanceRules have accepted this value. return &Signature{ DockerManifestDigest: unmatchedSignature.untrustedDockerManifestDigest, DockerReference: unmatchedSignature.untrustedDockerReference, - }, nil + }, keyIdentity, nil } // GetUntrustedSignatureInformationWithoutVerifying extracts information available in an untrusted signature, diff --git a/vendor/github.com/containers/image/v5/signature/simplesigning/signer.go b/vendor/go.podman.io/image/v5/signature/simplesigning/signer.go similarity index 92% rename from vendor/github.com/containers/image/v5/signature/simplesigning/signer.go rename to vendor/go.podman.io/image/v5/signature/simplesigning/signer.go index 983bbb10b..038a255c5 100644 --- a/vendor/github.com/containers/image/v5/signature/simplesigning/signer.go +++ b/vendor/go.podman.io/image/v5/signature/simplesigning/signer.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" - internalSig "github.com/containers/image/v5/internal/signature" - internalSigner "github.com/containers/image/v5/internal/signer" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/signature/signer" + "go.podman.io/image/v5/docker/reference" + internalSig "go.podman.io/image/v5/internal/signature" + internalSigner "go.podman.io/image/v5/internal/signer" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/signature/signer" ) // simpleSigner is a signer.SignerImplementation implementation for simple signing signatures. diff --git a/vendor/github.com/containers/image/v5/transports/stub.go b/vendor/go.podman.io/image/v5/transports/stub.go similarity index 97% rename from vendor/github.com/containers/image/v5/transports/stub.go rename to vendor/go.podman.io/image/v5/transports/stub.go index 2c186a90c..ae44fd428 100644 --- a/vendor/github.com/containers/image/v5/transports/stub.go +++ b/vendor/go.podman.io/image/v5/transports/stub.go @@ -3,7 +3,7 @@ package transports import ( "fmt" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // stubTransport is an implementation of types.ImageTransport which has a name, but rejects any references with “the transport $name: is not supported in this build”. diff --git a/vendor/github.com/containers/image/v5/transports/transports.go b/vendor/go.podman.io/image/v5/transports/transports.go similarity index 96% rename from vendor/github.com/containers/image/v5/transports/transports.go rename to vendor/go.podman.io/image/v5/transports/transports.go index 4c9c0889c..04f05292b 100644 --- a/vendor/github.com/containers/image/v5/transports/transports.go +++ b/vendor/go.podman.io/image/v5/transports/transports.go @@ -5,8 +5,8 @@ import ( "sort" "sync" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/types" ) // knownTransports is a registry of known ImageTransport instances. diff --git a/vendor/github.com/containers/image/v5/types/types.go b/vendor/go.podman.io/image/v5/types/types.go similarity index 99% rename from vendor/github.com/containers/image/v5/types/types.go rename to vendor/go.podman.io/image/v5/types/types.go index a93951780..41f1a632e 100644 --- a/vendor/github.com/containers/image/v5/types/types.go +++ b/vendor/go.podman.io/image/v5/types/types.go @@ -6,10 +6,10 @@ import ( "net/url" "time" - "github.com/containers/image/v5/docker/reference" - compression "github.com/containers/image/v5/pkg/compression/types" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + compression "go.podman.io/image/v5/pkg/compression/types" ) // ImageTransport is a top-level namespace for ways to store/load an image. diff --git a/vendor/github.com/containers/image/v5/version/version.go b/vendor/go.podman.io/image/v5/version/version.go similarity index 93% rename from vendor/github.com/containers/image/v5/version/version.go rename to vendor/go.podman.io/image/v5/version/version.go index f494845b8..e577735ee 100644 --- a/vendor/github.com/containers/image/v5/version/version.go +++ b/vendor/go.podman.io/image/v5/version/version.go @@ -6,9 +6,9 @@ const ( // VersionMajor is for an API incompatible changes VersionMajor = 5 // VersionMinor is for functionality in a backwards-compatible manner - VersionMinor = 36 + VersionMinor = 37 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 2 + VersionPatch = 0 // VersionDev indicates development branch. Releases will be empty string. VersionDev = "" diff --git a/vendor/github.com/containers/storage/AUTHORS b/vendor/go.podman.io/storage/AUTHORS similarity index 100% rename from vendor/github.com/containers/storage/AUTHORS rename to vendor/go.podman.io/storage/AUTHORS diff --git a/vendor/github.com/containers/storage/LICENSE b/vendor/go.podman.io/storage/LICENSE similarity index 100% rename from vendor/github.com/containers/storage/LICENSE rename to vendor/go.podman.io/storage/LICENSE diff --git a/vendor/github.com/containers/storage/NOTICE b/vendor/go.podman.io/storage/NOTICE similarity index 100% rename from vendor/github.com/containers/storage/NOTICE rename to vendor/go.podman.io/storage/NOTICE diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock.go diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_unix.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_unix.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_unix.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_unix.go diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_windows.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_windows.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_windows.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_windows.go diff --git a/vendor/github.com/containers/storage/pkg/archive/README.md b/vendor/go.podman.io/storage/pkg/archive/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/README.md rename to vendor/go.podman.io/storage/pkg/archive/README.md diff --git a/vendor/github.com/containers/storage/pkg/archive/archive.go b/vendor/go.podman.io/storage/pkg/archive/archive.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/archive/archive.go rename to vendor/go.podman.io/storage/pkg/archive/archive.go index a66d2b891..5f8647af7 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive.go @@ -18,15 +18,15 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/pools" - "github.com/containers/storage/pkg/promise" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" gzip "github.com/klauspost/pgzip" "github.com/sirupsen/logrus" "github.com/ulikunitz/xz" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/pools" + "go.podman.io/storage/pkg/promise" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" ) type ( diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_110.go b/vendor/go.podman.io/storage/pkg/archive/archive_110.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_110.go rename to vendor/go.podman.io/storage/pkg/archive/archive_110.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_19.go b/vendor/go.podman.io/storage/pkg/archive/archive_19.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_19.go rename to vendor/go.podman.io/storage/pkg/archive/archive_19.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_bsd.go b/vendor/go.podman.io/storage/pkg/archive/archive_bsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_bsd.go rename to vendor/go.podman.io/storage/pkg/archive/archive_bsd.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_linux.go b/vendor/go.podman.io/storage/pkg/archive/archive_linux.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/archive/archive_linux.go rename to vendor/go.podman.io/storage/pkg/archive/archive_linux.go index b3245f7fd..fd7123bab 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive_linux.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive_linux.go @@ -7,8 +7,8 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_other.go b/vendor/go.podman.io/storage/pkg/archive/archive_other.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_other.go rename to vendor/go.podman.io/storage/pkg/archive/archive_other.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_unix.go b/vendor/go.podman.io/storage/pkg/archive/archive_unix.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/archive/archive_unix.go rename to vendor/go.podman.io/storage/pkg/archive/archive_unix.go index d9bcb97ba..2d9d68de2 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive_unix.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive_unix.go @@ -9,8 +9,8 @@ import ( "path/filepath" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_windows.go b/vendor/go.podman.io/storage/pkg/archive/archive_windows.go similarity index 96% rename from vendor/github.com/containers/storage/pkg/archive/archive_windows.go rename to vendor/go.podman.io/storage/pkg/archive/archive_windows.go index e98782869..1183f4a28 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive_windows.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive_windows.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/longpath" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/longpath" ) // fixVolumePathPrefix does platform specific processing to ensure that if diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_zstd.go b/vendor/go.podman.io/storage/pkg/archive/archive_zstd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_zstd.go rename to vendor/go.podman.io/storage/pkg/archive/archive_zstd.go diff --git a/vendor/github.com/containers/storage/pkg/archive/changes.go b/vendor/go.podman.io/storage/pkg/archive/changes.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/archive/changes.go rename to vendor/go.podman.io/storage/pkg/archive/changes.go index 76edac85d..051ab6952 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes.go @@ -14,11 +14,11 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/pools" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/pools" + "go.podman.io/storage/pkg/system" ) // ChangeType represents the change type. diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_linux.go b/vendor/go.podman.io/storage/pkg/archive/changes_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/archive/changes_linux.go rename to vendor/go.podman.io/storage/pkg/archive/changes_linux.go index 95284bb81..343f3e686 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_linux.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_linux.go @@ -11,9 +11,9 @@ import ( "syscall" "unsafe" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_other.go b/vendor/go.podman.io/storage/pkg/archive/changes_other.go similarity index 96% rename from vendor/github.com/containers/storage/pkg/archive/changes_other.go rename to vendor/go.podman.io/storage/pkg/archive/changes_other.go index 2965ccc9f..5fde4c738 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_other.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_other.go @@ -10,8 +10,8 @@ import ( "runtime" "strings" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" ) func collectFileInfoForChanges(oldDir, newDir string, oldIDMap, newIDMap *idtools.IDMappings) (*FileInfo, *FileInfo, error) { diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_unix.go b/vendor/go.podman.io/storage/pkg/archive/changes_unix.go similarity index 94% rename from vendor/github.com/containers/storage/pkg/archive/changes_unix.go rename to vendor/go.podman.io/storage/pkg/archive/changes_unix.go index fb2cb70c2..f07a135a4 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_unix.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_unix.go @@ -6,8 +6,8 @@ import ( "os" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_windows.go b/vendor/go.podman.io/storage/pkg/archive/changes_windows.go similarity index 93% rename from vendor/github.com/containers/storage/pkg/archive/changes_windows.go rename to vendor/go.podman.io/storage/pkg/archive/changes_windows.go index 1bab94fa5..947ec2d22 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_windows.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_windows.go @@ -3,7 +3,7 @@ package archive import ( "os" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/system" ) func statDifferent(oldStat *system.StatT, oldInfo *FileInfo, newStat *system.StatT, newInfo *FileInfo) bool { diff --git a/vendor/github.com/containers/storage/pkg/archive/copy.go b/vendor/go.podman.io/storage/pkg/archive/copy.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/archive/copy.go rename to vendor/go.podman.io/storage/pkg/archive/copy.go index 4d46167d7..308f132d5 100644 --- a/vendor/github.com/containers/storage/pkg/archive/copy.go +++ b/vendor/go.podman.io/storage/pkg/archive/copy.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) // Errors used or returned by this file. diff --git a/vendor/github.com/containers/storage/pkg/archive/copy_unix.go b/vendor/go.podman.io/storage/pkg/archive/copy_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/copy_unix.go rename to vendor/go.podman.io/storage/pkg/archive/copy_unix.go diff --git a/vendor/github.com/containers/storage/pkg/archive/copy_windows.go b/vendor/go.podman.io/storage/pkg/archive/copy_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/copy_windows.go rename to vendor/go.podman.io/storage/pkg/archive/copy_windows.go diff --git a/vendor/github.com/containers/storage/pkg/archive/diff.go b/vendor/go.podman.io/storage/pkg/archive/diff.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/archive/diff.go rename to vendor/go.podman.io/storage/pkg/archive/diff.go index 6f3067770..355d65f21 100644 --- a/vendor/github.com/containers/storage/pkg/archive/diff.go +++ b/vendor/go.podman.io/storage/pkg/archive/diff.go @@ -10,11 +10,11 @@ import ( "runtime" "strings" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/pools" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/pools" + "go.podman.io/storage/pkg/system" ) // UnpackLayer unpack `layer` to a `dest`. The stream `layer` can be diff --git a/vendor/github.com/containers/storage/pkg/archive/fflags_bsd.go b/vendor/go.podman.io/storage/pkg/archive/fflags_bsd.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/archive/fflags_bsd.go rename to vendor/go.podman.io/storage/pkg/archive/fflags_bsd.go index 4da1ced3e..829c95ef1 100644 --- a/vendor/github.com/containers/storage/pkg/archive/fflags_bsd.go +++ b/vendor/go.podman.io/storage/pkg/archive/fflags_bsd.go @@ -10,7 +10,7 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/system" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/archive/fflags_unsupported.go b/vendor/go.podman.io/storage/pkg/archive/fflags_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/fflags_unsupported.go rename to vendor/go.podman.io/storage/pkg/archive/fflags_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/archive/filter.go b/vendor/go.podman.io/storage/pkg/archive/filter.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/filter.go rename to vendor/go.podman.io/storage/pkg/archive/filter.go diff --git a/vendor/github.com/containers/storage/pkg/archive/time_linux.go b/vendor/go.podman.io/storage/pkg/archive/time_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/time_linux.go rename to vendor/go.podman.io/storage/pkg/archive/time_linux.go diff --git a/vendor/github.com/containers/storage/pkg/archive/time_unsupported.go b/vendor/go.podman.io/storage/pkg/archive/time_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/time_unsupported.go rename to vendor/go.podman.io/storage/pkg/archive/time_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/archive/whiteouts.go b/vendor/go.podman.io/storage/pkg/archive/whiteouts.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/whiteouts.go rename to vendor/go.podman.io/storage/pkg/archive/whiteouts.go diff --git a/vendor/github.com/containers/storage/pkg/archive/wrap.go b/vendor/go.podman.io/storage/pkg/archive/wrap.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/wrap.go rename to vendor/go.podman.io/storage/pkg/archive/wrap.go diff --git a/vendor/github.com/containers/storage/pkg/chunked/compressor/compressor.go b/vendor/go.podman.io/storage/pkg/chunked/compressor/compressor.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/chunked/compressor/compressor.go rename to vendor/go.podman.io/storage/pkg/chunked/compressor/compressor.go index 2930723aa..23bcbda51 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/compressor/compressor.go +++ b/vendor/go.podman.io/storage/pkg/chunked/compressor/compressor.go @@ -9,12 +9,12 @@ import ( "bytes" "io" - "github.com/containers/storage/pkg/chunked/internal/minimal" - "github.com/containers/storage/pkg/ioutils" "github.com/opencontainers/go-digest" "github.com/vbatts/tar-split/archive/tar" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" + "go.podman.io/storage/pkg/chunked/internal/minimal" + "go.podman.io/storage/pkg/ioutils" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/chunked/compressor/rollsum.go b/vendor/go.podman.io/storage/pkg/chunked/compressor/rollsum.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/chunked/compressor/rollsum.go rename to vendor/go.podman.io/storage/pkg/chunked/compressor/rollsum.go diff --git a/vendor/github.com/containers/storage/pkg/chunked/internal/minimal/compression.go b/vendor/go.podman.io/storage/pkg/chunked/internal/minimal/compression.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/chunked/internal/minimal/compression.go rename to vendor/go.podman.io/storage/pkg/chunked/internal/minimal/compression.go index 4191524cc..256365759 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/internal/minimal/compression.go +++ b/vendor/go.podman.io/storage/pkg/chunked/internal/minimal/compression.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "github.com/containers/storage/pkg/archive" jsoniter "github.com/json-iterator/go" "github.com/klauspost/compress/zstd" "github.com/opencontainers/go-digest" "github.com/vbatts/tar-split/archive/tar" + "go.podman.io/storage/pkg/archive" ) // ZstdWriter is an interface that wraps standard io.WriteCloser and Reset() to reuse the compressor with a new writer. diff --git a/vendor/github.com/containers/storage/pkg/chunked/toc/toc.go b/vendor/go.podman.io/storage/pkg/chunked/toc/toc.go similarity index 95% rename from vendor/github.com/containers/storage/pkg/chunked/toc/toc.go rename to vendor/go.podman.io/storage/pkg/chunked/toc/toc.go index 6f39b2ae2..7059b5406 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/toc/toc.go +++ b/vendor/go.podman.io/storage/pkg/chunked/toc/toc.go @@ -3,8 +3,8 @@ package toc import ( "errors" - "github.com/containers/storage/pkg/chunked/internal/minimal" digest "github.com/opencontainers/go-digest" + "go.podman.io/storage/pkg/chunked/internal/minimal" ) // tocJSONDigestAnnotation is the annotation key for the digest of the estargz diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_unix.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_windows.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_windows.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_darwin.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_darwin.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_solaris.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_solaris.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_unix.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_unix.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_unix.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_windows.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_windows.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/reflink_linux.go b/vendor/go.podman.io/storage/pkg/fileutils/reflink_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/reflink_linux.go rename to vendor/go.podman.io/storage/pkg/fileutils/reflink_linux.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/reflink_unsupported.go b/vendor/go.podman.io/storage/pkg/fileutils/reflink_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/reflink_unsupported.go rename to vendor/go.podman.io/storage/pkg/fileutils/reflink_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir.go b/vendor/go.podman.io/storage/pkg/homedir/homedir.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/homedir/homedir.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir.go diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go b/vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go index f351b48bb..b088c2a85 100644 --- a/vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go +++ b/vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go @@ -14,8 +14,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/unshare" ) // Key returns the env var name for the user's home dir based on diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir_windows.go b/vendor/go.podman.io/storage/pkg/homedir/homedir_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/homedir/homedir_windows.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir_windows.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools.go b/vendor/go.podman.io/storage/pkg/idtools/idtools.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/idtools/idtools.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools.go index 13277f090..6fcba9b33 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/idtools.go +++ b/vendor/go.podman.io/storage/pkg/idtools/idtools.go @@ -14,8 +14,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/system" ) // IDMap contains a single entry for user namespace range remapping. An array diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_supported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_supported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go index 1da7dadbf..817b59aed 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go +++ b/vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go @@ -12,9 +12,9 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/system" "github.com/moby/sys/user" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/system" ) var ( diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_windows.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_windows.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_windows.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/parser.go b/vendor/go.podman.io/storage/pkg/idtools/parser.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/parser.go rename to vendor/go.podman.io/storage/pkg/idtools/parser.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go rename to vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go index ac27718de..d2ff4466c 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go +++ b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) // add a user and/or group to Linux /etc/passwd, /etc/group using standard diff --git a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_unsupported.go b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/usergroupadd_unsupported.go rename to vendor/go.podman.io/storage/pkg/idtools/usergroupadd_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/utils_unix.go b/vendor/go.podman.io/storage/pkg/idtools/utils_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/utils_unix.go rename to vendor/go.podman.io/storage/pkg/idtools/utils_unix.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/buffer.go b/vendor/go.podman.io/storage/pkg/ioutils/buffer.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/buffer.go rename to vendor/go.podman.io/storage/pkg/ioutils/buffer.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/bytespipe.go b/vendor/go.podman.io/storage/pkg/ioutils/bytespipe.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/bytespipe.go rename to vendor/go.podman.io/storage/pkg/ioutils/bytespipe.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters_linux.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters_linux.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters_linux.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters_other.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters_other.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters_other.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters_other.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/readers.go b/vendor/go.podman.io/storage/pkg/ioutils/readers.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/readers.go rename to vendor/go.podman.io/storage/pkg/ioutils/readers.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/temp_unix.go b/vendor/go.podman.io/storage/pkg/ioutils/temp_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/temp_unix.go rename to vendor/go.podman.io/storage/pkg/ioutils/temp_unix.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go b/vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go similarity index 87% rename from vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go rename to vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go index 79837fb33..b60ad8f49 100644 --- a/vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go +++ b/vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go @@ -5,7 +5,7 @@ package ioutils import ( "os" - "github.com/containers/storage/pkg/longpath" + "go.podman.io/storage/pkg/longpath" ) // TempDir is the equivalent of os.MkdirTemp, except that the result is in Windows longpath format. diff --git a/vendor/github.com/containers/storage/pkg/ioutils/writeflusher.go b/vendor/go.podman.io/storage/pkg/ioutils/writeflusher.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/writeflusher.go rename to vendor/go.podman.io/storage/pkg/ioutils/writeflusher.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/writers.go b/vendor/go.podman.io/storage/pkg/ioutils/writers.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/writers.go rename to vendor/go.podman.io/storage/pkg/ioutils/writers.go diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lastwrite.go b/vendor/go.podman.io/storage/pkg/lockfile/lastwrite.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/lockfile/lastwrite.go rename to vendor/go.podman.io/storage/pkg/lockfile/lastwrite.go diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile.go index dfe81c245..52b4fe597 100644 --- a/vendor/github.com/containers/storage/pkg/lockfile/lockfile.go +++ b/vendor/go.podman.io/storage/pkg/lockfile/lockfile.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/containers/storage/internal/rawfilelock" + "go.podman.io/storage/internal/rawfilelock" ) // A Locker represents a file lock where the file is used to cache an diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go index 14c27c51f..780ad8aef 100644 --- a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go +++ b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go @@ -5,7 +5,7 @@ package lockfile import ( "time" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_windows.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile_windows.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile_windows.go diff --git a/vendor/github.com/containers/storage/pkg/longpath/longpath.go b/vendor/go.podman.io/storage/pkg/longpath/longpath.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/longpath/longpath.go rename to vendor/go.podman.io/storage/pkg/longpath/longpath.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags.go b/vendor/go.podman.io/storage/pkg/mount/flags.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags.go rename to vendor/go.podman.io/storage/pkg/mount/flags.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_freebsd.go b/vendor/go.podman.io/storage/pkg/mount/flags_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_freebsd.go rename to vendor/go.podman.io/storage/pkg/mount/flags_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_linux.go b/vendor/go.podman.io/storage/pkg/mount/flags_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_linux.go rename to vendor/go.podman.io/storage/pkg/mount/flags_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/flags_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/flags_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mount.go b/vendor/go.podman.io/storage/pkg/mount/mount.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mount.go rename to vendor/go.podman.io/storage/pkg/mount/mount.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go b/vendor/go.podman.io/storage/pkg/mount/mounter_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_linux.go b/vendor/go.podman.io/storage/pkg/mount/mounter_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_linux.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/mounter_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mountinfo.go b/vendor/go.podman.io/storage/pkg/mount/mountinfo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mountinfo.go rename to vendor/go.podman.io/storage/pkg/mount/mountinfo.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mountinfo_linux.go b/vendor/go.podman.io/storage/pkg/mount/mountinfo_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mountinfo_linux.go rename to vendor/go.podman.io/storage/pkg/mount/mountinfo_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/sharedsubtree_linux.go b/vendor/go.podman.io/storage/pkg/mount/sharedsubtree_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/sharedsubtree_linux.go rename to vendor/go.podman.io/storage/pkg/mount/sharedsubtree_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/unmount_unix.go b/vendor/go.podman.io/storage/pkg/mount/unmount_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/unmount_unix.go rename to vendor/go.podman.io/storage/pkg/mount/unmount_unix.go diff --git a/vendor/github.com/containers/storage/pkg/mount/unmount_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/unmount_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/unmount_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/unmount_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/pools/pools.go b/vendor/go.podman.io/storage/pkg/pools/pools.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/pools/pools.go rename to vendor/go.podman.io/storage/pkg/pools/pools.go index e68648d1d..78b729c2e 100644 --- a/vendor/github.com/containers/storage/pkg/pools/pools.go +++ b/vendor/go.podman.io/storage/pkg/pools/pools.go @@ -14,7 +14,7 @@ import ( "io" "sync" - "github.com/containers/storage/pkg/ioutils" + "go.podman.io/storage/pkg/ioutils" ) var ( diff --git a/vendor/github.com/containers/storage/pkg/promise/promise.go b/vendor/go.podman.io/storage/pkg/promise/promise.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/promise/promise.go rename to vendor/go.podman.io/storage/pkg/promise/promise.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/README.md b/vendor/go.podman.io/storage/pkg/reexec/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/README.md rename to vendor/go.podman.io/storage/pkg/reexec/README.md diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_freebsd.go b/vendor/go.podman.io/storage/pkg/reexec/command_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_freebsd.go rename to vendor/go.podman.io/storage/pkg/reexec/command_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_linux.go b/vendor/go.podman.io/storage/pkg/reexec/command_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_linux.go rename to vendor/go.podman.io/storage/pkg/reexec/command_linux.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_unix.go b/vendor/go.podman.io/storage/pkg/reexec/command_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_unix.go rename to vendor/go.podman.io/storage/pkg/reexec/command_unix.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_unsupported.go b/vendor/go.podman.io/storage/pkg/reexec/command_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_unsupported.go rename to vendor/go.podman.io/storage/pkg/reexec/command_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_windows.go b/vendor/go.podman.io/storage/pkg/reexec/command_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_windows.go rename to vendor/go.podman.io/storage/pkg/reexec/command_windows.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/reexec.go b/vendor/go.podman.io/storage/pkg/reexec/reexec.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/reexec.go rename to vendor/go.podman.io/storage/pkg/reexec/reexec.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp.go b/vendor/go.podman.io/storage/pkg/regexp/regexp.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp_dontprecompile.go b/vendor/go.podman.io/storage/pkg/regexp/regexp_dontprecompile.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp_dontprecompile.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp_dontprecompile.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp_precompile.go b/vendor/go.podman.io/storage/pkg/regexp/regexp_precompile.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp_precompile.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp_precompile.go diff --git a/vendor/github.com/containers/storage/pkg/system/chmod.go b/vendor/go.podman.io/storage/pkg/system/chmod.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chmod.go rename to vendor/go.podman.io/storage/pkg/system/chmod.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes.go b/vendor/go.podman.io/storage/pkg/system/chtimes.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes.go rename to vendor/go.podman.io/storage/pkg/system/chtimes.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes_unix.go b/vendor/go.podman.io/storage/pkg/system/chtimes_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes_unix.go rename to vendor/go.podman.io/storage/pkg/system/chtimes_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes_windows.go b/vendor/go.podman.io/storage/pkg/system/chtimes_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes_windows.go rename to vendor/go.podman.io/storage/pkg/system/chtimes_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/errors.go b/vendor/go.podman.io/storage/pkg/system/errors.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/errors.go rename to vendor/go.podman.io/storage/pkg/system/errors.go diff --git a/vendor/github.com/containers/storage/pkg/system/exitcode.go b/vendor/go.podman.io/storage/pkg/system/exitcode.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/exitcode.go rename to vendor/go.podman.io/storage/pkg/system/exitcode.go diff --git a/vendor/github.com/containers/storage/pkg/system/extattr_freebsd.go b/vendor/go.podman.io/storage/pkg/system/extattr_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/extattr_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/extattr_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/extattr_unsupported.go b/vendor/go.podman.io/storage/pkg/system/extattr_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/extattr_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/extattr_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/init.go b/vendor/go.podman.io/storage/pkg/system/init.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/init.go rename to vendor/go.podman.io/storage/pkg/system/init.go diff --git a/vendor/github.com/containers/storage/pkg/system/init_windows.go b/vendor/go.podman.io/storage/pkg/system/init_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/init_windows.go rename to vendor/go.podman.io/storage/pkg/system/init_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/lchflags_bsd.go b/vendor/go.podman.io/storage/pkg/system/lchflags_bsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lchflags_bsd.go rename to vendor/go.podman.io/storage/pkg/system/lchflags_bsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/lchown.go b/vendor/go.podman.io/storage/pkg/system/lchown.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lchown.go rename to vendor/go.podman.io/storage/pkg/system/lchown.go diff --git a/vendor/github.com/containers/storage/pkg/system/lcow_unix.go b/vendor/go.podman.io/storage/pkg/system/lcow_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lcow_unix.go rename to vendor/go.podman.io/storage/pkg/system/lcow_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/lcow_windows.go b/vendor/go.podman.io/storage/pkg/system/lcow_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lcow_windows.go rename to vendor/go.podman.io/storage/pkg/system/lcow_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/lstat_unix.go b/vendor/go.podman.io/storage/pkg/system/lstat_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lstat_unix.go rename to vendor/go.podman.io/storage/pkg/system/lstat_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/lstat_windows.go b/vendor/go.podman.io/storage/pkg/system/lstat_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lstat_windows.go rename to vendor/go.podman.io/storage/pkg/system/lstat_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo.go b/vendor/go.podman.io/storage/pkg/system/meminfo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo.go rename to vendor/go.podman.io/storage/pkg/system/meminfo.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_freebsd.go b/vendor/go.podman.io/storage/pkg/system/meminfo_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_linux.go b/vendor/go.podman.io/storage/pkg/system/meminfo_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_linux.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_solaris.go b/vendor/go.podman.io/storage/pkg/system/meminfo_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_solaris.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_unsupported.go b/vendor/go.podman.io/storage/pkg/system/meminfo_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_windows.go b/vendor/go.podman.io/storage/pkg/system/meminfo_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_windows.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod.go b/vendor/go.podman.io/storage/pkg/system/mknod.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod.go rename to vendor/go.podman.io/storage/pkg/system/mknod.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod_freebsd.go b/vendor/go.podman.io/storage/pkg/system/mknod_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/mknod_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod_windows.go b/vendor/go.podman.io/storage/pkg/system/mknod_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod_windows.go rename to vendor/go.podman.io/storage/pkg/system/mknod_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/path.go b/vendor/go.podman.io/storage/pkg/system/path.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path.go rename to vendor/go.podman.io/storage/pkg/system/path.go diff --git a/vendor/github.com/containers/storage/pkg/system/path_unix.go b/vendor/go.podman.io/storage/pkg/system/path_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path_unix.go rename to vendor/go.podman.io/storage/pkg/system/path_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/path_windows.go b/vendor/go.podman.io/storage/pkg/system/path_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path_windows.go rename to vendor/go.podman.io/storage/pkg/system/path_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/process_unix.go b/vendor/go.podman.io/storage/pkg/system/process_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/process_unix.go rename to vendor/go.podman.io/storage/pkg/system/process_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/rm.go b/vendor/go.podman.io/storage/pkg/system/rm.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/system/rm.go rename to vendor/go.podman.io/storage/pkg/system/rm.go index 12243707a..c151c1449 100644 --- a/vendor/github.com/containers/storage/pkg/system/rm.go +++ b/vendor/go.podman.io/storage/pkg/system/rm.go @@ -7,8 +7,8 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/mount" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/mount" ) // EnsureRemoveAll wraps `os.RemoveAll` to check for specific errors that can diff --git a/vendor/github.com/containers/storage/pkg/system/rm_common.go b/vendor/go.podman.io/storage/pkg/system/rm_common.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/rm_common.go rename to vendor/go.podman.io/storage/pkg/system/rm_common.go diff --git a/vendor/github.com/containers/storage/pkg/system/rm_freebsd.go b/vendor/go.podman.io/storage/pkg/system/rm_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/rm_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/rm_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_common.go b/vendor/go.podman.io/storage/pkg/system/stat_common.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_common.go rename to vendor/go.podman.io/storage/pkg/system/stat_common.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_darwin.go b/vendor/go.podman.io/storage/pkg/system/stat_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_darwin.go rename to vendor/go.podman.io/storage/pkg/system/stat_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_freebsd.go b/vendor/go.podman.io/storage/pkg/system/stat_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_linux.go b/vendor/go.podman.io/storage/pkg/system/stat_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_linux.go rename to vendor/go.podman.io/storage/pkg/system/stat_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_netbsd.go b/vendor/go.podman.io/storage/pkg/system/stat_netbsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_netbsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_netbsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_openbsd.go b/vendor/go.podman.io/storage/pkg/system/stat_openbsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_openbsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_openbsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_solaris.go b/vendor/go.podman.io/storage/pkg/system/stat_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_solaris.go rename to vendor/go.podman.io/storage/pkg/system/stat_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_unix.go b/vendor/go.podman.io/storage/pkg/system/stat_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_unix.go rename to vendor/go.podman.io/storage/pkg/system/stat_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_windows.go b/vendor/go.podman.io/storage/pkg/system/stat_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_windows.go rename to vendor/go.podman.io/storage/pkg/system/stat_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/syscall_unix.go b/vendor/go.podman.io/storage/pkg/system/syscall_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/syscall_unix.go rename to vendor/go.podman.io/storage/pkg/system/syscall_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/syscall_windows.go b/vendor/go.podman.io/storage/pkg/system/syscall_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/syscall_windows.go rename to vendor/go.podman.io/storage/pkg/system/syscall_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/umask.go b/vendor/go.podman.io/storage/pkg/system/umask.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/umask.go rename to vendor/go.podman.io/storage/pkg/system/umask.go diff --git a/vendor/github.com/containers/storage/pkg/system/umask_windows.go b/vendor/go.podman.io/storage/pkg/system/umask_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/umask_windows.go rename to vendor/go.podman.io/storage/pkg/system/umask_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_freebsd.go b/vendor/go.podman.io/storage/pkg/system/utimes_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/utimes_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_linux.go b/vendor/go.podman.io/storage/pkg/system/utimes_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_linux.go rename to vendor/go.podman.io/storage/pkg/system/utimes_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_unsupported.go b/vendor/go.podman.io/storage/pkg/system/utimes_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/utimes_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_darwin.go b/vendor/go.podman.io/storage/pkg/system/xattrs_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_darwin.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_freebsd.go b/vendor/go.podman.io/storage/pkg/system/xattrs_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_linux.go b/vendor/go.podman.io/storage/pkg/system/xattrs_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_linux.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_unsupported.go b/vendor/go.podman.io/storage/pkg/system/xattrs_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/getenv_linux_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/getenv_linux_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/getenv_linux_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/getenv_linux_cgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/getenv_linux_nocgo.go b/vendor/go.podman.io/storage/pkg/unshare/getenv_linux_nocgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/getenv_linux_nocgo.go rename to vendor/go.podman.io/storage/pkg/unshare/getenv_linux_nocgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare.c b/vendor/go.podman.io/storage/pkg/unshare/unshare.c similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare.c rename to vendor/go.podman.io/storage/pkg/unshare/unshare.c diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare.go b/vendor/go.podman.io/storage/pkg/unshare/unshare.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_cgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go index 5d0a7a683..a9daf714c 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go @@ -5,8 +5,8 @@ package unshare import ( "os" - "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/idtools" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.c b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.c similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.c rename to vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.c diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go index 37a87fa5b..2b81f896b 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go @@ -13,8 +13,8 @@ import ( "strconv" "syscall" - "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/reexec" ) // Cmd wraps an exec.Cmd created by the reexec package in unshare(), diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_gccgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_gccgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_gccgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_gccgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go index 9e0e562d2..7cb069c78 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go @@ -18,11 +18,11 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/reexec" "github.com/moby/sys/capability" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/reexec" ) // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go index 05706b8fe..3b463627c 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go @@ -5,8 +5,8 @@ package unshare import ( "os" - "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/idtools" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported_cgo.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 501cd8eb4..fbe21f2ee 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -171,8 +171,8 @@ github.com/containerd/log # github.com/containerd/platforms v0.2.1 ## explicit; go 1.20 github.com/containerd/platforms -# github.com/containerd/stargz-snapshotter/estargz v0.16.3 -## explicit; go 1.22.0 +# github.com/containerd/stargz-snapshotter/estargz v0.17.0 +## explicit; go 1.23.0 github.com/containerd/stargz-snapshotter/estargz github.com/containerd/stargz-snapshotter/estargz/errorutil # github.com/containerd/ttrpc v1.2.7 @@ -181,67 +181,6 @@ github.com/containerd/ttrpc # github.com/containerd/typeurl/v2 v2.2.3 ## explicit; go 1.21 github.com/containerd/typeurl/v2 -# github.com/containers/common v0.64.2 -## explicit; go 1.23.3 -github.com/containers/common/pkg/auth -github.com/containers/common/pkg/capabilities -github.com/containers/common/pkg/completion -github.com/containers/common/pkg/password -# github.com/containers/image/v5 v5.36.2 -## explicit; go 1.23.3 -github.com/containers/image/v5/copy -github.com/containers/image/v5/directory/explicitfilepath -github.com/containers/image/v5/docker -github.com/containers/image/v5/docker/policyconfiguration -github.com/containers/image/v5/docker/reference -github.com/containers/image/v5/image -github.com/containers/image/v5/internal/blobinfocache -github.com/containers/image/v5/internal/image -github.com/containers/image/v5/internal/imagedestination -github.com/containers/image/v5/internal/imagedestination/impl -github.com/containers/image/v5/internal/imagedestination/stubs -github.com/containers/image/v5/internal/imagesource -github.com/containers/image/v5/internal/imagesource/impl -github.com/containers/image/v5/internal/imagesource/stubs -github.com/containers/image/v5/internal/iolimits -github.com/containers/image/v5/internal/manifest -github.com/containers/image/v5/internal/multierr -github.com/containers/image/v5/internal/pkg/platform -github.com/containers/image/v5/internal/private -github.com/containers/image/v5/internal/putblobdigest -github.com/containers/image/v5/internal/rootless -github.com/containers/image/v5/internal/set -github.com/containers/image/v5/internal/signature -github.com/containers/image/v5/internal/signer -github.com/containers/image/v5/internal/streamdigest -github.com/containers/image/v5/internal/tmpdir -github.com/containers/image/v5/internal/unparsedimage -github.com/containers/image/v5/internal/uploadreader -github.com/containers/image/v5/internal/useragent -github.com/containers/image/v5/manifest -github.com/containers/image/v5/oci/internal -github.com/containers/image/v5/oci/layout -github.com/containers/image/v5/pkg/blobinfocache -github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize -github.com/containers/image/v5/pkg/blobinfocache/memory -github.com/containers/image/v5/pkg/blobinfocache/none -github.com/containers/image/v5/pkg/blobinfocache/sqlite -github.com/containers/image/v5/pkg/compression -github.com/containers/image/v5/pkg/compression/internal -github.com/containers/image/v5/pkg/compression/types -github.com/containers/image/v5/pkg/docker/config -github.com/containers/image/v5/pkg/strslice -github.com/containers/image/v5/pkg/sysregistriesv2 -github.com/containers/image/v5/pkg/tlsclientconfig -github.com/containers/image/v5/signature -github.com/containers/image/v5/signature/internal -github.com/containers/image/v5/signature/signer -github.com/containers/image/v5/signature/sigstore -github.com/containers/image/v5/signature/sigstore/internal -github.com/containers/image/v5/signature/simplesigning -github.com/containers/image/v5/transports -github.com/containers/image/v5/types -github.com/containers/image/v5/version # github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 ## explicit github.com/containers/libtrust @@ -261,26 +200,6 @@ github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils github.com/containers/ocicrypt/utils/keyprovider -# github.com/containers/storage v1.59.1 -## explicit; go 1.23.0 -github.com/containers/storage/internal/rawfilelock -github.com/containers/storage/pkg/archive -github.com/containers/storage/pkg/chunked/compressor -github.com/containers/storage/pkg/chunked/internal/minimal -github.com/containers/storage/pkg/chunked/toc -github.com/containers/storage/pkg/fileutils -github.com/containers/storage/pkg/homedir -github.com/containers/storage/pkg/idtools -github.com/containers/storage/pkg/ioutils -github.com/containers/storage/pkg/lockfile -github.com/containers/storage/pkg/longpath -github.com/containers/storage/pkg/mount -github.com/containers/storage/pkg/pools -github.com/containers/storage/pkg/promise -github.com/containers/storage/pkg/reexec -github.com/containers/storage/pkg/regexp -github.com/containers/storage/pkg/system -github.com/containers/storage/pkg/unshare # github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 ## explicit github.com/cyberphone/json-canonicalization/go/src/webpki.org/jsoncanonicalizer @@ -312,7 +231,7 @@ github.com/docker/docker/api/types/versions ## explicit; go 1.21 github.com/docker/docker-credential-helpers/client github.com/docker/docker-credential-helpers/credentials -# github.com/docker/go-connections v0.5.0 +# github.com/docker/go-connections v0.6.0 ## explicit; go 1.18 github.com/docker/go-connections/tlsconfig # github.com/docker/go-units v0.5.0 @@ -743,7 +662,7 @@ github.com/operator-framework/helm-operator-plugins/pkg/storage github.com/operator-framework/operator-lib/handler github.com/operator-framework/operator-lib/handler/internal/metrics github.com/operator-framework/operator-lib/internal/annotation -# github.com/operator-framework/operator-registry v1.58.0 +# github.com/operator-framework/operator-registry v1.59.0 ## explicit; go 1.24.4 github.com/operator-framework/operator-registry/alpha/declcfg github.com/operator-framework/operator-registry/alpha/model @@ -774,7 +693,7 @@ github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 ## explicit github.com/pmezard/go-difflib/difflib -# github.com/proglottis/gpgme v0.1.4 +# github.com/proglottis/gpgme v0.1.5 ## explicit; go 1.17 github.com/proglottis/gpgme # github.com/prometheus/client_golang v1.23.2 @@ -814,8 +733,8 @@ github.com/russross/blackfriday/v2 ## explicit; go 1.21 github.com/santhosh-tekuri/jsonschema/v6 github.com/santhosh-tekuri/jsonschema/v6/kind -# github.com/secure-systems-lab/go-securesystemslib v0.9.0 -## explicit; go 1.20 +# github.com/secure-systems-lab/go-securesystemslib v0.9.1 +## explicit; go 1.23.0 github.com/secure-systems-lab/go-securesystemslib/encrypted # github.com/shopspring/decimal v1.4.0 ## explicit; go 1.10 @@ -963,6 +882,88 @@ go.opentelemetry.io/proto/otlp/collector/trace/v1 go.opentelemetry.io/proto/otlp/common/v1 go.opentelemetry.io/proto/otlp/resource/v1 go.opentelemetry.io/proto/otlp/trace/v1 +# go.podman.io/common v0.65.0 +## explicit; go 1.23.3 +go.podman.io/common/pkg/auth +go.podman.io/common/pkg/capabilities +go.podman.io/common/pkg/completion +go.podman.io/common/pkg/password +# go.podman.io/image/v5 v5.37.0 +## explicit; go 1.23.3 +go.podman.io/image/v5/copy +go.podman.io/image/v5/directory/explicitfilepath +go.podman.io/image/v5/docker +go.podman.io/image/v5/docker/policyconfiguration +go.podman.io/image/v5/docker/reference +go.podman.io/image/v5/image +go.podman.io/image/v5/internal/blobinfocache +go.podman.io/image/v5/internal/image +go.podman.io/image/v5/internal/imagedestination +go.podman.io/image/v5/internal/imagedestination/impl +go.podman.io/image/v5/internal/imagedestination/stubs +go.podman.io/image/v5/internal/imagesource +go.podman.io/image/v5/internal/imagesource/impl +go.podman.io/image/v5/internal/imagesource/stubs +go.podman.io/image/v5/internal/iolimits +go.podman.io/image/v5/internal/manifest +go.podman.io/image/v5/internal/multierr +go.podman.io/image/v5/internal/pkg/platform +go.podman.io/image/v5/internal/private +go.podman.io/image/v5/internal/putblobdigest +go.podman.io/image/v5/internal/rootless +go.podman.io/image/v5/internal/set +go.podman.io/image/v5/internal/signature +go.podman.io/image/v5/internal/signer +go.podman.io/image/v5/internal/streamdigest +go.podman.io/image/v5/internal/tmpdir +go.podman.io/image/v5/internal/unparsedimage +go.podman.io/image/v5/internal/uploadreader +go.podman.io/image/v5/internal/useragent +go.podman.io/image/v5/manifest +go.podman.io/image/v5/oci/internal +go.podman.io/image/v5/oci/layout +go.podman.io/image/v5/pkg/blobinfocache +go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize +go.podman.io/image/v5/pkg/blobinfocache/memory +go.podman.io/image/v5/pkg/blobinfocache/none +go.podman.io/image/v5/pkg/blobinfocache/sqlite +go.podman.io/image/v5/pkg/compression +go.podman.io/image/v5/pkg/compression/internal +go.podman.io/image/v5/pkg/compression/types +go.podman.io/image/v5/pkg/docker/config +go.podman.io/image/v5/pkg/strslice +go.podman.io/image/v5/pkg/sysregistriesv2 +go.podman.io/image/v5/pkg/tlsclientconfig +go.podman.io/image/v5/signature +go.podman.io/image/v5/signature/internal +go.podman.io/image/v5/signature/internal/sequoia +go.podman.io/image/v5/signature/signer +go.podman.io/image/v5/signature/sigstore +go.podman.io/image/v5/signature/sigstore/internal +go.podman.io/image/v5/signature/simplesigning +go.podman.io/image/v5/transports +go.podman.io/image/v5/types +go.podman.io/image/v5/version +# go.podman.io/storage v1.60.0 +## explicit; go 1.23.3 +go.podman.io/storage/internal/rawfilelock +go.podman.io/storage/pkg/archive +go.podman.io/storage/pkg/chunked/compressor +go.podman.io/storage/pkg/chunked/internal/minimal +go.podman.io/storage/pkg/chunked/toc +go.podman.io/storage/pkg/fileutils +go.podman.io/storage/pkg/homedir +go.podman.io/storage/pkg/idtools +go.podman.io/storage/pkg/ioutils +go.podman.io/storage/pkg/lockfile +go.podman.io/storage/pkg/longpath +go.podman.io/storage/pkg/mount +go.podman.io/storage/pkg/pools +go.podman.io/storage/pkg/promise +go.podman.io/storage/pkg/reexec +go.podman.io/storage/pkg/regexp +go.podman.io/storage/pkg/system +go.podman.io/storage/pkg/unshare # go.yaml.in/yaml/v2 v2.4.2 ## explicit; go 1.15 go.yaml.in/yaml/v2 @@ -1279,7 +1280,7 @@ helm.sh/helm/v3/pkg/storage/driver helm.sh/helm/v3/pkg/time helm.sh/helm/v3/pkg/time/ctime helm.sh/helm/v3/pkg/uploader -# k8s.io/api v0.33.4 => k8s.io/api v0.33.2 +# k8s.io/api v0.33.4 => k8s.io/api v0.33.4 ## explicit; go 1.24.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1341,7 +1342,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.33.4 => k8s.io/apiextensions-apiserver v0.33.2 +# k8s.io/apiextensions-apiserver v0.33.4 => k8s.io/apiextensions-apiserver v0.33.4 ## explicit; go 1.24.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1363,7 +1364,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/features -# k8s.io/apimachinery v0.33.4 => k8s.io/apimachinery v0.33.2 +# k8s.io/apimachinery v0.33.4 => k8s.io/apimachinery v0.33.4 ## explicit; go 1.24.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1434,7 +1435,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.33.4 => k8s.io/apiserver v0.33.2 +# k8s.io/apiserver v0.33.4 => k8s.io/apiserver v0.33.4 ## explicit; go 1.24.0 k8s.io/apiserver/pkg/apis/apiserver k8s.io/apiserver/pkg/apis/apiserver/install @@ -1483,13 +1484,13 @@ k8s.io/apiserver/pkg/warning k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.33.3 => k8s.io/cli-runtime v0.33.2 +# k8s.io/cli-runtime v0.33.4 => k8s.io/cli-runtime v0.33.4 ## explicit; go 1.24.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.33.4 => k8s.io/client-go v0.33.2 +# k8s.io/client-go v0.33.4 => k8s.io/client-go v0.33.4 ## explicit; go 1.24.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1854,7 +1855,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.33.4 => k8s.io/component-base v0.33.2 +# k8s.io/component-base v0.33.4 => k8s.io/component-base v0.33.4 ## explicit; go 1.24.0 k8s.io/component-base/cli/flag k8s.io/component-base/compatibility @@ -1867,10 +1868,10 @@ k8s.io/component-base/metrics/prometheusextension k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version -# k8s.io/component-helpers v0.33.2 => k8s.io/component-helpers v0.33.2 +# k8s.io/component-helpers v0.33.4 => k8s.io/component-helpers v0.33.4 ## explicit; go 1.24.0 k8s.io/component-helpers/auth/rbac/validation -# k8s.io/controller-manager v0.33.2 => k8s.io/controller-manager v0.33.2 +# k8s.io/controller-manager v0.33.2 => k8s.io/controller-manager v0.33.4 ## explicit; go 1.24.0 # k8s.io/klog/v2 v2.130.1 ## explicit; go 1.18 @@ -1899,7 +1900,7 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kubectl v0.33.3 => k8s.io/kubectl v0.33.2 +# k8s.io/kubectl v0.33.3 => k8s.io/kubectl v0.33.4 ## explicit; go 1.24.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1909,7 +1910,7 @@ k8s.io/kubectl/pkg/util/openapi k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubernetes v1.33.2 => k8s.io/kubernetes v1.33.2 +# k8s.io/kubernetes v1.33.4 => k8s.io/kubernetes v1.33.4 ## explicit; go 1.24.0 k8s.io/kubernetes/pkg/apis/rbac k8s.io/kubernetes/pkg/apis/rbac/v1 @@ -2156,33 +2157,33 @@ sigs.k8s.io/structured-merge-diff/v4/value sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 -# k8s.io/api => k8s.io/api v0.33.2 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.2 -# k8s.io/apimachinery => k8s.io/apimachinery v0.33.2 -# k8s.io/apiserver => k8s.io/apiserver v0.33.2 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.2 -# k8s.io/client-go => k8s.io/client-go v0.33.2 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.2 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2 -# k8s.io/code-generator => k8s.io/code-generator v0.33.2 -# k8s.io/component-base => k8s.io/component-base v0.33.2 -# k8s.io/component-helpers => k8s.io/component-helpers v0.33.2 -# k8s.io/controller-manager => k8s.io/controller-manager v0.33.2 -# k8s.io/cri-api => k8s.io/cri-api v0.33.2 -# k8s.io/cri-client => k8s.io/cri-client v0.33.2 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.2 -# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2 -# k8s.io/endpointslice => k8s.io/endpointslice v0.33.2 -# k8s.io/externaljwt => k8s.io/externaljwt v0.33.2 -# k8s.io/kms => k8s.io/kms v0.33.2 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2 -# k8s.io/kubectl => k8s.io/kubectl v0.33.2 -# k8s.io/kubelet => k8s.io/kubelet v0.33.2 -# k8s.io/kubernetes => k8s.io/kubernetes v1.33.2 -# k8s.io/metrics => k8s.io/metrics v0.33.2 -# k8s.io/mount-utils => k8s.io/mount-utils v0.33.2 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.2 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2 +# k8s.io/api => k8s.io/api v0.33.4 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4 +# k8s.io/apimachinery => k8s.io/apimachinery v0.33.4 +# k8s.io/apiserver => k8s.io/apiserver v0.33.4 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4 +# k8s.io/client-go => k8s.io/client-go v0.33.4 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4 +# k8s.io/code-generator => k8s.io/code-generator v0.33.4 +# k8s.io/component-base => k8s.io/component-base v0.33.4 +# k8s.io/component-helpers => k8s.io/component-helpers v0.33.4 +# k8s.io/controller-manager => k8s.io/controller-manager v0.33.4 +# k8s.io/cri-api => k8s.io/cri-api v0.33.4 +# k8s.io/cri-client => k8s.io/cri-client v0.33.4 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4 +# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.4 +# k8s.io/endpointslice => k8s.io/endpointslice v0.33.4 +# k8s.io/externaljwt => k8s.io/externaljwt v0.33.4 +# k8s.io/kms => k8s.io/kms v0.33.4 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4 +# k8s.io/kubectl => k8s.io/kubectl v0.33.4 +# k8s.io/kubelet => k8s.io/kubelet v0.33.4 +# k8s.io/kubernetes => k8s.io/kubernetes v1.33.4 +# k8s.io/metrics => k8s.io/metrics v0.33.4 +# k8s.io/mount-utils => k8s.io/mount-utils v0.33.4 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4