updated dependency oras-credential-go to oras-go

Signed-off-by: Patrick Zheng <[email protected]>
notaryproject · Feb 1, 2024 · 6774856 · 6774856
1 parent 5f539ab
commit 6774856
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/cmd/notation/login.go b/cmd/notation/login.go
@@ -25,9 +25,9 @@ import (
 	"github.com/notaryproject/notation-go/log"
 	"github.com/notaryproject/notation/internal/auth"
 	"github.com/notaryproject/notation/internal/cmd"
-	credentials "github.com/oras-project/oras-credentials-go"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
+	credentials "oras.land/oras-go/v2/registry/remote/credentials"
 )
 
 const urlDocHowToAuthenticate = "https://notaryproject.dev/docs/how-to/registry-authentication/"

diff --git a/cmd/notation/logout.go b/cmd/notation/logout.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/notaryproject/notation/internal/auth"
 	"github.com/notaryproject/notation/internal/cmd"
-	credentials "github.com/oras-project/oras-credentials-go"
 	"github.com/spf13/cobra"
+	credentials "oras.land/oras-go/v2/registry/remote/credentials"
 )
 
 type logoutOpts struct {

diff --git a/cmd/notation/registry.go b/cmd/notation/registry.go
@@ -25,10 +25,10 @@ import (
 	notationauth "github.com/notaryproject/notation/internal/auth"
 	"github.com/notaryproject/notation/internal/httputil"
 	"github.com/notaryproject/notation/pkg/configutil"
-	credentials "github.com/oras-project/oras-credentials-go"
 	"oras.land/oras-go/v2/registry"
 	"oras.land/oras-go/v2/registry/remote"
 	"oras.land/oras-go/v2/registry/remote/auth"
+	credentials "oras.land/oras-go/v2/registry/remote/credentials"
 )
 
 // inputType denotes the user input type

diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/notaryproject/notation-go v1.1.1-0.20240201073933-4606472ebdcb
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.0-rc6
-	github.com/oras-project/oras-credentials-go v0.3.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5

diff --git a/internal/auth/credentials.go b/internal/auth/credentials.go
@@ -17,7 +17,7 @@ import (
 	"fmt"
 
 	"github.com/notaryproject/notation-go/dir"
-	credentials "github.com/oras-project/oras-credentials-go"
+	credentials "oras.land/oras-go/v2/registry/remote/credentials"
 )
 
 // NewCredentialsStore returns a new credentials store from the settings in the

diff --git a/internal/cmd/options.go b/internal/cmd/options.go
@@ -18,10 +18,10 @@ import (
 
 	"github.com/notaryproject/notation-go/log"
 	"github.com/notaryproject/notation/internal/trace"
-	credentialstrace "github.com/oras-project/oras-credentials-go/trace"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	credentialstrace "oras.land/oras-go/v2/registry/remote/credentials/trace"
 )
 
 // SignerFlagOpts cmd opts for using cmd.GetSigner