From 03ff3df0ef4502ced991a42401ae951d481343f0 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 27 Sep 2025 10:35:15 +0200 Subject: [PATCH] Apply review suggestions. Signed-off-by: Felix Fontein --- azkv/keysource.go | 14 +++++++++++--- config/config.go | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/azkv/keysource.go b/azkv/keysource.go index d6c69475a..d7a73547f 100644 --- a/azkv/keysource.go +++ b/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 diff --git a/config/config.go b/config/config.go index 6a617c06d..6a67e0619 100644 --- a/config/config.go +++ b/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