diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2025-07-18 02:19:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-18 02:19:50 -0700 |
| commit | c6a22ce43a3c0318b7c6841bcbf97937fd11e27c (patch) | |
| tree | fd027c20f547e1be7f550c96c1e5935f2579c4ca /weed/s3api/s3api_bucket_handlers.go | |
| parent | 69553e5ba6d46ed924b0c3adc3f8d9666550999a (diff) | |
| download | seaweedfs-c6a22ce43a3c0318b7c6841bcbf97937fd11e27c.tar.xz seaweedfs-c6a22ce43a3c0318b7c6841bcbf97937fd11e27c.zip | |
Fix get object lock configuration handler (#6996)
* fix GetObjectLockConfigurationHandler
* cache and use bucket object lock config
* subscribe to bucket configuration changes
* increase bucket config cache TTL
* refactor
* Update weed/s3api/s3api_server.go
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
* avoid duplidated work
* rename variable
* Update s3api_object_handlers_put.go
* fix routing
* admin ui and api handler are consistent now
* use fields instead of xml
* fix test
* address comments
* Update weed/s3api/s3api_object_handlers_put.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update test/s3/retention/s3_retention_test.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update weed/s3api/object_lock_utils.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* change error style
* errorf
---------
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Diffstat (limited to 'weed/s3api/s3api_bucket_handlers.go')
| -rw-r--r-- | weed/s3api/s3api_bucket_handlers.go | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go index 0bc4a7b10..e30f172a7 100644 --- a/weed/s3api/s3api_bucket_handlers.go +++ b/weed/s3api/s3api_bucket_handlers.go @@ -147,25 +147,13 @@ func (s3a *S3ApiServer) PutBucketHandler(w http.ResponseWriter, r *http.Request) // Enable versioning (required for Object Lock) bucketConfig.Versioning = s3_constants.VersioningEnabled - // Enable Object Lock configuration - if bucketConfig.Entry.Extended == nil { - bucketConfig.Entry.Extended = make(map[string][]byte) - } - // Create basic Object Lock configuration (enabled without default retention) - // The ObjectLockConfiguration struct is defined below in this file. objectLockConfig := &ObjectLockConfiguration{ ObjectLockEnabled: s3_constants.ObjectLockEnabled, } - // Store the configuration as XML in extended attributes - configXML, err := xml.Marshal(objectLockConfig) - if err != nil { - return fmt.Errorf("failed to marshal Object Lock configuration to XML: %w", err) - } - - bucketConfig.Entry.Extended[s3_constants.ExtObjectLockConfigKey] = configXML - bucketConfig.Entry.Extended[s3_constants.ExtObjectLockEnabledKey] = []byte(s3_constants.ObjectLockEnabled) + // Set the cached Object Lock configuration + bucketConfig.ObjectLockConfig = objectLockConfig return nil }) |