Skip to content

updated the lambda permission with the correct case #1319

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

Merged
merged 6 commits into from
Dec 26, 2019
Merged

updated the lambda permission with the correct case #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce81f48
updated the lambda permission with the correct case
Dec 12, 2019
a6b9142
updated lambda:invokeFunction to lambda:InvokeFunction
Dec 16, 2019
4bf5461
updated the lambda permission with the correct case
Dec 12, 2019
86dc639
updated lambda:invokeFunction to lambda:InvokeFunction
Dec 16, 2019
5b2f2a5
merge with develop and update failing tests
Dec 24, 2019
edcf817
merge
Dec 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion samtranslator/model/api/api_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ def _get_permission(self, authorizer_name, authorizer_lambda_function_arn):

lambda_permission = LambdaPermission(self.logical_id + authorizer_name + 'AuthorizerPermission',
attributes=self.passthrough_resource_attributes)
lambda_permission.Action = 'lambda:invokeFunction'
lambda_permission.Action = 'lambda:InvokeFunction'
lambda_permission.FunctionName = authorizer_lambda_function_arn
lambda_permission.Principal = 'apigateway.amazonaws.com'
lambda_permission.SourceArn = source_arn
Expand Down
2 changes: 1 addition & 1 deletion samtranslator/model/eventsources/push.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def _construct_permission(
except NotImplementedError:
function_name_or_arn = function.get_runtime_attr("arn")

lambda_permission.Action = 'lambda:invokeFunction'
lambda_permission.Action = 'lambda:InvokeFunction'
lambda_permission.FunctionName = function_name_or_arn
lambda_permission.Principal = self.principal
lambda_permission.SourceArn = source_arn
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/input/error_existing_permission_logical_id.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Resources:
AlexaSkillFuncAlexaSkillEventPermission:
Type: AWS::Lambda::Permission
Properties:
Action: lambda:invokeFunction
Action: lambda:InvokeFunction
FunctionName:
Ref: AlexaSkillFunc
Principal: alexa-appkit.amazon.com
Expand Down
4 changes: 2 additions & 2 deletions tests/translator/output/alexa_skill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"AlexaSkillFuncAlexaSkillEventPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"FunctionName": {
"Ref": "AlexaSkillFunc"
},
Expand Down Expand Up @@ -69,4 +69,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/translator/output/alexa_skill_with_skill_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"AlexaSkillFuncAlexaSkillEventPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"FunctionName": {
"Ref": "AlexaSkillFunc"
},
Expand Down Expand Up @@ -70,4 +70,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/translator/output/api_cache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"HtmlFunctionGetHtmlPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "HtmlFunction"
Expand Down Expand Up @@ -106,4 +106,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/translator/output/api_endpoint_configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"ImplicitApiFunctionGetHtmlPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "ImplicitApiFunction"
Expand Down Expand Up @@ -181,4 +181,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/translator/output/api_request_model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"HtmlFunctionGetHtmlPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "HtmlFunction"
Expand Down Expand Up @@ -143,4 +143,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/translator/output/api_request_model_openapi_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"HtmlFunctionIamPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "HtmlFunction"
Expand Down Expand Up @@ -161,7 +161,7 @@
"HtmlFunctionGetHtmlPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "HtmlFunction"
Expand Down
2 changes: 1 addition & 1 deletion tests/translator/output/api_with_access_log_setting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"ImplicitApiFunctionGetHtmlPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "ImplicitApiFunction"
Expand Down
8 changes: 4 additions & 4 deletions tests/translator/output/api_with_apikey_default_override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"MyFunctionWithApiKeyRequiredTrueMyApiWithApiKeyRequiredTruePermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunctionWithApiKeyRequiredTrue"
Expand All @@ -36,7 +36,7 @@
"MyFunctionWithApiKeyRequiredFalseMyApiWithApiKeyRequiredFalsePermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunctionWithApiKeyRequiredFalse"
Expand Down Expand Up @@ -103,7 +103,7 @@
"MyFunctionWithApiKeyRequiredDefaultMyApiWithApiKeyRequiredDefaultPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunctionWithApiKeyRequiredDefault"
Expand Down Expand Up @@ -315,4 +315,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/translator/output/api_with_apikey_required.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"MyFunctionWithApiKeyRequiredMyApiWithApiKeyRequiredPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunctionWithApiKeyRequired"
Expand Down Expand Up @@ -137,4 +137,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/translator/output/api_with_apikey_required_openapi_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"MyFunctionWithApiKeyRequiredMyApiWithApiKeyRequiredPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunctionWithApiKeyRequired"
Expand Down Expand Up @@ -138,4 +138,4 @@
}
}
}
}
}
18 changes: 9 additions & 9 deletions tests/translator/output/api_with_auth_all_maximum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"MyFunctionWithLambdaTokenAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand All @@ -47,7 +47,7 @@
"MyApiMyLambdaRequestAuthAuthorizerPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": "arn:aws",
"SourceArn": {
Expand All @@ -65,7 +65,7 @@
"MyFunctionWithCognitoMultipleUserPoolsAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand Down Expand Up @@ -318,7 +318,7 @@
"MyApiMyLambdaTokenAuthAuthorizerPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": "arn:aws",
"SourceArn": {
Expand All @@ -336,7 +336,7 @@
"MyFunctionWithLambdaRequestAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand Down Expand Up @@ -367,7 +367,7 @@
"MyApiMyLambdaTokenAuthNoneFunctionInvokeRoleAuthorizerPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": "arn:aws",
"SourceArn": {
Expand Down Expand Up @@ -397,7 +397,7 @@
"MyFunctionWithNoAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand All @@ -418,7 +418,7 @@
"MyFunctionWithDefaultAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand All @@ -437,4 +437,4 @@
}
}
}
}
}
16 changes: 8 additions & 8 deletions tests/translator/output/api_with_auth_all_maximum_openapi_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"MyFunctionWithLambdaTokenAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand All @@ -47,7 +47,7 @@
"MyApiMyLambdaRequestAuthAuthorizerPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": "arn:aws",
"SourceArn": {
Expand All @@ -65,7 +65,7 @@
"MyFunctionWithCognitoMultipleUserPoolsAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand Down Expand Up @@ -320,7 +320,7 @@
"MyApiMyLambdaTokenAuthAuthorizerPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": "arn:aws",
"SourceArn": {
Expand All @@ -338,7 +338,7 @@
"MyFunctionWithLambdaRequestAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand All @@ -359,7 +359,7 @@
"MyApiMyLambdaTokenAuthNoneFunctionInvokeRoleAuthorizerPermission": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": "arn:aws",
"SourceArn": {
Expand All @@ -386,7 +386,7 @@
"MyFunctionWithNoAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand Down Expand Up @@ -419,7 +419,7 @@
"MyFunctionWithDefaultAuthorizerPermissionProd": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"Action": "lambda:invokeFunction",
"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"FunctionName": {
"Ref": "MyFunction"
Expand Down
Loading