Merge pull request #236 from adanaja/morosi-fix2

adanaja · web-flow · commit 319d4fd14887 · 2024-01-12T10:42:27.000+01:00
Fix InvokeFunction permission for ANY method
diff --git a/src/e3/aws/troposphere/apigateway/__init__.py b/src/e3/aws/troposphere/apigateway/__init__.py
@@ -963,7 +963,7 @@ def _declare_method(
                         f"${{api}}/{config.name}/${{method}}/{resource_path}",
                         dict_values={
                             "api": self.ref,
-                            "method": method.method,
+                            "method": "*" if method.method == "ANY" else method.method,
                         },
                     ),
                 )
diff --git a/tests/tests_e3_aws/troposphere/apigateway/apigateway_test.py b/tests/tests_e3_aws/troposphere/apigateway/apigateway_test.py
@@ -736,7 +736,7 @@ def test_rest_api_nested_resources(stack: Stack, lambda_fun: PyFunction) -> None
                 # Specific lambda for this resource
                 lambda_arn=products_lambda.ref,
                 method_list=[Method("ANY")],
-                resource_list=[Resource(path="abcd", method_list=[Method("ANY")])],
+                resource_list=[Resource(path="abcd", method_list=[Method("GET")])],
             ),
         ],
     )
diff --git a/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test.json b/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test.json
@@ -130,7 +130,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
diff --git a/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_custom_domain.json b/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_custom_domain.json
@@ -159,7 +159,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
diff --git a/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_custom_domain_stages.json b/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_custom_domain_stages.json
@@ -205,7 +205,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
@@ -226,7 +226,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
diff --git a/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_lambda_alias.json b/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_lambda_alias.json
@@ -170,7 +170,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
@@ -191,7 +191,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
diff --git a/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_nested_resources.json b/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_nested_resources.json
@@ -84,7 +84,7 @@
         "DependsOn": [
             "TestapiAccountsANYMethod",
             "TestapiProductsANYMethod",
-            "TestapiProductsAbcdANYMethod"
+            "TestapiProductsAbcdGETMethod"
         ]
     },
     "TestapiDefaultStage": {
@@ -178,13 +178,13 @@
         },
         "Type": "AWS::ApiGateway::Method"
     },
-    "TestapiProductsAbcdANYMethod": {
+    "TestapiProductsAbcdGETMethod": {
         "Properties": {
             "RestApiId": {
                 "Ref": "Testapi"
             },
             "AuthorizationType": "NONE",
-            "HttpMethod": "ANY",
+            "HttpMethod": "GET",
             "Integration": {
                 "CacheKeyParameters": [],
                 "CacheNamespace": "none",
@@ -222,7 +222,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
@@ -243,14 +243,14 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
         },
         "Type": "AWS::Lambda::Permission"
     },
-    "TestapiProductsAbcdANYDefaultLambdaPermission": {
+    "TestapiProductsAbcdGETDefaultLambdaPermission": {
         "Properties": {
             "Action": "lambda:InvokeFunction",
             "FunctionName": {
@@ -264,7 +264,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "GET"
                     }
                 ]
             }
diff --git a/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_stages.json b/tests/tests_e3_aws/troposphere/apigateway/apigatewayv1_test_stages.json
@@ -176,7 +176,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }
@@ -197,7 +197,7 @@
                         "api": {
                             "Ref": "Testapi"
                         },
-                        "method": "ANY"
+                        "method": "*"
                     }
                 ]
             }

Original file line number	Diff line number	Diff line change
`@@ -963,7 +963,7 @@ def _declare_method(`
`963`	`963`	`f"${{api}}/{config.name}/${{method}}/{resource_path}",`
`964`	`964`	`dict_values={`
`965`	`965`	`"api": self.ref,`
`966`		`- "method": method.method,`
	`966`	`+ "method": "*" if method.method == "ANY" else method.method,`
`967`	`967`	`},`
`968`	`968`	`),`
`969`	`969`	`)`
Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ def test_rest_api_nested_resources(stack: Stack, lambda_fun: PyFunction) -> None`
`736`	`736`	`# Specific lambda for this resource`
`737`	`737`	`lambda_arn=products_lambda.ref,`
`738`	`738`	`method_list=[Method("ANY")],`
`739`		`- resource_list=[Resource(path="abcd", method_list=[Method("ANY")])],`
	`739`	`+ resource_list=[Resource(path="abcd", method_list=[Method("GET")])],`
`740`	`740`	`),`
`741`	`741`	`],`
`742`	`742`	`)`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@`
`130`	`130`	`"api": {`
`131`	`131`	`"Ref": "Testapi"`
`132`	`132`	`},`
`133`		`- "method": "ANY"`
	`133`	`+ "method": "*"`
`134`	`134`	`}`
`135`	`135`	`]`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@`
`159`	`159`	`"api": {`
`160`	`160`	`"Ref": "Testapi"`
`161`	`161`	`},`
`162`		`- "method": "ANY"`
	`162`	`+ "method": "*"`
`163`	`163`	`}`
`164`	`164`	`]`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@`
`205`	`205`	`"api": {`
`206`	`206`	`"Ref": "Testapi"`
`207`	`207`	`},`
`208`		`- "method": "ANY"`
	`208`	`+ "method": "*"`
`209`	`209`	`}`
`210`	`210`	`]`
`211`	`211`	`}`
`@@ -226,7 +226,7 @@`
`226`	`226`	`"api": {`
`227`	`227`	`"Ref": "Testapi"`
`228`	`228`	`},`
`229`		`- "method": "ANY"`
	`229`	`+ "method": "*"`
`230`	`230`	`}`
`231`	`231`	`]`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@`
`170`	`170`	`"api": {`
`171`	`171`	`"Ref": "Testapi"`
`172`	`172`	`},`
`173`		`- "method": "ANY"`
	`173`	`+ "method": "*"`
`174`	`174`	`}`
`175`	`175`	`]`
`176`	`176`	`}`
`@@ -191,7 +191,7 @@`
`191`	`191`	`"api": {`
`192`	`192`	`"Ref": "Testapi"`
`193`	`193`	`},`
`194`		`- "method": "ANY"`
	`194`	`+ "method": "*"`
`195`	`195`	`}`
`196`	`196`	`]`
`197`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@`
`176`	`176`	`"api": {`
`177`	`177`	`"Ref": "Testapi"`
`178`	`178`	`},`
`179`		`- "method": "ANY"`
	`179`	`+ "method": "*"`
`180`	`180`	`}`
`181`	`181`	`]`
`182`	`182`	`}`
`@@ -197,7 +197,7 @@`
`197`	`197`	`"api": {`
`198`	`198`	`"Ref": "Testapi"`
`199`	`199`	`},`
`200`		`- "method": "ANY"`
	`200`	`+ "method": "*"`
`201`	`201`	`}`
`202`	`202`	`]`
`203`	`203`	`}`