mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-08-27 19:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: combine SSE-S3 and SSE-KMS metadata serialization into else-if

Browse Source 
SSE-S3 and SSE-KMS bucket default encryption are mutually exclusive, so
use a single if/else-if block instead of two independent if blocks.
This commit is contained in:
Chris Lu
2026-03-26 11:55:49 -07:00
parent 105257e9b5
commit b270f1698d
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weed/s3api/s3api_object_handlers_put.go
+3 -7
View File
@@ -365,19 +365,15 @@ func (s3a *S3ApiServer) putToFiler(r *http.Request, filePath string, dataReader
}
}
// If SSE-S3 was applied by bucket default, prepare metadata (if not already done)
// If bucket default encryption was applied, serialize the metadata (SSE-S3 and SSE-KMS are mutually exclusive)
var metaErr error
if sseS3Key != nil && len(sseS3Metadata) == 0 {
var metaErr error
sseS3Metadata, metaErr = SerializeSSES3Metadata(sseS3Key)
if metaErr != nil {
glog.Errorf("Failed to serialize SSE-S3 metadata for bucket default encryption: %v", metaErr)
return "", s3err.ErrInternalError, SSEResponseMetadata{}
}
}
// If SSE-KMS was applied by bucket default, prepare metadata (if not already done)
if sseKMSKey != nil && len(sseKMSMetadata) == 0 {
var metaErr error
} else if sseKMSKey != nil && len(sseKMSMetadata) == 0 {
sseKMSMetadata, metaErr = SerializeSSEKMSMetadata(sseKMSKey)
if metaErr != nil {
glog.Errorf("Failed to serialize SSE-KMS metadata for bucket default encryption: %v", metaErr)