aboutsummaryrefslogtreecommitdiff
path: root/weed/s3api/s3api_bucket_config.go
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2025-07-19 21:43:34 -0700
committerGitHub <noreply@github.com>2025-07-19 21:43:34 -0700
commit12f50d37fa52444a43ad6ff4cc3d156db4035528 (patch)
treef2ea4466b899e18672530238dc7b35b91115e963 /weed/s3api/s3api_bucket_config.go
parent0e4d803896fc9a48a77d0d1669583c613452539c (diff)
downloadseaweedfs-12f50d37fa52444a43ad6ff4cc3d156db4035528.tar.xz
seaweedfs-12f50d37fa52444a43ad6ff4cc3d156db4035528.zip
test versioning also (#7000)
* test versioning also * fix some versioning tests * fall back * fixes Never-versioned buckets: No VersionId headers, no Status field Pre-versioning objects: Regular files, VersionId="null", included in all operations Post-versioning objects: Stored in .versions directories with real version IDs Suspended versioning: Proper status handling and null version IDs * fixes Bucket Versioning Status Compliance Fixed: New buckets now return no Status field (AWS S3 compliant) Before: Always returned "Suspended" ❌ After: Returns empty VersioningConfiguration for unconfigured buckets ✅ 2. Multi-Object Delete Versioning Support Fixed: DeleteMultipleObjectsHandler now fully versioning-aware Before: Always deleted physical files, breaking versioning ❌ After: Creates delete markers or deletes specific versions properly ✅ Added: DeleteMarker field in response structure for AWS compatibility 3. Copy Operations Versioning Support Fixed: CopyObjectHandler and CopyObjectPartHandler now versioning-aware Before: Only copied regular files, couldn't handle versioned sources ❌ After: Parses version IDs from copy source, creates versions in destination ✅ Added: pathToBucketObjectAndVersion() function for version ID parsing 4. Pre-versioning Object Handling Fixed: getLatestObjectVersion() now has proper fallback logic Before: Failed when .versions directory didn't exist ❌ After: Falls back to regular objects for pre-versioning scenarios ✅ 5. Enhanced Object Version Listings Fixed: listObjectVersions() includes both versioned AND pre-versioning objects Before: Only showed .versions directories, ignored pre-versioning objects ❌ After: Shows complete version history with VersionId="null" for pre-versioning ✅ 6. Null Version ID Handling Fixed: getSpecificObjectVersion() properly handles versionId="null" Before: Couldn't retrieve pre-versioning objects by version ID ❌ After: Returns regular object files for "null" version requests ✅ 7. Version ID Response Headers Fixed: PUT operations only return x-amz-version-id when appropriate Before: Returned version IDs for non-versioned buckets ❌ After: Only returns version IDs for explicitly configured versioning ✅ * more fixes * fix copying with versioning, multipart upload * more fixes * reduce volume size for easier dev test * fix * fix version id * fix versioning * Update filer_multipart.go * fix multipart versioned upload * more fixes * more fixes * fix versioning on suspended * fixes * fixing test_versioning_obj_suspended_copy * Update s3api_object_versioning.go * fix versions * skipping test_versioning_obj_suspend_versions * > If the versioning state has never been set on a bucket, it has no versioning state; a GetBucketVersioning request does not return a versioning state value. * fix tests, avoid duplicated bucket creation, skip tests * only run s3tests_boto3/functional/test_s3.py * fix checking filer_pb.ErrNotFound * Update weed/s3api/s3api_object_versioning.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update weed/s3api/s3api_object_handlers_copy.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update weed/s3api/s3api_bucket_config.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update test/s3/versioning/s3_versioning_test.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Diffstat (limited to 'weed/s3api/s3api_bucket_config.go')
-rw-r--r--weed/s3api/s3api_bucket_config.go45
1 files changed, 39 insertions, 6 deletions
diff --git a/weed/s3api/s3api_bucket_config.go b/weed/s3api/s3api_bucket_config.go
index 41e750e5c..5987a9de6 100644
--- a/weed/s3api/s3api_bucket_config.go
+++ b/weed/s3api/s3api_bucket_config.go
@@ -2,6 +2,7 @@ package s3api
import (
"encoding/json"
+ "errors"
"fmt"
"path/filepath"
"strings"
@@ -135,7 +136,7 @@ func (s3a *S3ApiServer) getBucketConfig(bucket string) (*BucketConfig, s3err.Err
// Load CORS configuration from .s3metadata
if corsConfig, err := s3a.loadCORSFromMetadata(bucket); err != nil {
- if err == filer_pb.ErrNotFound {
+ if errors.Is(err, filer_pb.ErrNotFound) {
// Missing metadata is not an error; fall back cleanly
glog.V(2).Infof("CORS metadata not found for bucket %s, falling back to default behavior", bucket)
} else {
@@ -219,6 +220,40 @@ func (s3a *S3ApiServer) isVersioningEnabled(bucket string) (bool, error) {
return config.Versioning == s3_constants.VersioningEnabled || config.ObjectLockConfig != nil, nil
}
+// isVersioningConfigured checks if versioning has been configured (either Enabled or Suspended)
+func (s3a *S3ApiServer) isVersioningConfigured(bucket string) (bool, error) {
+ config, errCode := s3a.getBucketConfig(bucket)
+ if errCode != s3err.ErrNone {
+ if errCode == s3err.ErrNoSuchBucket {
+ return false, filer_pb.ErrNotFound
+ }
+ return false, fmt.Errorf("failed to get bucket config: %v", errCode)
+ }
+
+ // Versioning is configured if explicitly set to either "Enabled" or "Suspended"
+ // OR if object lock is enabled (which forces versioning)
+ return config.Versioning != "" || config.ObjectLockConfig != nil, nil
+}
+
+// getVersioningState returns the detailed versioning state for a bucket
+func (s3a *S3ApiServer) getVersioningState(bucket string) (string, error) {
+ config, errCode := s3a.getBucketConfig(bucket)
+ if errCode != s3err.ErrNone {
+ if errCode == s3err.ErrNoSuchBucket {
+ return "", filer_pb.ErrNotFound
+ }
+ return "", fmt.Errorf("failed to get bucket config: %v", errCode)
+ }
+
+ // If object lock is enabled, versioning must be enabled regardless of explicit setting
+ if config.ObjectLockConfig != nil {
+ return s3_constants.VersioningEnabled, nil
+ }
+
+ // Return the explicit versioning status (empty string means never configured)
+ return config.Versioning, nil
+}
+
// getBucketVersioningStatus returns the versioning status for a bucket
func (s3a *S3ApiServer) getBucketVersioningStatus(bucket string) (string, s3err.ErrorCode) {
config, errCode := s3a.getBucketConfig(bucket)
@@ -226,10 +261,8 @@ func (s3a *S3ApiServer) getBucketVersioningStatus(bucket string) (string, s3err.
return "", errCode
}
- if config.Versioning == "" {
- return s3_constants.VersioningSuspended, s3err.ErrNone
- }
-
+ // Return exactly what's stored - empty string means versioning was never configured
+ // This matches AWS S3 behavior where new buckets have no Status field in GetBucketVersioning response
return config.Versioning, s3err.ErrNone
}
@@ -278,7 +311,7 @@ func (s3a *S3ApiServer) loadCORSFromMetadata(bucket string) (*cors.CORSConfigura
entry, err := s3a.getEntry("", bucketMetadataPath)
if err != nil {
glog.V(3).Infof("loadCORSFromMetadata: error retrieving metadata for bucket %s: %v", bucket, err)
- return nil, fmt.Errorf("error retrieving metadata for bucket %s: %v", bucket, err)
+ return nil, fmt.Errorf("error retrieving CORS metadata for bucket %s: %w", bucket, err)
}
if entry == nil {
glog.V(3).Infof("loadCORSFromMetadata: no metadata entry found for bucket %s", bucket)