diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2025-10-28 19:05:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-28 19:05:29 -0700 |
| commit | 85bd593936126157fbb5f01a048d8258fab045c5 (patch) | |
| tree | 2a0a3c3587649622f58fc168c4a2bac8a9cb6a9a /weed/s3api/auth_credentials.go | |
| parent | d19eca71eb1da170b4398d5a207f6951c8fa20d5 (diff) | |
| download | seaweedfs-85bd593936126157fbb5f01a048d8258fab045c5.tar.xz seaweedfs-85bd593936126157fbb5f01a048d8258fab045c5.zip | |
S3: adjust for loading credentials (#7400)
* adjust for loading credentials
* Update weed/s3api/auth_credentials_test.go
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
* simplify
---------
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Diffstat (limited to 'weed/s3api/auth_credentials.go')
| -rw-r--r-- | weed/s3api/auth_credentials.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/weed/s3api/auth_credentials.go b/weed/s3api/auth_credentials.go index e3e7c0bbb..66b9c7296 100644 --- a/weed/s3api/auth_credentials.go +++ b/weed/s3api/auth_credentials.go @@ -153,10 +153,10 @@ func NewIdentityAccessManagementWithStore(option *S3ApiServerOption, explicitSto if err := iam.loadS3ApiConfigurationFromFile(option.Config); err != nil { glog.Fatalf("fail to load config file %s: %v", option.Config, err) } - // Mark as loaded since an explicit config file was provided - // This prevents fallback to environment variables even if no identities were loaded - // (e.g., config file contains only KMS settings) - configLoaded = true + // Check if any identities were actually loaded from the config file + iam.m.RLock() + configLoaded = len(iam.identities) > 0 + iam.m.RUnlock() } else { glog.V(3).Infof("no static config file specified... loading config from credential manager") if err := iam.loadS3ApiConfigurationFromFiler(option); err != nil { @@ -164,9 +164,7 @@ func NewIdentityAccessManagementWithStore(option *S3ApiServerOption, explicitSto } else { // Check if any identities were actually loaded from filer iam.m.RLock() - if len(iam.identities) > 0 { - configLoaded = true - } + configLoaded = len(iam.identities) > 0 iam.m.RUnlock() } } |