From 163d38d851ef9cacc5dad4d4245c8531d6e8444d Mon Sep 17 00:00:00 2001 From: wangxiaoxuan273 Date: Sat, 24 Jun 2023 15:20:06 +0800 Subject: [PATCH] bump: use oras-credentials-go' v0.2.0 Signed-off-by: wangxiaoxuan273 --- cmd/notation/login.go | 7 +------ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmd/notation/login.go b/cmd/notation/login.go index b55caf023..7a13cc44a 100644 --- a/cmd/notation/login.go +++ b/cmd/notation/login.go @@ -115,12 +115,7 @@ func runLogin(ctx context.Context, opts *loginOpts) error { // ErrPlaintextPutDisabled returned by Login() indicates that the // credential is validated but is not saved because there is no native // credentials store available - credKeyName := registryName - if registryName == "docker.io" { - // it's as expected that credentials for "docker.io" are stored - // under the key "https://index.docker.io/v1/" - credKeyName = "https://index.docker.io/v1/" - } + credKeyName := credentials.ServerAddressFromRegistry(registryName) if savedCred, err := credsStore.Get(ctx, credKeyName); err != nil || savedCred != cred { if err != nil { // if we fail to get the saved credential, log a warning diff --git a/go.mod b/go.mod index a5f07a35b..8ecafc5f5 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/notaryproject/notation-go v1.0.0-rc.6 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0-rc3 - github.com/oras-project/oras-credentials-go v0.1.2-0.20230609092929-bf5244c85f2a + github.com/oras-project/oras-credentials-go v0.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 7c81c837a..c723e5478 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8= github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= -github.com/oras-project/oras-credentials-go v0.1.2-0.20230609092929-bf5244c85f2a h1:9EfGz03gbAnD3kZaHxUZUphSMYpxzzPs3NtaUomxMOo= -github.com/oras-project/oras-credentials-go v0.1.2-0.20230609092929-bf5244c85f2a/go.mod h1:JVdg7a5k7hzTrEeeouwag0aCv7OLrS77r7/6w3gVirU= +github.com/oras-project/oras-credentials-go v0.2.0 h1:BvWAXo0e5unWR6Hfxyb0K04mHNHreQz/Zclw6IzCYJo= +github.com/oras-project/oras-credentials-go v0.2.0/go.mod h1:JVdg7a5k7hzTrEeeouwag0aCv7OLrS77r7/6w3gVirU= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=