Merge branch 'topic/Fix-log-policy-lambda-functions' into 'master'

rowan-walshe · rowan-walshe · commit 16cd99d5dcf4 · 2025-12-16T09:32:51.000Z
Fix log policy for lambda functions

See merge request it/e3-aws!103
diff --git a/src/e3/aws/troposphere/awslambda/__init__.py b/src/e3/aws/troposphere/awslambda/__init__.py
@@ -480,6 +480,7 @@ def lambda_resources(
             log_group = logs.LogGroup(
                 name_to_id(f"{self.name}LogGroup"),
                 DeletionPolicy="Retain",
+                UpdateReplacePolicy="Retain",
                 LogGroupName=f"/aws/lambda/{self.name}",
                 RetentionInDays=self.logs_retention_in_days,
             )
diff --git a/tests/tests_e3_aws/troposphere/awslambda/awslambda_test.py b/tests/tests_e3_aws/troposphere/awslambda/awslambda_test.py
@@ -124,6 +124,7 @@
                 "RetentionInDays": 731,
             },
             "Type": "AWS::Logs::LogGroup",
+            "UpdateReplacePolicy": "Retain",
         },
     }
 }
@@ -165,6 +166,7 @@
                 "RetentionInDays": 7,
             },
             "Type": "AWS::Logs::LogGroup",
+            "UpdateReplacePolicy": "Retain",
         },
         "MypylambdaProd": {
             "Properties": {
@@ -253,6 +255,7 @@
                 "RetentionInDays": 7,
             },
             "Type": "AWS::Logs::LogGroup",
+            "UpdateReplacePolicy": "Retain",
         },
         "PyFunctionDLQ": {
             "Properties": {
@@ -310,6 +313,7 @@
                 "RetentionInDays": 7,
             },
             "Type": "AWS::Logs::LogGroup",
+            "UpdateReplacePolicy": "Retain",
         },
     }
 }
diff --git a/tests/tests_e3_aws/troposphere/cfn_project_test_pyfunction.out b/tests/tests_e3_aws/troposphere/cfn_project_test_pyfunction.out
@@ -31,4 +31,5 @@ Resources:
       LogGroupName: /aws/lambda/mypylambda
       RetentionInDays: 731
     Type: AWS::Logs::LogGroup
+    UpdateReplacePolicy: Retain
 
diff --git a/tests/tests_e3_aws/troposphere/cfn_project_test_show_assets.out b/tests/tests_e3_aws/troposphere/cfn_project_test_show_assets.out
@@ -34,4 +34,5 @@ Resources:
       LogGroupName: /aws/lambda/mypylambda
       RetentionInDays: 731
     Type: AWS::Logs::LogGroup
+    UpdateReplacePolicy: Retain
 
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution.json b/tests/tests_e3_aws/troposphere/s3websitedistribution.json
@@ -307,6 +307,7 @@
     },
     "TestS3wDistCacheInvalidationLambdaLogGroup": {
         "DeletionPolicy": "Retain",
+        "UpdateReplacePolicy": "Retain",
         "Properties": {
             "LogGroupName": "/aws/lambda/TestS3wDistCacheInvalidationLambda",
             "RetentionInDays": 731
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_bucket.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_bucket.json
@@ -112,7 +112,8 @@
             "RetentionInDays": 731
         },
         "Type": "AWS::Logs::LogGroup",
-        "DeletionPolicy": "Retain"
+        "DeletionPolicy": "Retain",
+        "UpdateReplacePolicy": "Retain"
     },
     "TestS3wDistCacheInvalidationLambda": {
         "Properties": {
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_iam_path.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_iam_path.json
@@ -307,6 +307,7 @@
     },
     "TestS3wDistCacheInvalidationLambdaLogGroup": {
         "DeletionPolicy": "Retain",
+        "UpdateReplacePolicy": "Retain",
         "Properties": {
             "LogGroupName": "/aws/lambda/TestS3wDistCacheInvalidationLambda",
             "RetentionInDays": 731
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_logging.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_logging.json
@@ -317,6 +317,7 @@
     },
     "TestS3wDistCacheInvalidationLambdaLogGroup": {
         "DeletionPolicy": "Retain",
+        "UpdateReplacePolicy": "Retain",
         "Properties": {
             "LogGroupName": "/aws/lambda/TestS3wDistCacheInvalidationLambda",
             "RetentionInDays": 731
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_logging_default.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_logging_default.json
@@ -317,6 +317,7 @@
     },
     "TestS3wDistCacheInvalidationLambdaLogGroup": {
         "DeletionPolicy": "Retain",
+        "UpdateReplacePolicy": "Retain",
         "Properties": {
             "LogGroupName": "/aws/lambda/TestS3wDistCacheInvalidationLambda",
             "RetentionInDays": 731
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_py313.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_py313.json
@@ -307,6 +307,7 @@
     },
     "TestS3wDistCacheInvalidationLambdaLogGroup": {
         "DeletionPolicy": "Retain",
+        "UpdateReplacePolicy": "Retain",
         "Properties": {
             "LogGroupName": "/aws/lambda/TestS3wDistCacheInvalidationLambda",
             "RetentionInDays": 731
diff --git a/tests/tests_e3_aws/troposphere/secretsmanager/secret_rotation_schedule.json b/tests/tests_e3_aws/troposphere/secretsmanager/secret_rotation_schedule.json
@@ -54,7 +54,8 @@
             "RetentionInDays": 731
         },
         "Type": "AWS::Logs::LogGroup",
-        "DeletionPolicy": "Retain"
+        "DeletionPolicy": "Retain",
+        "UpdateReplacePolicy": "Retain"
     },
     "Myrotationlambdapermission": {
         "Properties": {

Original file line number	Diff line number	Diff line change
`@@ -480,6 +480,7 @@ def lambda_resources(`
`480`	`480`	`log_group = logs.LogGroup(`
`481`	`481`	`name_to_id(f"{self.name}LogGroup"),`
`482`	`482`	`DeletionPolicy="Retain",`
	`483`	`+ UpdateReplacePolicy="Retain",`
`483`	`484`	`LogGroupName=f"/aws/lambda/{self.name}",`
`484`	`485`	`RetentionInDays=self.logs_retention_in_days,`
`485`	`486`	`)`