Skip to content

Commit

Permalink
Merge pull request #730 from asfadmin/rew/pr-4752-presigned-url-escape
Browse files Browse the repository at this point in the history
PR-4752 Fix issue with presigned URLs not working for keys with weird characters
  • Loading branch information
reweeden authored Jun 14, 2023
2 parents bc885e6 + d38df53 commit 96664f2
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 76 deletions.
61 changes: 30 additions & 31 deletions requirements/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,46 @@
#
# pip-compile requirements/requirements-dev.in
#
attrs==21.4.0
# via
# -c requirements/requirements.txt
# pytest
boto3==1.26.84
boto3==1.26.153
# via
# -r requirements/requirements-dev.in
# moto
botocore==1.29.84
botocore==1.29.153
# via
# -c requirements/requirements.txt
# boto3
# moto
# s3transfer
build==0.10.0
# via pip-tools
certifi==2022.12.7
certifi==2023.5.7
# via requests
cffi==1.15.1
# via
# -c requirements/requirements.txt
# cryptography
charset-normalizer==3.0.1
charset-normalizer==3.1.0
# via requests
click==8.1.3
# via
# -c requirements/requirements.txt
# pip-tools
coverage[toml]==7.2.1
coverage[toml]==7.2.7
# via pytest-cov
cryptography==39.0.2
cryptography==41.0.1
# via
# -c requirements/requirements.txt
# moto
deprecated==1.2.13
deprecated==1.2.14
# via opentelemetry-api
docker==6.0.1
docker==6.1.3
# via moto
exceptiongroup==1.1.0
exceptiongroup==1.1.1
# via pytest
idna==3.4
# via requests
importlib-metadata==6.0.1
# via opentelemetry-api
iniconfig==2.0.0
# via pytest
jinja2==3.1.2
Expand All @@ -57,23 +55,23 @@ jmespath==1.0.1
# -c requirements/requirements.txt
# boto3
# botocore
markupsafe==2.1.2
markupsafe==2.1.3
# via
# -c requirements/requirements.txt
# jinja2
# werkzeug
moto[awslambda]==4.1.3
moto[awslambda]==4.1.11
# via -r requirements/requirements-dev.in
opentelemetry-api==1.16.0
opentelemetry-api==1.18.0
# via opentelemetry-instrumentation
opentelemetry-instrumentation==0.37b0
opentelemetry-instrumentation==0.39b0
# via -r requirements/requirements-dev.in
packaging==23.0
packaging==23.1
# via
# build
# docker
# pytest
pip-tools==6.12.3
pip-tools==6.13.0
# via -r requirements/requirements-dev.in
pluggy==1.0.0
# via pytest
Expand All @@ -83,11 +81,11 @@ pycparser==2.21
# cffi
pyproject-hooks==1.0.0
# via build
pytest==7.2.2
pytest==7.3.2
# via
# -r requirements/requirements-dev.in
# pytest-cov
pytest-cov==4.0.0
pytest-cov==4.1.0
# via -r requirements/requirements-dev.in
python-dateutil==2.8.2
# via
Expand All @@ -98,41 +96,40 @@ pyyaml==6.0
# via
# -c requirements/requirements.txt
# -r requirements/requirements-dev.in
requests==2.28.2
# responses
requests==2.31.0
# via
# docker
# moto
# responses
responses==0.22.0
responses==0.23.1
# via moto
s3transfer==0.6.0
s3transfer==0.6.1
# via boto3
six==1.16.0
# via
# -c requirements/requirements.txt
# python-dateutil
toml==0.10.2
# via responses
tomli==2.0.1
# via
# build
# coverage
# pyproject-hooks
# pytest
types-toml==0.10.8.5
types-pyyaml==6.0.12.10
# via responses
urllib3==1.26.14
urllib3==1.26.16
# via
# -c requirements/requirements.txt
# botocore
# docker
# requests
# responses
websocket-client==1.5.1
websocket-client==1.5.3
# via docker
werkzeug==2.2.3
werkzeug==2.3.6
# via moto
wheel==0.38.4
wheel==0.40.0
# via
# -c requirements/requirements.txt
# pip-tools
Expand All @@ -142,6 +139,8 @@ wrapt==1.15.0
# opentelemetry-instrumentation
xmltodict==0.13.0
# via moto
zipp==3.15.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
21 changes: 11 additions & 10 deletions requirements/requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements/requirements-docs.in
#
click==8.1.3
# via mkdocs
ghp-import==2.1.0
# via mkdocs
importlib-metadata==6.0.0
importlib-metadata==6.6.0
# via
# markdown
# mkdocs
Expand All @@ -19,11 +19,11 @@ markdown==3.3.7
# mkdocs
# mkdocs-material
# pymdown-extensions
markupsafe==2.1.2
markupsafe==2.1.3
# via jinja2
mergedeep==1.3.4
# via mkdocs
mkdocs==1.4.2
mkdocs==1.4.3
# via
# -r requirements/requirements-docs.in
# mkdocs-asf-theme
Expand All @@ -34,23 +34,24 @@ mkdocs-material==6.2.8
# via mkdocs-asf-theme
mkdocs-material-extensions==1.1.1
# via mkdocs-material
packaging==23.0
packaging==23.1
# via mkdocs
pygments==2.14.0
pygments==2.15.1
# via mkdocs-material
pymdown-extensions==9.9.2
pymdown-extensions==10.0.1
# via mkdocs-material
python-dateutil==2.8.2
# via ghp-import
pyyaml==6.0
# via
# mkdocs
# pymdown-extensions
# pyyaml-env-tag
pyyaml-env-tag==0.1
# via mkdocs
six==1.16.0
# via python-dateutil
watchdog==2.2.1
watchdog==3.0.0
# via mkdocs
zipp==3.12.1
zipp==3.15.0
# via importlib-metadata
18 changes: 10 additions & 8 deletions requirements/requirements-make.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements/requirements-make.in
#
importlib-metadata==6.0.0
importlib-metadata==6.6.0
# via markdown
jinja2==3.1.2
# via -r requirements/requirements-make.in
markdown==3.4.1
markdown==3.4.3
# via
# -r requirements/requirements-make.in
# pymdown-extensions
markupsafe==2.1.2
markupsafe==2.1.3
# via jinja2
pygments==2.14.0
pygments==2.15.1
# via -r requirements/requirements-make.in
pymdown-extensions==9.9.2
pymdown-extensions==10.0.1
# via -r requirements/requirements-make.in
zipp==3.12.1
pyyaml==6.0
# via pymdown-extensions
zipp==3.15.0
# via importlib-metadata
26 changes: 12 additions & 14 deletions requirements/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements/requirements-test.in
#
attrs==22.2.0
# via pytest
boto3==1.26.66
boto3==1.26.153
# via -r requirements/requirements-test.in
botocore==1.29.66
botocore==1.29.153
# via
# boto3
# s3transfer
certifi==2022.12.7
certifi==2023.5.7
# via requests
charset-normalizer==3.0.1
charset-normalizer==3.1.0
# via requests
exceptiongroup==1.1.0
exceptiongroup==1.1.1
# via pytest
idna==3.4
# via requests
Expand All @@ -26,25 +24,25 @@ jmespath==1.0.1
# via
# boto3
# botocore
packaging==23.0
packaging==23.1
# via pytest
pluggy==1.0.0
# via pytest
pytest==7.2.1
pytest==7.3.2
# via -r requirements/requirements-test.in
python-dateutil==2.8.2
# via botocore
pyyaml==6.0
# via -r requirements/requirements-test.in
requests==2.28.2
requests==2.31.0
# via -r requirements/requirements-test.in
s3transfer==0.6.0
s3transfer==0.6.1
# via boto3
six==1.16.0
# via python-dateutil
tomli==2.0.1
# via pytest
urllib3==1.26.14
urllib3==1.26.16
# via
# botocore
# requests
2 changes: 1 addition & 1 deletion requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ cachetools
cfnresponse
chalice
flatdict
git+https://github.com/asfadmin/rain-api-core.git@16329f3fa7326edd668e26c2d817cf430268faad
git+https://github.com/asfadmin/rain-api-core.git@4d7756db4113b5b896794fbe75e0ef0adb637dea
netaddr
Loading

0 comments on commit 96664f2

Please sign in to comment.