Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Dependencies] Upgrade Werkzeug from version 2.0.* to version 3.0.3 #6370

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

[Dependencies] Upgrade Werkzeug from version 2.0.* to version 3.0.3 #6370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bf1c05
[Dependencies] Upgrade Werkzeug from version 2.0.* to version 3.0.3 t…
gmarciani Jul 26, 2024
f528d26
[Dependencies] Upgrade connexion from version ~=2.13.0 to version ~=3.1
gmarciani Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion THIRD-PARTY-LICENSES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright 2007 Pallets
** Flask; version 2.2.5 -- https://palletsprojects.com/p/flask
Copyright 2010 Pallets
** Werkzeug; version 2.3.8 -- https://pypi.org/project/Werkzeug/
** Werkzeug; version 3.0.3 -- https://pypi.org/project/Werkzeug/
Copyright 2007 Pallets

Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 2 additions & 2 deletions cli/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ aws-cdk.core~=1.164
aws_cdk.aws-cloudwatch~=1.164
aws_cdk.aws-lambda~=1.164
boto3>=1.16.14
connexion~=2.13.0
connexion~=3.1
flask>=2.2.5,<2.3
jinja2~=3.0
jmespath~=0.10
jsii==1.85.0
marshmallow~=3.10
PyYAML>=5.3.1,!=5.4
tabulate>=0.8.8,<=0.8.10
werkzeug~=2.0
werkzeug==3.0.3
4 changes: 2 additions & 2 deletions cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ def readme():
"aws-cdk.aws-ssm~=" + CDK_VERSION,
"aws-cdk.aws-sqs~=" + CDK_VERSION,
"aws-cdk.aws-cloudformation~=" + CDK_VERSION,
"werkzeug~=2.0",
"connexion~=2.13.0",
"werkzeug==3.0.3",
"connexion~=3.1",
"flask>=2.2.5,<2.3",
"jmespath~=0.10",
"jsii==1.85.0",
Expand Down
14 changes: 7 additions & 7 deletions cli/src/pcluster/api/awslambda/serverless_wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from werkzeug.datastructures import Headers, MultiDict, iter_multi_items
from werkzeug.http import HTTP_STATUS_CODES
from werkzeug.urls import url_encode, url_unquote, url_unquote_plus
from urllib.parse import urlencode, unquote, unquote_plus
from werkzeug.wrappers import Response

# List of MIME types that should not be base64 encoded. MIME types within `text/*`
Expand Down Expand Up @@ -95,8 +95,8 @@ def encode_query_string(event):
if not params:
params = ""
if is_alb_event(event):
params = MultiDict((url_unquote_plus(k), url_unquote_plus(v)) for k, v in iter_multi_items(params))
return url_encode(params)
params = MultiDict((unquote_plus(k), unquote_plus(v)) for k, v in iter_multi_items(params))
return urlencode(params)


def get_script_name(headers, request_context):
Expand Down Expand Up @@ -203,7 +203,7 @@ def handle_payload_v1(app, event, context):
environ = {
"CONTENT_LENGTH": str(len(body)),
"CONTENT_TYPE": headers.get("Content-Type", ""),
"PATH_INFO": url_unquote(path_info),
"PATH_INFO": unquote(path_info),
"QUERY_STRING": encode_query_string(event),
"REMOTE_ADDR": event.get("requestContext", {}).get("identity", {}).get("sourceIp", ""),
"REMOTE_USER": event.get("requestContext", {}).get("authorizer", {}).get("principalId", ""),
Expand Down Expand Up @@ -247,7 +247,7 @@ def handle_payload_v2(app, event, context):
environ = {
"CONTENT_LENGTH": str(len(body)),
"CONTENT_TYPE": headers.get("Content-Type", ""),
"PATH_INFO": url_unquote(path_info),
"PATH_INFO": unquote(path_info),
"QUERY_STRING": event.get("rawQueryString", ""),
"REMOTE_ADDR": event.get("requestContext", {}).get("http", {}).get("sourceIp", ""),
"REMOTE_USER": event.get("requestContext", {}).get("authorizer", {}).get("principalId", ""),
Expand Down Expand Up @@ -295,8 +295,8 @@ def handle_lambda_integration(app, event, context):
environ = {
"CONTENT_LENGTH": str(len(body)),
"CONTENT_TYPE": headers.get("Content-Type", ""),
"PATH_INFO": url_unquote(path_info),
"QUERY_STRING": url_encode(event.get("query", {})),
"PATH_INFO": unquote(path_info),
"QUERY_STRING": urlencode(event.get("query", {})),
"REMOTE_ADDR": event.get("identity", {}).get("sourceIp", ""),
"REMOTE_USER": event.get("principalId", ""),
"REQUEST_METHOD": event.get("method", ""),
Expand Down
Loading