Skip to content

Commit

Permalink
Remove exceptions in I3042 and allow lambda auth uri
Browse files Browse the repository at this point in the history
  • Loading branch information
kddejong committed Sep 26, 2024
1 parent eaa0705 commit 5dda2ae
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 25 deletions.
16 changes: 0 additions & 16 deletions src/cfnlint/rules/resources/HardCodedArnProperties.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ def __init__(self):
"type": "boolean",
},
}
self.exceptions = {
"AWS::ApiGateway::Authorizer": [
["Properties", "AuthorizerUri"],
]
}

self.configure()

Expand Down Expand Up @@ -102,17 +97,6 @@ def match(self, cfn: Template) -> RuleMatches:
path = ["Resources"] + parameter_string_path[:-1]
candidate = parameter_string_path[-1]

resource_name = path[1]
_type = cfn.template.get("Resources", {}).get(resource_name, {}).get("Type")
is_exception = False
if _type in self.exceptions:
for exception in self.exceptions[_type]:
if all(x[0] == x[1] for x in zip(path[2:], exception)):
is_exception = True

if is_exception:
continue

# ruff: noqa: E501
# !Sub arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
# is valid even with aws as the account #. This handles empty string
Expand Down
8 changes: 0 additions & 8 deletions test/fixtures/templates/bad/hard_coded_arn_properties.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,3 @@ Resources:
- !Sub arn:${AWS::Partition}:sns:${AWS::Partition}:${AWS::AccountId}:TestTopic
Roles:
- !Ref SampleRole

Authorizer:
Type: AWS::ApiGateway::Authorizer
Properties:
AuthorizerUri: !Sub arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:Name/invocations
RestApiId: RestApiId
Type: REQUEST
Name: !Sub arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:Name/invocations
2 changes: 1 addition & 1 deletion test/unit/rules/resources/test_hardcodedarnproperties.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def test_file_negative_region(self):
def test_file_negative_accountid(self):
self.helper_file_negative(
"test/fixtures/templates/bad/hard_coded_arn_properties.yaml",
2,
1,
ConfigMixIn(
[],
include_experimental=True,
Expand Down

0 comments on commit 5dda2ae

Please sign in to comment.