Apply review suggestions.

Signed-off-by: Felix Fontein <[email protected]>

Author: felixfontein

azkv/keysource.go

@@ -75,12 +75,20 @@ func newMasterKey(vaultURL string, keyName string, keyVersion string) *MasterKey
 	}
 }
 
+// NewMasterKey creates a new MasterKey from a URL, key name and (mandatory) version,
+// setting the creation date to the current date.
+func NewMasterKey(vaultURL string, keyName string, keyVersion string) *MasterKey {
+	return newMasterKey(vaultURL, keyName, keyVersion)
+}
+
 // NewMasterKey creates a new MasterKey from a URL, key name and (optional) version,
 // setting the creation date to the current date.
-func NewMasterKey(vaultURL string, keyName string, keyVersion string) (*MasterKey, error) {
+func NewMasterKeyWithOptionalVersion(vaultURL string, keyName string, keyVersion string) (*MasterKey, error) {
 	key := newMasterKey(vaultURL, keyName, keyVersion)
-	err := key.ensureKeyHasVersion(context.Background())
-	return key, err
+	if err := key.ensureKeyHasVersion(context.Background()); err != nil {
+		return nil, err
+	}
+	return key, nil
 }
 
 // NewMasterKeyFromURL takes an Azure Key Vault key URL, and returns a new

config/config.go

@@ -330,7 +330,7 @@ func extractMasterKeys(group keyGroup) (sops.KeyGroup, error) {
 		keyGroup = append(keyGroup, gcpkms.NewMasterKeyFromResourceID(k.ResourceID))
 	}
 	for _, k := range group.AzureKV {
-		if key, err := azkv.NewMasterKey(k.VaultURL, k.Key, k.Version); err == nil {
+		if key, err := azkv.NewMasterKeyWithOptionalVersion(k.VaultURL, k.Key, k.Version); err == nil {
 			keyGroup = append(keyGroup, key)
 		} else {
 			return nil, err