refactor: use credentials module for parsing secrets from keyring (#428)

Author: kangasta

go.mod

@@ -4,6 +4,7 @@ go 1.25.0
 
 require (
 	github.com/UpCloudLtd/progress v1.0.3
+	github.com/UpCloudLtd/upcloud-go-api/credentials v0.1.1
 	github.com/UpCloudLtd/upcloud-go-api/v8 v8.25.0
 	github.com/adrg/xdg v0.5.3
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d

go.sum

@@ -397,6 +397,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/UpCloudLtd/progress v1.0.3 h1:8SfntHkBPyQc5BL3946Bgi9KYnQOxa5RR2EKdadujdg=
 github.com/UpCloudLtd/progress v1.0.3/go.mod h1:iGxOnb9HvHW0yrLGUjHr0lxHhn7TehgWwh7a8NqK6iQ=
+github.com/UpCloudLtd/upcloud-go-api/credentials v0.1.1 h1:eTfQsv58ufALOk9BZ7WbS/i7pMUD11RnYYpRPsz0LdI=
+github.com/UpCloudLtd/upcloud-go-api/credentials v0.1.1/go.mod h1:7OtVs2UqtfvjkC1HfE+Oud0MnbMv7qUWnbEgxnTAqts=
 github.com/UpCloudLtd/upcloud-go-api/v8 v8.25.0 h1:OWkIs5Z67jZJb9qNHNaNCl20vJaCIn9U1QnaRZE5grQ=
 github.com/UpCloudLtd/upcloud-go-api/v8 v8.25.0/go.mod h1:ImDdnWfVVM6WCRTrskGhAw2W1cRwu5IEkBw+9UCzAv8=
 github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=

internal/config/config.go

@@ -13,6 +13,7 @@ import (
 	internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service"
 	"github.com/zalando/go-keyring"
 
+	"github.com/UpCloudLtd/upcloud-go-api/credentials"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/client"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/service"
 	"github.com/adrg/xdg"
@@ -35,9 +36,6 @@ const (
 
 	// env vars custom prefix
 	envPrefix = "UPCLOUD"
-
-	// keyringServiceName is the name of the service to use when using the system keyring
-	keyringServiceName = "UpCloud"
 )
 
 var (
@@ -100,24 +98,15 @@ func (s *Config) Load() error {
 		}
 	}
 
-	// If no credentials are provided, check if token is stored in keyring
-	if v.GetString("token") == "" && v.GetString("username") == "" && v.GetString("password") == "" {
-		token, err := keyring.Get(keyringServiceName, "")
-		if err == nil {
-			if err := v.MergeConfigMap(map[string]interface{}{"token": token}); err != nil {
-				return fmt.Errorf("unable to merge token from keyring: %w", err)
-			}
-		}
-	}
-
-	// If only username is provided, check if password is stored in keyring
-	if v.GetString("username") != "" && v.GetString("token") == "" && v.GetString("password") == "" {
-		password, err := keyring.Get(keyringServiceName, v.GetString("username"))
-		if err == nil {
-			if err := v.MergeConfigMap(map[string]interface{}{"password": password}); err != nil {
-				return fmt.Errorf("unable to merge password from keyring: %w", err)
-			}
-		}
+	creds, err := credentials.Parse(credentials.Credentials{
+		Username: v.GetString("username"),
+		Password: v.GetString("password"),
+		Token:    v.GetString("token"),
+	})
+	if err == nil {
+		v.Set("username", creds.Username)
+		v.Set("password", creds.Password)
+		v.Set("token", creds.Token)
 	}
 
 	v.Set("config", v.ConfigFileUsed())
@@ -224,7 +213,7 @@ func (s *Config) CreateService() (internal.AllServices, error) {
 		if s.GetString("config") != "" {
 			configDetails = fmt.Sprintf("used %s", s.GetString("config"))
 		}
-		return nil, clierrors.MissingCredentialsError{ConfigFile: configDetails, ServiceName: keyringServiceName}
+		return nil, clierrors.MissingCredentialsError{ConfigFile: configDetails, ServiceName: credentials.KeyringServiceName}
 	}
 
 	configs := []client.ConfigFn{
@@ -253,7 +242,7 @@ func GetVersion() string {
 }
 
 func SaveTokenToKeyring(token string) error {
-	return keyring.Set(keyringServiceName, "", token)
+	return keyring.Set(credentials.KeyringServiceName, credentials.KeyringTokenUser, token)
 }
 
 func getVersion() string {