fixed loggroup deletion policy

awslabs · Oct 2, 2019 · 92f7460 · 92f7460
1 parent d4e3590
commit 92f7460
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/cftemplates/snapshots_tool_rds_dest.json b/cftemplates/snapshots_tool_rds_dest.json
@@ -56,11 +56,6 @@
 			"AllowedValues": ["TRUE", "FALSE"],
 			"Default": "TRUE",
 			"Description": "Enable copying snapshots across accounts. Set to FALSE if your source snapshosts are not on a different account"
-		},
-		"LogGroupName": {
-			"Type": "String",
-			"Default": "lambdaDeleteOldSnapshotsRDS-dest",
-			"Description": "Name for RDS snapshot log group."
 		}
 	},
 	"Conditions": {
@@ -598,15 +593,15 @@
 				}]
 			}
 		},
-		"cwloggroupDeleteOldSnapshotsDestRDS":{
+		"cwloggrouplambdaDeleteOldDestRDS":{
 			"Type": "AWS::Logs::LogGroup",
-			"Description": "Log group for the lambdaCopySnapshotsRDS function's logs",
+			"Description": "Log group for the lambdaDeleteOldDestRDS function's logs",
 			"Condition": "DeleteOld",
 			"DependsOn": "lambdaDeleteOldDestRDS",
 			"Properties": {
 				"RetentionInDays": { "Ref": "LambdaCWLogRetention" }, 
 				"LogGroupName": { 
-					"Fn::Sub": [ "/aws/lambda/${func}", { "func": {	"Ref" : "LogGroupName" } } ]
+					"Fn::Sub": [ "/aws/lambda/${func}", { "func": {	"Ref" : "lambdaDeleteOldDestRDS" } } ]
 				}
 			}
 		},

diff --git a/cftemplates/snapshots_tool_rds_source.json b/cftemplates/snapshots_tool_rds_source.json
@@ -68,11 +68,6 @@
 			"Default": "FALSE",
 			"Description": "Set to TRUE to filter instances that have tag CopyDBSnapshot set to True. Set to FALSE to disable",
 			"AllowedValues": ["TRUE", "FALSE"]
-		},
-		"LogGroupName": {
-			"Type": "String",
-			"Default": "lambdaDeleteOldSnapshotsRDS-source",
-			"Description": "Name for RDS snapshot log group."
 		}
 	},
 	"Conditions": {
@@ -742,10 +737,11 @@
 		"cwloggrouplambdaDeleteOldSnapshotsRDS":{
 			"Type": "AWS::Logs::LogGroup",
 			"Description": "Log group for the lambdaDeleteOldSnapshotsRDS function's logs",
+			"DependsOn": "lambdaDeleteOldSnapshotsRDS",
 			"Properties": {
 				"RetentionInDays": { "Ref": "LambdaCWLogRetention" },
 				"LogGroupName": { 
-					"Fn::Sub": [ "/aws/lambda/${func}", { "func": {	"Ref" : "LogGroupName" } } ]
+					"Fn::Sub": [ "/aws/lambda/${func}", { "func": {	"Ref" : "lambdaDeleteOldSnapshotsRDS" } } ]
 				}
 			}
 		}