codeperl
diff --git a/‎localstack/services/s3/notifications.py
Lines changed: 8 additions & 1 deletion b/‎localstack/services/s3/notifications.py
Lines changed: 8 additions & 1 deletion
@@ -13,6 +13,7 @@
 from localstack.aws.api.events import PutEventsRequestEntry
 from localstack.aws.api.lambda_ import InvocationType
 from localstack.aws.api.s3 import (
+    AccountId,
     BucketName,
     BucketRegion,
     Event,
@@ -97,6 +98,8 @@ class S3EventNotificationContext:
     key_name: ObjectKey
     xray: str
     bucket_location: BucketRegion
+    bucket_account_id: AccountId
+    caller: AccountId
     key_size: int
     key_etag: str
     key_version_id: str
@@ -154,8 +157,10 @@ def from_request_context(
             event_type=EVENT_OPERATION_MAP.get(request_context.operation.wire_name, ""),
             event_time=datetime.datetime.now(),
             region=request_context.region,
+            caller=request_context.account_id,  # TODO: use it for `userIdentity`
             bucket_name=bucket_name,
             bucket_location=bucket.location,
+            bucket_account_id=bucket.account_id,  # TODO: use it for bucket owner identity
             key_name=quote(key.name),
             key_etag=etag,
             key_size=key_size,
@@ -201,8 +206,10 @@ def from_request_context_native(
             event_type=EVENT_OPERATION_MAP.get(request_context.operation.wire_name, ""),
             event_time=datetime.datetime.now(),
             region=request_context.region,
+            caller=request_context.account_id,  # TODO: use it for `userIdentity`
             bucket_name=bucket_name,
             bucket_location=s3_bucket.bucket_region,
+            bucket_account_id=s3_bucket.bucket_account_id,  # TODO: use it for bucket owner identity
             key_name=quote(s3_object.key),
             key_etag=etag,
             key_size=key_size,
@@ -375,7 +382,7 @@ def _get_event_payload(
             awsRegion=ctx.region,
             eventTime=timestamp_millis(ctx.event_time),
             eventName=ctx.event_type.removeprefix("s3:"),
-            userIdentity={"principalId": "AIDAJDPLRKLG7UEXAMPLE"},
+            userIdentity={"principalId": "AIDAJDPLRKLG7UEXAMPLE"},  # TODO: use the real one?
             requestParameters={
                 "sourceIPAddress": "127.0.0.1"
             },  # TODO sourceIPAddress was previously extracted from headers ("X-Forwarded-For")