Merge pull request #1781 from felixfontein/datakey-caching

felixfontein · web-flow · commit f6bc6df54ec6 · 2025-03-25T20:34:30.000+01:00
Fix caching of Metadata.DataKey
diff --git a/sops.go b/sops.go
@@ -824,7 +824,7 @@ func (m *Metadata) UpdateMasterKeys(dataKey []byte) (errs []error) {
 
 // GetDataKeyWithKeyServices retrieves the data key, asking KeyServices to decrypt it with each
 // MasterKey in the Metadata's KeySources until one of them succeeds.
-func (m Metadata) GetDataKeyWithKeyServices(svcs []keyservice.KeyServiceClient, decryptionOrder []string) ([]byte, error) {
+func (m *Metadata) GetDataKeyWithKeyServices(svcs []keyservice.KeyServiceClient, decryptionOrder []string) ([]byte, error) {
 	if m.DataKey != nil {
 		return m.DataKey, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,7 @@ func (m *Metadata) UpdateMasterKeys(dataKey []byte) (errs []error) {`
`824`	`824`
`825`	`825`	`// GetDataKeyWithKeyServices retrieves the data key, asking KeyServices to decrypt it with each`
`826`	`826`	`// MasterKey in the Metadata's KeySources until one of them succeeds.`
`827`		`-func (m Metadata) GetDataKeyWithKeyServices(svcs []keyservice.KeyServiceClient, decryptionOrder []string) ([]byte, error) {`
	`827`	`+func (m *Metadata) GetDataKeyWithKeyServices(svcs []keyservice.KeyServiceClient, decryptionOrder []string) ([]byte, error) {`
`828`	`828`	`if m.DataKey != nil {`
`829`	`829`	`return m.DataKey, nil`
`830`	`830`	`}`