Skip to content

Commit 464d9b4

Browse files
committed
fix dropping Owner from response
1 parent 7c8a8a5 commit 464d9b4

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

aws-replicator/aws_replicator/server/aws_request_forwarder.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,14 @@ def forward_request(self, context: RequestContext, proxy: ProxyInstance) -> requ
157157
elif request.data:
158158
data = request.data
159159
LOG.debug("Forward request: %s %s - %s - %s", request.method, url, dict(headers), data)
160+
# construct response
160161
result = requests.request(
161162
method=request.method, url=url, data=data, headers=dict(headers), stream=True
162163
)
163164
# TODO: ugly hack for now, simply attaching an additional attribute for raw response content
164165
result.raw_content = result.raw.read()
166+
# make sure we're removing any transfer-encoding headers
167+
result.headers.pop("Transfer-Encoding", None)
165168
LOG.debug(
166169
"Returned response: %s %s - %s",
167170
result.status_code,

aws-replicator/tests/test_proxy_requests.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ def _add_header(request, **kwargs):
103103
# list objects
104104
result_aws = s3_client_aws.list_objects(Bucket=bucket, **kwargs)
105105
result_proxied = s3_client.list_objects(Bucket=bucket, **kwargs)
106+
# TODO: for some reason, the proxied result may contain 'DisplayName', whereas result_aws does not
107+
for res in result_proxied["Contents"] + result_aws["Contents"]:
108+
res.get("Owner", {}).pop("DisplayName", None)
106109
assert result_proxied["Contents"] == result_aws["Contents"]
107110

108111
# list objects v2

0 commit comments

Comments
 (0)