Skip to content

Commit c6620c2

Browse files
tmshorttmshort
committed
[chore] Update oras.land/oras.go to v1.2.4
Signed-off-by: Todd Short <[email protected]>
1 parent 0f56e20 commit c6620c2

File tree

9 files changed

+30
-23
lines changed

9 files changed

+30
-23
lines changed

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/openshift/api v3.9.0+incompatible
2626
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
2727
github.com/operator-framework/api v0.19.0
28-
github.com/operator-framework/operator-registry v1.32.1-0.20231119153434-5e23ef594a41
28+
github.com/operator-framework/operator-registry v1.33.0
2929
github.com/otiai10/copy v1.12.0
3030
github.com/pkg/errors v0.9.1
3131
github.com/prometheus/client_golang v1.15.1
@@ -93,7 +93,7 @@ require (
9393
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
9494
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
9595
github.com/davecgh/go-spew v1.1.1 // indirect
96-
github.com/docker/cli v23.0.5+incompatible // indirect
96+
github.com/docker/cli v24.0.6+incompatible // indirect
9797
github.com/docker/distribution v2.8.2+incompatible // indirect
9898
github.com/docker/docker v24.0.6+incompatible // indirect
9999
github.com/docker/docker-credential-helpers v0.8.0 // indirect
@@ -175,7 +175,7 @@ require (
175175
github.com/morikuni/aec v1.0.0 // indirect
176176
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
177177
github.com/opencontainers/go-digest v1.0.0 // indirect
178-
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
178+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
179179
github.com/opencontainers/runc v1.1.9 // indirect
180180
github.com/opencontainers/runtime-spec v1.1.0 // indirect
181181
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
@@ -239,7 +239,7 @@ require (
239239
k8s.io/klog/v2 v2.90.1 // indirect
240240
k8s.io/kms v0.27.7 // indirect
241241
k8s.io/kubectl v0.27.7 // indirect
242-
oras.land/oras-go v1.2.3 // indirect
242+
oras.land/oras-go v1.2.4 // indirect
243243
rsc.io/letsencrypt v0.0.3 // indirect
244244
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
245245
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
161161
github.com/distribution/distribution v2.7.1+incompatible h1:aGFx4EvJWKEh//lHPLwFhFgwFHKH06TzNVPamrMn04M=
162162
github.com/distribution/distribution v2.7.1+incompatible/go.mod h1:EgLm2NgWtdKgzF9NpMzUKgzmR7AMmb0VQi2B+ZzDRjc=
163163
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc=
164-
github.com/docker/cli v23.0.5+incompatible h1:ufWmAOuD3Vmr7JP2G5K3cyuNC4YZWiAsuDEvFVVDafE=
165-
github.com/docker/cli v23.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
164+
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=
165+
github.com/docker/cli v24.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
166166
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
167167
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
168168
github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE=
@@ -611,8 +611,8 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
611611
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
612612
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
613613
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
614-
github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0=
615-
github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
614+
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
615+
github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
616616
github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM=
617617
github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
618618
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
@@ -623,8 +623,8 @@ github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq
623623
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
624624
github.com/operator-framework/api v0.19.0 h1:QU1CTJU+CufoeneA5rsNlP/uP96s8vDHWUYDFZTauzA=
625625
github.com/operator-framework/api v0.19.0/go.mod h1:SCCslqke6AVOJ5JM+NqNE1CHuAgJLScsL66pnPaSMXs=
626-
github.com/operator-framework/operator-registry v1.32.1-0.20231119153434-5e23ef594a41 h1:339AZH7nDOjaVYdxc9WT0Raa06qn18ZC3fjfQYNkCfQ=
627-
github.com/operator-framework/operator-registry v1.32.1-0.20231119153434-5e23ef594a41/go.mod h1:1V/m2m7iH/o5ROEuMxWa/yhj4ExaPGT6V/ncGS+m6Js=
626+
github.com/operator-framework/operator-registry v1.33.0 h1:rFvYf6vLdXSUhoePhg8w1S5FHgyFraiNLXDwl47epck=
627+
github.com/operator-framework/operator-registry v1.33.0/go.mod h1:1V/m2m7iH/o5ROEuMxWa/yhj4ExaPGT6V/ncGS+m6Js=
628628
github.com/otiai10/copy v1.12.0 h1:cLMgSQnXBs1eehF0Wy/FAGsgDTDmAqFR7rQylBb1nDY=
629629
github.com/otiai10/copy v1.12.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
630630
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
@@ -1307,8 +1307,8 @@ k8s.io/kubectl v0.27.7 h1:HTEDa4s/oWjB3t5ysdW1yKlcNl9bzigcqWBq0LIIe3k=
13071307
k8s.io/kubectl v0.27.7/go.mod h1:Xb1Ubc8uN1i2RvSN1HCgSHTtzgX0woihMk/gW7XbjJU=
13081308
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk=
13091309
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1310-
oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
1311-
oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg=
1310+
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
1311+
oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324=
13121312
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
13131313
rsc.io/letsencrypt v0.0.3 h1:H7xDfhkaFFSYEJlKeq38RwX2jYcnTeHuDQyT+mMNMwM=
13141314
rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=

‎vendor/github.com/docker/cli/cli/config/configfile/file.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/cli/cli/config/credentials/file_store.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/image-spec/specs-go/v1/descriptor.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/image-spec/specs-go/v1/layout.go

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/image-spec/specs-go/version.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ github.com/davecgh/go-spew/spew
234234
# github.com/distribution/distribution v2.7.1+incompatible
235235
## explicit
236236
github.com/distribution/distribution/reference
237-
# github.com/docker/cli v23.0.5+incompatible
237+
# github.com/docker/cli v24.0.6+incompatible
238238
## explicit
239239
github.com/docker/cli/cli/config
240240
github.com/docker/cli/cli/config/configfile
@@ -686,7 +686,7 @@ github.com/onsi/gomega/types
686686
# github.com/opencontainers/go-digest v1.0.0
687687
## explicit; go 1.13
688688
github.com/opencontainers/go-digest
689-
# github.com/opencontainers/image-spec v1.1.0-rc4
689+
# github.com/opencontainers/image-spec v1.1.0-rc5
690690
## explicit; go 1.18
691691
github.com/opencontainers/image-spec/specs-go
692692
github.com/opencontainers/image-spec/specs-go/v1
@@ -737,7 +737,7 @@ github.com/operator-framework/api/pkg/validation
737737
github.com/operator-framework/api/pkg/validation/errors
738738
github.com/operator-framework/api/pkg/validation/interfaces
739739
github.com/operator-framework/api/pkg/validation/internal
740-
# github.com/operator-framework/operator-registry v1.32.1-0.20231119153434-5e23ef594a41
740+
# github.com/operator-framework/operator-registry v1.33.0
741741
## explicit; go 1.20
742742
github.com/operator-framework/operator-registry/alpha/model
743743
github.com/operator-framework/operator-registry/alpha/property
@@ -2074,7 +2074,7 @@ k8s.io/utils/path
20742074
k8s.io/utils/pointer
20752075
k8s.io/utils/strings/slices
20762076
k8s.io/utils/trace
2077-
# oras.land/oras-go v1.2.3
2077+
# oras.land/oras-go v1.2.4
20782078
## explicit; go 1.18
20792079
oras.land/oras-go/pkg/artifact
20802080
oras.land/oras-go/pkg/auth

‎vendor/oras.land/oras-go/pkg/auth/docker/login_tls.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (lcs loginCredentialStore) SetRefreshToken(u *url.URL, service, token strin
5959
// loginWithTLS tries to login to the v2 registry server.
6060
// A custom tls.Config is used to override the default TLS configuration of the different registry endpoints.
6161
// The tls.Config is created using the provided certificate, certificate key and certificate authority.
62-
func (c *Client) loginWithTLS(ctx context.Context, service registry.Service, certFile, keyFile, caFile string, authConfig *types.AuthConfig, userAgent string) (string, string, error) {
62+
func (c *Client) loginWithTLS(ctx context.Context, service *registry.Service, certFile, keyFile, caFile string, authConfig *types.AuthConfig, userAgent string) (string, string, error) {
6363
tlsConfig, err := tlsconfig.Client(tlsconfig.Options{CAFile: caFile, CertFile: certFile, KeyFile: keyFile})
6464
if err != nil {
6565
return "", "", err
@@ -91,7 +91,7 @@ func (c *Client) loginWithTLS(ctx context.Context, service registry.Service, cer
9191
}
9292

9393
// getEndpoints returns the endpoints for the given hostname.
94-
func (c *Client) getEndpoints(address string, service registry.Service) ([]registry.APIEndpoint, error) {
94+
func (c *Client) getEndpoints(address string, service *registry.Service) ([]registry.APIEndpoint, error) {
9595
var registryHostName = IndexHostname
9696

9797
if address != "" {

0 commit comments

Comments
 (0)