diff options
| author | chrislu <chris.lu@gmail.com> | 2025-07-18 20:43:09 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2025-07-18 20:43:09 -0700 |
| commit | 5c24bfc7959617f80dedeca062b966043310b48a (patch) | |
| tree | 71a6f8c91fb12e3ec6d00a7d29ee907feb1e59bb | |
| parent | 1d1c7174932474dfe315143c43830900286021d6 (diff) | |
| download | seaweedfs-5c24bfc7959617f80dedeca062b966043310b48a.tar.xz seaweedfs-5c24bfc7959617f80dedeca062b966043310b48a.zip | |
fix test_object_lock_delete_object_with_retention_and_marker
| -rw-r--r-- | weed/s3api/s3api_object_handlers_delete.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/weed/s3api/s3api_object_handlers_delete.go b/weed/s3api/s3api_object_handlers_delete.go index 22d334906..b2d9c51c9 100644 --- a/weed/s3api/s3api_object_handlers_delete.go +++ b/weed/s3api/s3api_object_handlers_delete.go @@ -71,16 +71,9 @@ func (s3a *S3ApiServer) DeleteObjectHandler(w http.ResponseWriter, r *http.Reque // Set version ID in response header w.Header().Set("x-amz-version-id", versionId) } else { - // Check object lock permissions before creating delete marker - // AWS S3 behavior: delete operations fail if latest version has retention protection - governanceBypassAllowed := s3a.evaluateGovernanceBypassRequest(r, bucket, object) - if err := s3a.enforceObjectLockProtections(r, bucket, object, "", governanceBypassAllowed); err != nil { - glog.V(2).Infof("DeleteObjectHandler: object lock check failed for %s/%s: %v", bucket, object, err) - s3err.WriteErrorResponse(w, r, s3err.ErrAccessDenied) - return - } - // Create delete marker (logical delete) + // AWS S3 behavior: Delete marker creation is NOT blocked by object retention + // because it's a logical delete that doesn't actually remove the retained version deleteMarkerVersionId, err := s3a.createDeleteMarker(bucket, object) if err != nil { glog.Errorf("Failed to create delete marker: %v", err) |