Skip to content

Commit

Permalink
Merge pull request #74 from nspcc-dev/ezayats/ISSUE-72
Browse files Browse the repository at this point in the history 
Adapt to EACL changes in 0.31.0 S3 gw
  • Loading branch information
@roman-khimov
roman-khimov authored Aug 19, 2024
2 parents deb6f2e + 8e73a92 commit 5813c64
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 19 deletions.
27 changes: 27 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,30 @@ config.yaml
# IDE
.idea
.vscode

# ignore work directories and setup files
s3tests.conf
.setup
.env
TemporaryDir/*
artifacts/*
docs/*
venv.*/*
/*wallet_config.yml
env_files/*
neofs_logs.zip
env_details
blobovnicza-to-peapod
neo-go
neofs-adm
neofs-cli
neofs-ir
neofs-lens
neofs-node
neofs-rest-gw
neofs-s3-authmate
neofs-s3-gw
neofs-contract
neofs_env_*.zip
temp_files.zip

38 changes: 19 additions & 19 deletions s3tests_boto3/functional/test_s3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4732,15 +4732,15 @@ def test_bucket_acl_default():
user_id = get_main_user_id()

assert response["Owner"]["DisplayName"] == display_name
assert response["Owner"]["ID"] == user_id
assert response["Owner"]["ID"] == display_name

grants = response["Grants"]
check_grants(
grants,
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4774,7 +4774,7 @@ def test_bucket_acl_canned_during_create():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4807,7 +4807,7 @@ def test_bucket_acl_canned():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -4825,7 +4825,7 @@ def test_bucket_acl_canned():
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4865,7 +4865,7 @@ def test_bucket_acl_canned_publicreadwrite():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4899,7 +4899,7 @@ def test_bucket_acl_canned_authenticatedread():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -4925,7 +4925,7 @@ def test_object_acl_default():
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4959,7 +4959,7 @@ def test_object_acl_canned_during_create():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -4994,7 +4994,7 @@ def test_object_acl_canned():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -5013,7 +5013,7 @@ def test_object_acl_canned():
[
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -5057,7 +5057,7 @@ def test_object_acl_canned_publicreadwrite():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -5094,7 +5094,7 @@ def test_object_acl_canned_authenticatedread():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -9548,13 +9548,13 @@ def test_versioned_object_acl():
user_id = get_main_user_id()

assert response["Owner"]["DisplayName"] == display_name
assert response["Owner"]["ID"] == user_id
assert response["Owner"]["ID"] == display_name

grants = response["Grants"]
default_policy = [
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -9583,7 +9583,7 @@ def test_versioned_object_acl():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down Expand Up @@ -9622,13 +9622,13 @@ def test_versioned_object_acl_no_version_specified():
user_id = get_main_user_id()

assert response["Owner"]["DisplayName"] == display_name
assert response["Owner"]["ID"] == user_id
assert response["Owner"]["ID"] == display_name

grants = response["Grants"]
default_policy = [
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand All @@ -9655,7 +9655,7 @@ def test_versioned_object_acl_no_version_specified():
),
dict(
Permission="FULL_CONTROL",
ID=user_id,
ID=display_name,
DisplayName=display_name,
URI=None,
EmailAddress=None,
Expand Down

0 comments on commit 5813c64

Please sign in to comment.