diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2023-09-25 20:34:12 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 08:34:12 -0700 |
| commit | f8b94cac0e91660ff4dc33bb458e973b4de6523b (patch) | |
| tree | 46226e5a964b65546ac299b4ad2e8cb5b7b81d0b /docker | |
| parent | c9177c92e5b6459d15d112738b7a3862655a853f (diff) | |
| download | seaweedfs-f8b94cac0e91660ff4dc33bb458e973b4de6523b.tar.xz seaweedfs-f8b94cac0e91660ff4dc33bb458e973b4de6523b.zip | |
[s3acl] Step1: move s3account.AccountManager into to iam.S3ApiConfiguration (#4859)
* move s3account.AccountManager into to iam.S3ApiConfiguration and switch to Interface
https://github.com/seaweedfs/seaweedfs/issues/4519
* fix: test bucket acl default and
adjust the variable names
* fix: s3 api config test
---------
Co-authored-by: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.co>
Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/compose/s3.json | 14 | ||||
| -rw-r--r-- | docker/compose/s3tests.conf | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/docker/compose/s3.json b/docker/compose/s3.json index 64dedb681..ce230863b 100644 --- a/docker/compose/s3.json +++ b/docker/compose/s3.json @@ -40,7 +40,10 @@ "List", "Tagging", "Write" - ] + ], + "account": { + "id": "testid" + } }, { "name": "s3_tests_alt", @@ -101,5 +104,12 @@ "Write" ] } - ] + ], + "accounts": [ + { + "id" : "testid", + "displayName": "M. Tester", + "emailAddress": "tester@ceph.com" + } + ] }
\ No newline at end of file diff --git a/docker/compose/s3tests.conf b/docker/compose/s3tests.conf index 2bffe20d4..68d9ddeb7 100644 --- a/docker/compose/s3tests.conf +++ b/docker/compose/s3tests.conf @@ -18,10 +18,10 @@ bucket prefix = yournamehere-{random}- [s3 main] # main display_name set in vstart.sh -display_name = s3_tests +display_name = M. Tester # main user_idname set in vstart.sh -user_id = s3_tests +user_id = testid # main email set in vstart.sh email = tester@ceph.com |