refactor: move config to internal

Signed-off-by: Terry Howe <terrylhowe@gmail.com>

Author: TerryHowe

registry/remote/credentials/file_store.go

@@ -21,6 +21,8 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+
+	"oras.land/oras-go/v2/registry/remote/internal/configuration"
 )
 
 // FileStore implements a credentials store using the docker configuration file
@@ -32,7 +34,7 @@ type FileStore struct {
 	// If DisablePut is set to true, Put() will return ErrPlaintextPutDisabled.
 	DisablePut bool
 
-	config *Config
+	config *configuration.Config
 }
 
 var (
@@ -48,15 +50,15 @@ var (
 //
 // Reference: https://docs.docker.com/engine/reference/commandline/cli/#docker-cli-configuration-file-configjson-properties
 func NewFileStore(configPath string) (*FileStore, error) {
-	cfg, err := Load(configPath)
+	cfg, err := configuration.Load(configPath)
 	if err != nil {
 		return nil, err
 	}
 	return newFileStore(cfg), nil
 }
 
 // newFileStore creates a file credentials store based on the given config instance.
-func newFileStore(cfg *Config) *FileStore {
+func newFileStore(cfg *configuration.Config) *FileStore {
 	return &FileStore{config: cfg}
 }
 
@@ -100,8 +102,8 @@ func validateCredentialFormat(cred Credential) error {
 }
 
 // NewAuthConfig creates an authConfig based on cred.
-func NewAuthConfig(cred Credential) AuthConfig {
-	return AuthConfig{
+func NewAuthConfig(cred Credential) configuration.AuthConfig {
+	return configuration.AuthConfig{
 		Auth:          encodeAuth(cred.Username, cred.Password),
 		IdentityToken: cred.RefreshToken,
 		RegistryToken: cred.AccessToken,
@@ -117,7 +119,7 @@ func encodeAuth(username, password string) string {
 }
 
 // NewCredential creates a Credential based on authCfg.
-func NewCredential(authCfg AuthConfig) (Credential, error) {
+func NewCredential(authCfg configuration.AuthConfig) (Credential, error) {
 	cred := Credential{
 		Username:     authCfg.Username,
 		Password:     authCfg.Password,
@@ -129,7 +131,7 @@ func NewCredential(authCfg AuthConfig) (Credential, error) {
 		// override username and password
 		cred.Username, cred.Password, err = decodeAuth(authCfg.Auth)
 		if err != nil {
-			return EmptyCredential, fmt.Errorf("failed to decode auth field: %w: %v", ErrInvalidConfigFormat, err)
+			return EmptyCredential, fmt.Errorf("failed to decode auth field: %w: %v", configuration.ErrInvalidConfigFormat, err)
 		}
 	}
 	return cred, nil

registry/remote/credentials/memory_store.go

@@ -20,6 +20,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"sync"
+
+	"oras.land/oras-go/v2/registry/remote/internal/configuration"
 )
 
 // memoryStore is a store that keeps credentials in memory.
@@ -37,16 +39,16 @@ func NewMemoryStore() Store {
 // Reference: https://docs.docker.com/engine/reference/commandline/cli/#docker-cli-configuration-file-configjson-properties
 func NewMemoryStoreFromDockerConfig(c []byte) (Store, error) {
 	cfg := struct {
-		Auths map[string]AuthConfig `json:"auths"`
+		Auths map[string]configuration.AuthConfig `json:"auths"`
 	}{}
 	if err := json.Unmarshal(c, &cfg); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal auth field: %w: %v", ErrInvalidConfigFormat, err)
+		return nil, fmt.Errorf("failed to unmarshal auth field: %w: %v", configuration.ErrInvalidConfigFormat, err)
 	}
 
 	s := &memoryStore{}
 	for addr, auth := range cfg.Auths {
 		// Normalize the auth key to hostname.
-		hostname := ToHostname(addr)
+		hostname := configuration.ToHostname(addr)
 		cred, err := NewCredential(auth)
 		if err != nil {
 			return nil, err

registry/remote/credentials/memory_store_from_config_test.go

@@ -21,6 +21,8 @@ import (
 	"os"
 	"reflect"
 	"testing"
+
+	"oras.land/oras-go/v2/registry/remote/internal/configuration"
 )
 
 func TestMemoryStore_Create_fromInvalidConfig(t *testing.T) {
@@ -29,8 +31,8 @@ func TestMemoryStore_Create_fromInvalidConfig(t *testing.T) {
 		t.Fatalf("failed to read file: %v", err)
 	}
 	_, err = NewMemoryStoreFromDockerConfig(f)
-	if !errors.Is(err, ErrInvalidConfigFormat) {
-		t.Fatalf("Error: %s is expected", ErrInvalidConfigFormat)
+	if !errors.Is(err, configuration.ErrInvalidConfigFormat) {
+		t.Fatalf("Error: %s is expected", configuration.ErrInvalidConfigFormat)
 	}
 }
 

registry/remote/credentials/store.go

@@ -27,6 +27,7 @@ import (
 	"path/filepath"
 
 	"oras.land/oras-go/v2/internal/syncutil"
+	"oras.land/oras-go/v2/registry/remote/internal/configuration"
 )
 
 const (
@@ -48,7 +49,7 @@ type Store interface {
 // DynamicStore dynamically determines which store to use based on the settings
 // in the config file.
 type DynamicStore struct {
-	config             *Config
+	config             *configuration.Config
 	options            StoreOptions
 	detectedCredsStore string
 	setCredsStoreOnce  syncutil.OnceOrRetry
@@ -93,7 +94,7 @@ type StoreOptions struct {
 //   - https://docs.docker.com/engine/reference/commandline/login/#credentials-store
 //   - https://docs.docker.com/engine/reference/commandline/cli/#docker-cli-configuration-file-configjson-properties
 func NewStore(configPath string, opts StoreOptions) (*DynamicStore, error) {
-	cfg, err := Load(configPath)
+	cfg, err := configuration.Load(configPath)
 	if err != nil {
 		return nil, err
 	}

registry/remote/credentials/config.go …/remote/internal/configuration/config.goregistry/remote/credentials/config.go renamed to registry/remote/internal/configuration/config.go registry/remote/credentials/config.go renamed to registry/remote/internal/configuration/config.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package credentials
+package configuration
 
 import (
 	"bytes"
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"sync"
 
-	"oras.land/oras-go/v2/registry/remote/credentials/internal/ioutil"
+	"oras.land/oras-go/v2/registry/remote/internal/ioutil"
 )
 
 const (