🔧 Merge policy changes into template. (#1395)

✨ update CHANGELOG.md
⬆️ increment version 0.60.2 -> 0.61.0

Co-authored-by: shane <shane.cousins@kiconiaworks.com>

Author: monkut

CHANGELOG.md

@@ -1,5 +1,42 @@
 # Zappa Changelog
 
+## 0.61.0
+
+* Add API Gateway v2 (HTTP API) support (#1391, #851, #1389)
+* Add Lambda function URL support (#1183, #1121)
+* Add `settings` command for generating zappa_settings.json via CLI/ENVARS (#1385, #988)
+* Add Lambda invocation --qualifier and --client-context options for invoke and manage commands (#1394, #1368)
+* Fix cloudwatch logging - restore root log level functionality (#1347, #1336)
+* Update Lambda function URL permissions to include InvokeFunction action (#1393)
+* Remove kappa dependency, internalize components (#1386, #954)
+* Remove deprecated pkg_resources usage, migrate to importlib (#1384)
+* Migrate from os.path to pathlib.Path (#1384, #1386)
+* Replace deprecated datetime.utcnow() with datetime.now(timezone.utc) (#1384)
+* Replace deprecated click.BaseCommand with click.Command (#1384)
+* Move IAM policies to external JSON files for better maintainability (#1391)
+
+## 0.60.2
+
+* Fix infinite redirects issue (#1382, #1380)
+* Add arm64 architecture support (#1379)
+
+## 0.60.1
+
+* Fix conflict in V2 Event handling (#1377, #1182)
+
+## 0.60.0
+
+* Add Python 3.13 support (#1364)
+* Add Lambda SnapStart support (#1367)
+* Remove deprecated Python 3.8 runtime support (#1374)
+* Fix incorrect error messaging in CLI (#1314)
+* Remove usage of copytree from distutils (#1352)
+* Fix create_handler_venv win32 case where stderror_result is None (#1353)
+* Replace invalid website links with GitHub links (#1371)
+* Add note about character limit of function path in events (#1189)
+* Add note about AWS Lambda Test Console available commands (#1375)
+* Resolve warnings in regex library (#1376)
+
 ## 0.59.0
 
 See [release notes](https://github.com/zappa/Zappa/releases/tag/0.59.0)

zappa/__init__.py

@@ -31,4 +31,4 @@ def running_in_docker() -> bool:
     )
     raise RuntimeError(err_msg)
 
-__version__ = "0.60.2"
+__version__ = "0.61.0"

zappa/core.py

@@ -63,112 +63,6 @@
 attach_policy_filepath = POLICIES_DIRECTORY / "attach_policy.json"
 assert attach_policy_filepath.exists(), f"Missing policy file: {attach_policy_filepath}"
 ATTACH_POLICY = attach_policy_filepath.read_text()
-ASSUME_POLICY = """{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Sid": "",
-      "Effect": "Allow",
-      "Principal": {
-        "Service": [
-          "apigateway.amazonaws.com",
-          "lambda.amazonaws.com",
-          "events.amazonaws.com"
-        ]
-      },
-      "Action": "sts:AssumeRole"
-    }
-  ]
-}"""
-
-ATTACH_POLICY = """{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Effect": "Allow",
-            "Action": [
-                "logs:*"
-            ],
-            "Resource": "arn:aws:logs:*:*:*"
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "lambda:InvokeFunction",
-                "lambda:InvokeFunctionUrl"
-            ],
-            "Resource": [
-                "*"
-            ]
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "xray:PutTraceSegments",
-                "xray:PutTelemetryRecords"
-            ],
-            "Resource": [
-                "*"
-            ]
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "ec2:AttachNetworkInterface",
-                "ec2:CreateNetworkInterface",
-                "ec2:DeleteNetworkInterface",
-                "ec2:DescribeInstances",
-                "ec2:DescribeNetworkInterfaces",
-                "ec2:DetachNetworkInterface",
-                "ec2:ModifyNetworkInterfaceAttribute",
-                "ec2:ResetNetworkInterfaceAttribute"
-            ],
-            "Resource": "*"
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "s3:*"
-            ],
-            "Resource": "arn:aws:s3:::*"
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "kinesis:*"
-            ],
-            "Resource": "arn:aws:kinesis:*:*:*"
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "sns:*"
-            ],
-            "Resource": "arn:aws:sns:*:*:*"
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "sqs:*"
-            ],
-            "Resource": "arn:aws:sqs:*:*:*"
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "dynamodb:*"
-            ],
-            "Resource": "arn:aws:dynamodb:*:*:*"
-        },
-        {
-            "Effect": "Allow",
-            "Action": [
-                "route53:*"
-            ],
-            "Resource": "*"
-        }
-    ]
-}"""
 
 FUNCTION_URL_PUBLIC_PERMISSION_RULES = (
     ("FunctionURLAllowPublicAccess", "lambda:InvokeFunctionUrl", True),

zappa/policies/attach_policy.json

@@ -11,7 +11,8 @@
         {
             "Effect": "Allow",
             "Action": [
-                "lambda:InvokeFunction"
+                "lambda:InvokeFunction",
+                "lambda:InvokeFunctionUrl"
             ],
             "Resource": [
                 "*"