Skip to content

Commit 1ea4a74

Browse files
onedr0ponedr0p
authored
Merge pull request #1146 from hiddeco/revert-log-unify
2 parents f495885 + d54c128 commit 1ea4a74

5 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎age/keysource.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
124124
if key.parsedRecipient == nil {
125125
parsedRecipient, err := parseRecipient(key.Recipient)
126126
if err != nil {
127-
log.WithError(err).WithField("recipient", key.parsedRecipient).Error("Encryption failed")
127+
log.WithField("recipient", key.parsedRecipient).Error("Encryption failed")
128128
return err
129129
}
130130
key.parsedRecipient = parsedRecipient
@@ -134,19 +134,19 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
134134
aw := armor.NewWriter(&buffer)
135135
w, err := age.Encrypt(aw, key.parsedRecipient)
136136
if err != nil {
137-
log.WithError(err).WithField("recipient", key.parsedRecipient).Error("Encryption failed")
137+
log.WithField("recipient", key.parsedRecipient).Error("Encryption failed")
138138
return fmt.Errorf("failed to create writer for encrypting sops data key with age: %w", err)
139139
}
140140
if _, err := w.Write(dataKey); err != nil {
141-
log.WithError(err).WithField("recipient", key.parsedRecipient).Error("Encryption failed")
141+
log.WithField("recipient", key.parsedRecipient).Error("Encryption failed")
142142
return fmt.Errorf("failed to encrypt sops data key with age: %w", err)
143143
}
144144
if err := w.Close(); err != nil {
145-
log.WithError(err).WithField("recipient", key.parsedRecipient).Error("Encryption failed")
145+
log.WithField("recipient", key.parsedRecipient).Error("Encryption failed")
146146
return fmt.Errorf("failed to close writer for encrypting sops data key with age: %w", err)
147147
}
148148
if err := aw.Close(); err != nil {
149-
log.WithError(err).WithField("recipient", key.parsedRecipient).Error("Encryption failed")
149+
log.WithField("recipient", key.parsedRecipient).Error("Encryption failed")
150150
return fmt.Errorf("failed to close armored writer: %w", err)
151151
}
152152

@@ -180,7 +180,7 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
180180
if len(key.parsedIdentities) == 0 {
181181
ids, err := key.loadIdentities()
182182
if err != nil {
183-
log.WithError(err).Error("Decryption failed")
183+
log.Error("Decryption failed")
184184
return nil, fmt.Errorf("failed to load age identities: %w", err)
185185
}
186186
ids.ApplyToMasterKey(key)
@@ -190,13 +190,13 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
190190
ar := armor.NewReader(src)
191191
r, err := age.Decrypt(ar, key.parsedIdentities...)
192192
if err != nil {
193-
log.WithError(err).Error("Decryption failed")
193+
log.Error("Decryption failed")
194194
return nil, fmt.Errorf("failed to create reader for decrypting sops data key with age: %w", err)
195195
}
196196

197197
var b bytes.Buffer
198198
if _, err := io.Copy(&b, r); err != nil {
199-
log.WithError(err).Error("Decryption failed")
199+
log.Error("Decryption failed")
200200
return nil, fmt.Errorf("failed to copy age decrypted data into bytes.Buffer: %w", err)
201201
}
202202

‎gcpkms/keysource.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ func (c CredentialJSON) ApplyToMasterKey(key *MasterKey) {
9494
func (key *MasterKey) Encrypt(dataKey []byte) error {
9595
service, err := key.newKMSClient()
9696
if err != nil {
97-
log.WithError(err).WithField("resourceID", key.ResourceID).Error("Encryption failed")
97+
log.WithField("resourceID", key.ResourceID).Error("Encryption failed")
9898
return fmt.Errorf("cannot create GCP KMS service: %w", err)
9999
}
100100
defer func() {
101101
if err := service.Close(); err != nil {
102-
log.WithError(err).Error("failed to close GCP KMS client connection")
102+
log.Error("failed to close GCP KMS client connection")
103103
}
104104
}()
105105

@@ -110,7 +110,7 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
110110
ctx := context.Background()
111111
resp, err := service.Encrypt(ctx, req)
112112
if err != nil {
113-
log.WithError(err).WithField("resourceID", key.ResourceID).Error("Encryption failed")
113+
log.WithField("resourceID", key.ResourceID).Error("Encryption failed")
114114
return fmt.Errorf("failed to encrypt sops data key with GCP KMS key: %w", err)
115115
}
116116
// NB: base64 encoding is for compatibility with SOPS <=3.8.x.
@@ -145,20 +145,20 @@ func (key *MasterKey) EncryptIfNeeded(dataKey []byte) error {
145145
func (key *MasterKey) Decrypt() ([]byte, error) {
146146
service, err := key.newKMSClient()
147147
if err != nil {
148-
log.WithError(err).WithField("resourceID", key.ResourceID).Error("Decryption failed")
148+
log.WithField("resourceID", key.ResourceID).Error("Decryption failed")
149149
return nil, fmt.Errorf("cannot create GCP KMS service: %w", err)
150150
}
151151
defer func() {
152152
if err := service.Close(); err != nil {
153-
log.WithError(err).Error("failed to close GCP KMS client connection")
153+
log.Error("failed to close GCP KMS client connection")
154154
}
155155
}()
156156

157157
// NB: this is for compatibility with SOPS <=3.8.x. The previous GCP KMS
158158
// client used to work with base64 encoded strings.
159159
decodedCipher, err := base64.StdEncoding.DecodeString(string(key.EncryptedDataKey()))
160160
if err != nil {
161-
log.WithError(err).WithField("resourceID", key.ResourceID).Error("Decryption failed")
161+
log.WithField("resourceID", key.ResourceID).Error("Decryption failed")
162162
return nil, err
163163
}
164164

@@ -169,7 +169,7 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
169169
ctx := context.Background()
170170
resp, err := service.Decrypt(ctx, req)
171171
if err != nil {
172-
log.WithError(err).WithField("resourceID", key.ResourceID).Error("Decryption failed")
172+
log.WithField("resourceID", key.ResourceID).Error("Decryption failed")
173173
return nil, fmt.Errorf("failed to decrypt sops data key with GCP KMS key: %w", err)
174174
}
175175

‎hcvault/keysource.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,18 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
130130

131131
client, err := vaultClient(key.VaultAddress, key.token)
132132
if err != nil {
133-
log.WithError(err).WithField("Path", fullPath).Error("Encryption failed")
133+
log.WithField("Path", fullPath).Error("Encryption failed")
134134
return err
135135
}
136136

137137
secret, err := client.Logical().Write(fullPath, encryptPayload(dataKey))
138138
if err != nil {
139-
log.WithError(err).WithField("Path", fullPath).Error("Encryption failed")
139+
log.WithField("Path", fullPath).Error("Encryption failed")
140140
return fmt.Errorf("failed to encrypt sops data key to Vault transit backend '%s': %w", fullPath, err)
141141
}
142142
encryptedKey, err := encryptedKeyFromSecret(secret)
143143
if err != nil {
144-
log.WithError(err).WithField("Path", fullPath).Error("Encryption failed")
144+
log.WithField("Path", fullPath).Error("Encryption failed")
145145
return fmt.Errorf("failed to encrypt sops data key to Vault transit backend '%s': %w", fullPath, err)
146146
}
147147

@@ -175,18 +175,18 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
175175

176176
client, err := vaultClient(key.VaultAddress, key.token)
177177
if err != nil {
178-
log.WithError(err).WithField("Path", fullPath).Error("Decryption failed")
178+
log.WithField("Path", fullPath).Error("Decryption failed")
179179
return nil, err
180180
}
181181

182182
secret, err := client.Logical().Write(fullPath, decryptPayload(key.EncryptedKey))
183183
if err != nil {
184-
log.WithError(err).WithField("Path", fullPath).Error("Decryption failed")
184+
log.WithField("Path", fullPath).Error("Decryption failed")
185185
return nil, fmt.Errorf("failed to decrypt sops data key from Vault transit backend '%s': %w", fullPath, err)
186186
}
187187
dataKey, err := dataKeyFromSecret(secret)
188188
if err != nil {
189-
log.WithError(err).WithField("Path", fullPath).Error("Decryption failed")
189+
log.WithField("Path", fullPath).Error("Decryption failed")
190190
return nil, fmt.Errorf("failed to decrypt sops data key from Vault transit backend '%s': %w", fullPath, err)
191191
}
192192

‎kms/keysource.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (c CredentialsProvider) ApplyToMasterKey(key *MasterKey) {
194194
func (key *MasterKey) Encrypt(dataKey []byte) error {
195195
cfg, err := key.createKMSConfig()
196196
if err != nil {
197-
log.WithError(err).WithField("arn", key.Arn).Error("Encryption failed")
197+
log.WithField("arn", key.Arn).Error("Encryption failed")
198198
return err
199199
}
200200
client := kms.NewFromConfig(*cfg)
@@ -205,7 +205,7 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
205205
}
206206
out, err := client.Encrypt(context.TODO(), input)
207207
if err != nil {
208-
log.WithError(err).WithField("arn", key.Arn).Error("Encryption failed")
208+
log.WithField("arn", key.Arn).Error("Encryption failed")
209209
return fmt.Errorf("failed to encrypt sops data key with AWS KMS: %w", err)
210210
}
211211
key.EncryptedKey = base64.StdEncoding.EncodeToString(out.CiphertextBlob)
@@ -237,12 +237,12 @@ func (key *MasterKey) SetEncryptedDataKey(enc []byte) {
237237
func (key *MasterKey) Decrypt() ([]byte, error) {
238238
k, err := base64.StdEncoding.DecodeString(key.EncryptedKey)
239239
if err != nil {
240-
log.WithError(err).WithField("arn", key.Arn).Error("Decryption failed")
240+
log.WithField("arn", key.Arn).Error("Decryption failed")
241241
return nil, fmt.Errorf("error base64-decoding encrypted data key: %s", err)
242242
}
243243
cfg, err := key.createKMSConfig()
244244
if err != nil {
245-
log.WithError(err).WithField("arn", key.Arn).Error("Decryption failed")
245+
log.WithField("arn", key.Arn).Error("Decryption failed")
246246
return nil, err
247247
}
248248
client := kms.NewFromConfig(*cfg)
@@ -253,7 +253,7 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
253253
}
254254
decrypted, err := client.Decrypt(context.TODO(), input)
255255
if err != nil {
256-
log.WithError(err).WithField("arn", key.Arn).Error("Decryption failed")
256+
log.WithField("arn", key.Arn).Error("Decryption failed")
257257
return nil, fmt.Errorf("failed to decrypt sops data key with AWS KMS: %w", err)
258258
}
259259
log.WithField("arn", key.Arn).Info("Decryption succeeded")

‎pgp/keysource.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func (key *MasterKey) Encrypt(dataKey []byte) error {
268268
}
269269
errs = append(errs, fmt.Errorf("GnuPG binary error: %w", binaryErr))
270270

271-
log.WithError(errs).WithField("fingerprint", key.Fingerprint).Error("Encryption failed")
271+
log.WithField("fingerprint", key.Fingerprint).Error("Encryption failed")
272272
return fmt.Errorf("could not encrypt data key with PGP key: %w", errs)
273273
}
274274

@@ -379,7 +379,7 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
379379
}
380380
errs = append(errs, fmt.Errorf("GnuPG binary error: %w", binaryErr))
381381

382-
log.WithError(errs).WithField("fingerprint", key.Fingerprint).Error("Decryption failed")
382+
log.WithField("fingerprint", key.Fingerprint).Error("Decryption failed")
383383
return nil, fmt.Errorf("could not decrypt data key with PGP key: %w", errs)
384384
}
385385

0 commit comments

Comments
 (0)