add path function for dynamic

Signed-off-by: Billy Zha <[email protected]>

registry/remote/auth/client.go

@@ -31,6 +31,10 @@ import (
 	"oras.land/oras-go/v2/registry/remote/retry"
 )
 
+var (
+	ErrBasicCredentialNotFound = errors.New("basic credential not found")
+)
+
 // DefaultClient is the default auth-decorated client.
 var DefaultClient = &Client{
 	Client: retry.DefaultClient,
@@ -215,7 +219,7 @@ func (c *Client) Do(originalReq *http.Request) (*http.Response, error) {
 			return c.fetchBasicAuth(ctx, host)
 		})
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("%s %q: %w", resp.Request.Method, resp.Request.URL, err)
 		}
 
 		req = originalReq.Clone(ctx)
@@ -280,7 +284,7 @@ func (c *Client) fetchBasicAuth(ctx context.Context, registry string) (string, e
 		return "", fmt.Errorf("failed to resolve credential: %w", err)
 	}
 	if cred == EmptyCredential {
-		return "", ErrBasicCredNotFound
+		return "", ErrBasicCredentialNotFound
 	}
 	if cred.Username == "" || cred.Password == "" {
 		return "", errors.New("missing username or password for basic auth")

registry/remote/credentials/internal/config/config.go

@@ -155,6 +155,14 @@ func Load(configPath string) (*Config, error) {
 	return cfg, nil
 }
 
+// Path returns the path to the config file.
+func (cfg *Config) Path() (string, error) {
+	if cfg == nil {
+		errors.New("config file is nil")
+	}
+	return cfg.path, nil
+}
+
 // GetAuthConfig returns an auth.Credential for serverAddress.
 func (cfg *Config) GetCredential(serverAddress string) (auth.Credential, error) {
 	cfg.rwLock.RLock()

registry/remote/credentials/store.go

@@ -121,7 +121,7 @@ func NewStore(configPath string, opts StoreOptions) (*DynamicStore, error) {
 //   - https://docs.docker.com/engine/reference/commandline/cli/#configuration-files
 //   - https://docs.docker.com/engine/reference/commandline/cli/#change-the-docker-directory
 func NewStoreFromDocker(opt StoreOptions) (*DynamicStore, error) {
-	configPath, err := GetDockerConfigPath()
+	configPath, err := getDockerConfigPath()
 	if err != nil {
 		return nil, err
 	}
@@ -167,6 +167,11 @@ func (ds *DynamicStore) IsAuthConfigured() bool {
 	return ds.config.IsAuthConfigured()
 }
 
+// GetConfigPath returns the path to the config file.
+func (ds *DynamicStore) GetConfigPath() (string, error) {
+	return ds.config.Path()
+}
+
 // getHelperSuffix returns the credential helper suffix for the given server
 // address.
 func (ds *DynamicStore) getHelperSuffix(serverAddress string) string {
@@ -193,8 +198,8 @@ func (ds *DynamicStore) getStore(serverAddress string) Store {
 	return fs
 }
 
-// GetDockerConfigPath returns the path to the default docker config file.
-func GetDockerConfigPath() (string, error) {
+// getDockerConfigPath returns the path to the default docker config file.
+func getDockerConfigPath() (string, error) {
 	// first try the environment variable
 	configDir := os.Getenv(dockerConfigDirEnv)
 	if configDir == "" {

registry/remote/credentials/store_test.go

@@ -878,7 +878,7 @@ func Test_getDockerConfigPath_env(t *testing.T) {
 	}
 	t.Setenv("DOCKER_CONFIG", dir)
 
-	got, err := GetDockerConfigPath()
+	got, err := getDockerConfigPath()
 	if err != nil {
 		t.Fatal("getDockerConfigPath() error =", err)
 	}
@@ -890,7 +890,7 @@ func Test_getDockerConfigPath_env(t *testing.T) {
 func Test_getDockerConfigPath_homeDir(t *testing.T) {
 	t.Setenv("DOCKER_CONFIG", "")
 
-	got, err := GetDockerConfigPath()
+	got, err := getDockerConfigPath()
 	if err != nil {
 		t.Fatal("getDockerConfigPath() error =", err)
 	}