Skip to content

Commit

Permalink
Merge pull request #632 from ckulal/fix_format_change
Browse files Browse the repository at this point in the history
Support format change for owneridentidty in event record squid
  • Loading branch information
mergify[bot] authored Sep 10, 2024
2 parents d960419 + 6be8d52 commit 939e2be
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion rgw/v2/tests/s3_swift/reusables/bucket_notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,14 @@ def verify_event_record(

# verify bucket owner in event record
bucket_owner = bucket_stats_json["owner"]
if "$" in bucket_owner:

ceph_version_id, _ = utils.get_ceph_version()
ceph_version_id = ceph_version_id.split("-")
ceph_version_id = ceph_version_id[0].split(".")

if "$" in bucket_owner and int(ceph_version_id[0]) < 19:
bucket_owner = bucket_owner.split("$")[-1]

bkt_owner_evnt = event_record_json["Records"][0]["s3"]["bucket"][
"ownerIdentity"
]["principalId"]
Expand Down

0 comments on commit 939e2be

Please sign in to comment.