getsops/sops
1
0
Fork 0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Code Issues Activity

Apply review suggestions.

Browse Source 
Signed-off-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
Felix Fontein
2025-09-27 10:35:15 +02:00
parent 61cc3f79ea
commit 03ff3df0ef
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
azkv/keysource.go
View File

@@ -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, // NewMasterKey creates a new MasterKey from a URL, key name and (optional) version,
// setting the creation date to the current date. // 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) key := newMasterKey(vaultURL, keyName, keyVersion)
err := key.ensureKeyHasVersion(context.Background()) if err := key.ensureKeyHasVersion(context.Background()); err != nil {
return key, err return nil, err
}
return key, nil
} }
// NewMasterKeyFromURL takes an Azure Key Vault key URL, and returns a new // NewMasterKeyFromURL takes an Azure Key Vault key URL, and returns a new

2
config/config.go
View File

@@ -330,7 +330,7 @@ func extractMasterKeys(group keyGroup) (sops.KeyGroup, error) {
keyGroup = append(keyGroup, gcpkms.NewMasterKeyFromResourceID(k.ResourceID)) keyGroup = append(keyGroup, gcpkms.NewMasterKeyFromResourceID(k.ResourceID))
} }
for _, k := range group.AzureKV { 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) keyGroup = append(keyGroup, key)
} else { } else {
return nil, err return nil, err