Merge pull request #232 from RomaricKanyamibwa/master

RomaricKanyamibwa · web-flow · commit c198ed09b245 · 2024-01-17T09:49:00.000+01:00
Add Retain as deletion policy for buckets
diff --git a/src/e3/aws/troposphere/s3/bucket.py b/src/e3/aws/troposphere/s3/bucket.py
@@ -277,7 +277,7 @@ def resources(self, stack: Stack) -> list[AWSObject]:
         notification_config, notification_resources = self.notification_setup
         optional_resources.extend(notification_resources)
 
-        attr = {}
+        attr = {"DeletionPolicy": "Retain"}
         for key, val in {
             "BucketName": self.name,
             "BucketEncryption": bucket_encryption,
diff --git a/tests/tests_e3_aws/troposphere/config/config_test.py b/tests/tests_e3_aws/troposphere/config/config_test.py
@@ -131,6 +131,7 @@
         "DependsOn": "AWSServiceRoleForConfig",
     },
     "ConfigTestBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "config-test-bucket",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/s3/bucket-with-roles-trusted-accounts.json b/tests/tests_e3_aws/troposphere/s3/bucket-with-roles-trusted-accounts.json
@@ -1,5 +1,6 @@
 {
     "TestBucketWithRoles": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "test-bucket-with-roles",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/s3/bucket-with-roles.json b/tests/tests_e3_aws/troposphere/s3/bucket-with-roles.json
@@ -1,5 +1,6 @@
 {
     "TestBucketWithRoles": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "test-bucket-with-roles",
             "BucketEncryption": {
@@ -192,4 +193,4 @@
         },
         "Type": "AWS::IAM::Role"
     }
-}
+}
diff --git a/tests/tests_e3_aws/troposphere/s3/bucket.json b/tests/tests_e3_aws/troposphere/s3/bucket.json
@@ -29,6 +29,7 @@
         "Type": "AWS::Lambda::Function"
     },
     "TestBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "test-bucket",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/s3/bucket_multi_encryption.json b/tests/tests_e3_aws/troposphere/s3/bucket_multi_encryption.json
@@ -1,5 +1,6 @@
 {
     "TestBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "test-bucket",
             "PublicAccessBlockConfiguration": {
@@ -69,4 +70,4 @@
         },
         "Type": "AWS::S3::BucketPolicy"
     }
-}
+}
diff --git a/tests/tests_e3_aws/troposphere/s3/bucket_notification_string_arns.json b/tests/tests_e3_aws/troposphere/s3/bucket_notification_string_arns.json
@@ -1,5 +1,6 @@
 {
     "TestBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "test-bucket",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution.json b/tests/tests_e3_aws/troposphere/s3websitedistribution.json
@@ -1,5 +1,6 @@
 {
     "HostBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "host-bucket",
             "BucketEncryption": {
@@ -374,4 +375,4 @@
         },
         "Type": "AWS::Route53::RecordSet"
     }
-}
+}
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_bucket.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_bucket.json
@@ -1,5 +1,6 @@
 {
     "HostBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "host-bucket",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_iam_path.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_iam_path.json
@@ -1,5 +1,6 @@
 {
     "HostBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "host-bucket",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_logging.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_logging.json
@@ -1,5 +1,6 @@
 {
     "HostBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "host-bucket",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/s3websitedistribution_logging_default.json b/tests/tests_e3_aws/troposphere/s3websitedistribution_logging_default.json
@@ -1,5 +1,6 @@
 {
     "HostBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "host-bucket",
             "BucketEncryption": {
diff --git a/tests/tests_e3_aws/troposphere/stack/stack_with_outputs.json b/tests/tests_e3_aws/troposphere/stack/stack_with_outputs.json
@@ -1,5 +1,6 @@
 {
     "MyBucket": {
+        "DeletionPolicy": "Retain",
         "Properties": {
             "BucketName": "my-bucket",
             "BucketEncryption": {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"TestBucketWithRoles": {`
	`3`	`+ "DeletionPolicy": "Retain",`
`3`	`4`	`"Properties": {`
`4`	`5`	`"BucketName": "test-bucket-with-roles",`
`5`	`6`	`"BucketEncryption": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"TestBucket": {`
	`3`	`+ "DeletionPolicy": "Retain",`
`3`	`4`	`"Properties": {`
`4`	`5`	`"BucketName": "test-bucket",`
`5`	`6`	`"PublicAccessBlockConfiguration": {`
`@@ -69,4 +70,4 @@`
`69`	`70`	`},`
`70`	`71`	`"Type": "AWS::S3::BucketPolicy"`
`71`	`72`	`}`
`72`		`-}`
	`73`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"HostBucket": {`
	`3`	`+ "DeletionPolicy": "Retain",`
`3`	`4`	`"Properties": {`
`4`	`5`	`"BucketName": "host-bucket",`
`5`	`6`	`"BucketEncryption": {`
`@@ -374,4 +375,4 @@`
`374`	`375`	`},`
`375`	`376`	`"Type": "AWS::Route53::RecordSet"`
`376`	`377`	`}`
`377`		`-}`
	`378`	`+}`