Skip to content

Commit 721fbaf

Browse files
Removing unecessary code
1 parent ddd9bd8 commit 721fbaf

File tree

7 files changed

+27
-19
lines changed

7 files changed

+27
-19
lines changed

aws_lambda_powertools/utilities/data_classes/api_gateway_proxy_event.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@ def jwt_scopes(self) -> Optional[List[str]]:
179179
jwt = self.get("jwt") or {} # not available in FunctionURL
180180
return jwt.get("scopes")
181181

182-
@property
183-
def get_lambda(self) -> Optional[Dict[str, Any]]:
184-
"""Lambda authorization context details"""
185-
return self.get("lambda")
186-
187182
@property
188183
def iam(self) -> Optional[RequestContextV2AuthorizerIam]:
189184
"""IAM authorization details used for making the request."""

aws_lambda_powertools/utilities/parser/models/apigwv2.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from datetime import datetime
22
from typing import Any, Dict, List, Optional, Type, Union
33

4-
from pydantic import BaseModel, Field
4+
from pydantic import BaseModel
55
from pydantic.networks import IPvAnyNetwork
66

77
from aws_lambda_powertools.utilities.parser.types import Literal
@@ -31,7 +31,6 @@ class RequestContextV2AuthorizerJwt(BaseModel):
3131
class RequestContextV2Authorizer(BaseModel):
3232
jwt: Optional[RequestContextV2AuthorizerJwt] = None
3333
iam: Optional[RequestContextV2AuthorizerIam] = None
34-
lambda_value: Optional[Dict[str, Any]] = Field(None, alias="lambda")
3534

3635

3736
class RequestContextV2Http(BaseModel):

tests/events/apiGatewayProxyV2LambdaAuthorizerEvent.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@
2424
"stage": "$default",
2525
"requestId": "id",
2626
"authorizer": {
27-
"lambda": {
28-
"key": "value"
27+
"jwt": {
28+
"claims": {
29+
"claim1": "value1"
30+
},
31+
"scopes": [
32+
"scope1",
33+
"scope2"
34+
]
2935
}
30-
},
36+
},
3137
"apiId": "api-id",
3238
"domainName": "id.execute-api.us-east-1.amazonaws.com",
3339
"domainPrefix": "id",
@@ -47,4 +53,4 @@
4753
},
4854
"body": "{\r\n\t\"a\": 1\r\n}",
4955
"isBase64Encoded": false
50-
}
56+
}

tests/unit/data_classes/test_api_gateway_proxy_event.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,14 @@ def test_api_gateway_proxy_v2_lambda_authorizer_event():
200200

201201
request_context = parsed_event.request_context
202202
assert request_context is not None
203-
lambda_props = request_context.authorizer.get_lambda
204-
assert lambda_props is not None
205-
assert lambda_props.get("key") == "value"
203+
jwt_claims = request_context.authorizer.jwt_claim
204+
assert jwt_claims is not None
205+
assert jwt_claims.get("claim1") == raw_event["requestContext"]["authorizer"]["jwt"]["claims"]["claim1"]
206+
207+
jwt_scopes = request_context.authorizer.jwt_scopes
208+
assert jwt_scopes is not None
209+
assert jwt_scopes[0] == raw_event["requestContext"]["authorizer"]["jwt"]["scopes"][0]
210+
assert jwt_scopes[1] == raw_event["requestContext"]["authorizer"]["jwt"]["scopes"][1]
206211

207212

208213
def test_api_gateway_proxy_v2_iam_event():

tests/unit/data_classes/test_lambda_function_url.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ def test_lambda_function_url_event_iam():
104104
assert authorizer is not None
105105
assert authorizer.jwt_claim is None
106106
assert authorizer.jwt_scopes is None
107-
assert authorizer.get_lambda is None
108107

109108
iam = authorizer.iam
110109
iam_raw = raw_event["requestContext"]["authorizer"]["iam"]

tests/unit/parser/test_apigwv2.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,14 @@ def test_api_gateway_proxy_v2_event_lambda_authorizer():
7777
request_context: RequestContextV2 = parsed_event.requestContext
7878
assert request_context is not None
7979

80-
lambda_props: RequestContextV2Authorizer = request_context.authorizer.lambda_value
81-
assert lambda_props is not None
82-
assert lambda_props["key"] == raw_event["requestContext"]["authorizer"]["lambda"]["key"]
80+
jwt_claims: RequestContextV2Authorizer = request_context.authorizer.jwt.claims
81+
assert jwt_claims is not None
82+
assert jwt_claims["claim1"] == raw_event["requestContext"]["authorizer"]["jwt"]["claims"]["claim1"]
83+
84+
jwt_scopes: RequestContextV2Authorizer = request_context.authorizer.jwt.scopes
85+
assert jwt_scopes is not None
86+
assert jwt_scopes[0] == raw_event["requestContext"]["authorizer"]["jwt"]["scopes"][0]
87+
assert jwt_scopes[1] == raw_event["requestContext"]["authorizer"]["jwt"]["scopes"][1]
8388

8489

8590
def test_api_gateway_proxy_v2_event_iam_authorizer():

tests/unit/parser/test_lambda_function_url.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ def test_lambda_function_url_event_iam():
113113
authorizer = request_context.authorizer
114114
assert authorizer is not None
115115
assert authorizer.jwt is None
116-
assert authorizer.lambda_value is None
117116

118117
iam = authorizer.iam
119118
iam_raw = raw_event["requestContext"]["authorizer"]["iam"]

0 commit comments

Comments
 (0)