Fixing merge conflict after rebase

main.tf

@@ -113,10 +113,13 @@ module "s3_user" {
   s3_resources = ["${join("", aws_s3_bucket.default.*.arn)}/*", join("", aws_s3_bucket.default.*.arn)]
 }
 
+<<<<<<< HEAD
 data "aws_partition" "current" {
   count = var.enabled ? 1 : 0
 }
 
+=======
+>>>>>>> fe51fe7ce1bebe6f2a3ada7fd370f2ff45d7fdfe
 # Merge user defined bucket policy with additional policies.
 # This prevents overriding the user defined policy (var.policy) as long as the `sid` values are distinct.
 # https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document#argument-reference
@@ -127,6 +130,7 @@ data "aws_iam_policy_document" "bucket_policy" {
 
   dynamic "statement" {
     for_each = var.allow_encrypted_uploads_only ? [1] : []
+<<<<<<< HEAD
 
     content {
       sid       = "DenyIncorrectEncryptionHeader"
@@ -139,6 +143,20 @@ data "aws_iam_policy_document" "bucket_policy" {
         type        = "*"
       }
 
+=======
+
+    content {
+      sid       = "DenyIncorrectEncryptionHeader"
+      effect    = "Deny"
+      actions   = ["s3:PutObject"]
+      resources = ["arn:aws:s3:::${join("", aws_s3_bucket.default.*.id)}/*"]
+
+      principals {
+        identifiers = ["*"]
+        type        = "*"
+      }
+
+>>>>>>> fe51fe7ce1bebe6f2a3ada7fd370f2ff45d7fdfe
       condition {
         test     = "StringNotEquals"
         values   = [var.sse_algorithm]