Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-06 08:15:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

deps: convert zap to slog (#2825)

Browse source
This commit is contained in:
miampf 2024-02-08 14:20:01 +00:00 • committed by GitHub
parent 3765cb0762
commit 54cce77bab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
182 changed files with 1474 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

23
s3proxy/internal/router/object.go
View file

@ -10,6 +10,7 @@ import (
"context"
"encoding/hex"
"io"
"log/slog"
"net/http"
"net/url"
"regexp"
@ -18,9 +19,7 @@ import (
"time"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/edgelesssys/constellation/v2/internal/logger"
"github.com/edgelesssys/constellation/v2/s3proxy/internal/crypto"
"go.uber.org/zap"
)
const (
@ -46,12 +45,12 @@ type object struct {
sseCustomerAlgorithm string
sseCustomerKey string
sseCustomerKeyMD5 string
log *logger.Logger
log *slog.Logger
}
// get is a http.HandlerFunc that implements the GET method for objects.
func (o object) get(w http.ResponseWriter, r *http.Request) {
o.log.With(zap.String("key", o.key), zap.String("host", o.bucket)).Debugf("getObject")
o.log.With(slog.String("key", o.key), slog.String("host", o.bucket)).Debug("getObject")
versionID, ok := o.query["versionId"]
if !ok {
@ -61,7 +60,7 @@ func (o object) get(w http.ResponseWriter, r *http.Request) {
output, err := o.client.GetObject(r.Context(), o.bucket, o.key, versionID[0], o.sseCustomerAlgorithm, o.sseCustomerKey, o.sseCustomerKeyMD5)
if err != nil {
// log with Info as it might be expected behavior (e.g. object not found).
o.log.With(zap.Error(err)).Errorf("GetObject sending request to S3")
o.log.With(slog.Any("error", err)).Error("GetObject sending request to S3")
// We want to forward error codes from the s3 API to clients as much as possible.
code := parseErrorCode(err)
@ -107,7 +106,7 @@ func (o object) get(w http.ResponseWriter, r *http.Request) {
body, err := io.ReadAll(output.Body)
if err != nil {
o.log.With(zap.Error(err)).Errorf("GetObject reading S3 response")
o.log.With(slog.Any("error", err)).Error("GetObject reading S3 response")
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -117,14 +116,14 @@ func (o object) get(w http.ResponseWriter, r *http.Request) {
if ok {
encryptedDEK, err := hex.DecodeString(rawEncryptedDEK)
if err != nil {
o.log.Errorf("GetObject decoding DEK", "error", err)
o.log.Error("GetObject decoding DEK", "error", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
plaintext, err = crypto.Decrypt(body, encryptedDEK, o.kek)
if err != nil {
o.log.With(zap.Error(err)).Errorf("GetObject decrypting response")
o.log.With(slog.Any("error", err)).Error("GetObject decrypting response")
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -132,7 +131,7 @@ func (o object) get(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
if _, err := w.Write(plaintext); err != nil {
o.log.With(zap.Error(err)).Errorf("GetObject sending response")
o.log.With(slog.Any("error", err)).Error("GetObject sending response")
}
}
@ -140,7 +139,7 @@ func (o object) get(w http.ResponseWriter, r *http.Request) {
func (o object) put(w http.ResponseWriter, r *http.Request) {
ciphertext, encryptedDEK, err := crypto.Encrypt(o.data, o.kek)
if err != nil {
o.log.With(zap.Error(err)).Errorf("PutObject")
o.log.With(slog.Any("error", err)).Error("PutObject")
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -148,7 +147,7 @@ func (o object) put(w http.ResponseWriter, r *http.Request) {
output, err := o.client.PutObject(r.Context(), o.bucket, o.key, o.tags, o.contentType, o.objectLockLegalHoldStatus, o.objectLockMode, o.sseCustomerAlgorithm, o.sseCustomerKey, o.sseCustomerKeyMD5, o.objectLockRetainUntilDate, o.metadata, ciphertext)
if err != nil {
o.log.With(zap.Error(err)).Errorf("PutObject sending request to S3")
o.log.With(slog.Any("error", err)).Error("PutObject sending request to S3")
// We want to forward error codes from the s3 API to clients whenever possible.
code := parseErrorCode(err)
@ -199,7 +198,7 @@ func (o object) put(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
if _, err := w.Write(nil); err != nil {
o.log.With(zap.Error(err)).Errorf("PutObject sending response")
o.log.With(slog.Any("error", err)).Error("PutObject sending response")
}
}