Add method to convert type to a string

Author: bkreitch

age/keysource.go

@@ -225,6 +225,11 @@ func (key *MasterKey) ToMap() map[string]interface{} {
 	return out
 }
 
+// TypeToString converts key type to a string
+func (key *MasterKey) TypeToString() string {
+	return "age"
+}
+
 func getUserConfigDir() (string, error) {
 	if runtime.GOOS == "darwin" {
 		if userConfigDir, ok := os.LookupEnv(xdgConfigHome); ok && userConfigDir != "" {

azkv/keysource.go

@@ -215,6 +215,11 @@ func (key MasterKey) ToMap() map[string]interface{} {
 	return out
 }
 
+// TypeToString converts key type to a string
+func (key *MasterKey) TypeToString() string {
+	return "azure_kv"
+}
+
 // getTokenCredential returns the tokenCredential of the MasterKey, or
 // azidentity.NewDefaultAzureCredential.
 func (key *MasterKey) getTokenCredential() (azcore.TokenCredential, error) {

gcpkms/keysource.go

@@ -196,6 +196,11 @@ func (key MasterKey) ToMap() map[string]interface{} {
 	return out
 }
 
+// TypeToString converts key type to a string
+func (key *MasterKey) TypeToString() string {
+	return "gcp_kms"
+}
+
 // newKMSClient returns a GCP KMS client configured with the credentialJSON
 // and/or grpcConn, falling back to environmental defaults.
 // It returns an error if the ResourceID is invalid, or if the setup of the

hcvault/keysource.go

@@ -216,6 +216,11 @@ func (key MasterKey) ToMap() map[string]interface{} {
 	return out
 }
 
+// TypeToString converts key type to a string
+func (key *MasterKey) TypeToString() string {
+	return "hc_vault"
+}
+
 // encryptPath returns the path for Encrypt requests.
 func (key *MasterKey) encryptPath() string {
 	return path.Join(key.EnginePath, "encrypt", key.KeyName)

keys/keys.go

@@ -10,4 +10,5 @@ type MasterKey interface {
 	NeedsRotation() bool
 	ToString() string
 	ToMap() map[string]interface{}
+	TypeToString() string
 }

keyservice/keyservice.go

@@ -82,22 +82,3 @@ func KeyFromMasterKey(mk keys.MasterKey) Key {
 		panic(fmt.Sprintf("Tried to convert unknown MasterKey type %T to keyservice.Key", mk))
 	}
 }
-
-func MasterKeyTypeToString(mk keys.MasterKey) string {
-	switch mk := mk.(type) {
-	case *pgp.MasterKey:
-		return "pgp"
-	case *gcpkms.MasterKey:
-		return "gcp_kms"
-	case *hcvault.MasterKey:
-		return "hc_vault"
-	case *kms.MasterKey:
-		return "kms"
-	case *azkv.MasterKey:
-		return "azure_kv"
-	case *age.MasterKey:
-		return "age"
-	default:
-		panic(fmt.Sprintf("Tried to convert unknown MasterKey type %T to string", mk))
-	}
-}

kms/keysource.go

@@ -297,6 +297,11 @@ func (key MasterKey) ToMap() map[string]interface{} {
 	return out
 }
 
+// TypeToString converts key type to a string
+func (key *MasterKey) TypeToString() string {
+	return "kms"
+}
+
 // createKMSConfig returns an AWS config with the credentialsProvider of the
 // MasterKey, or the default configuration sources.
 func (key MasterKey) createKMSConfig() (*aws.Config, error) {

pgp/keysource.go

@@ -449,6 +449,11 @@ func (key MasterKey) ToMap() map[string]interface{} {
 	return out
 }
 
+// TypeToString converts key type to a string
+func (key *MasterKey) TypeToString() string {
+	return "pgp"
+}
+
 // retrievePubKey attempts to retrieve the public key from the public keyring
 // by Fingerprint.
 func (key *MasterKey) retrievePubKey() (openpgp.Entity, error) {

sops.go

@@ -702,13 +702,13 @@ func sortKeyGroupIndices(group KeyGroup, decryptionOrder []string) []int {
 		indices[i] = i
 	}
 	sort.SliceStable(indices, func(i, j int) bool {
-		keyI := keyservice.MasterKeyTypeToString(group[indices[i]])
-		keyJ := keyservice.MasterKeyTypeToString(group[indices[j]])
-		priorityI, ok := priorities[keyI]
+		keyTypeI := group[indices[i]].TypeToString()
+		keyTypeJ := group[indices[j]].TypeToString()
+		priorityI, ok := priorities[keyTypeI]
 		if !ok {
 			priorityI = maxPriority
 		}
-		priorityJ, ok := priorities[keyJ]
+		priorityJ, ok := priorities[keyTypeJ]
 		if !ok {
 			priorityJ = maxPriority
 		}