Skip to content

Commit 84b6832

Browse files
authored
Merge pull request #18 from souza-dan/s3-bucket-rule
DEV-15177 - ignore changes to rules within the bucket resource
2 parents 3728435 + 3f77897 commit 84b6832

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Tamr S3 Module Repo
22

3+
## v1.3.2 - August 9th 2022
4+
* Fixes a bug where two resources were controlling server side encryption
5+
36
## v1.3.1 - August 4th 2022
47
* Adjusts AWS provider constraints to allow newer versions
58

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.1
1+
1.3.2

examples/iam-policy-submodule/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ data "aws_s3_bucket" "existing-bucket" {
44
}
55

66
module "existing-bucket-iam-0" {
7-
# source = "git::https://github.com/Datatamer/terraform-aws-s3.git//modules/bucket-iam-policy?ref=1.2.1"
7+
# source = "git::https://github.com/Datatamer/terraform-aws-s3.git//modules/bucket-iam-policy?ref=1.3.2"
88
source = "../../modules/bucket-iam-policy"
99
bucket_name = data.aws_s3_bucket.existing-bucket.id
1010
read_write_paths = ["some/read-write-folder"]
1111
tags = var.tags
1212
}
1313

1414
module "existing-bucket-iam-1" {
15-
# source = "git::https://github.com/Datatamer/terraform-aws-s3.git//modules/bucket-iam-policy?ref=1.2.1"
15+
# source = "git::https://github.com/Datatamer/terraform-aws-s3.git//modules/bucket-iam-policy?ref=1.3.2"
1616
source = "../../modules/bucket-iam-policy"
1717
bucket_name = data.aws_s3_bucket.existing-bucket.id
1818
read_write_paths = ["another/read-write-folder"]

examples/minimal/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "minimal" {
2-
# source = "git::https://github.com/Datatamer/terraform-aws-s3?ref=1.2.1"
2+
# source = "git::https://github.com/Datatamer/terraform-aws-s3?ref=1.3.2"
33
source = "../../"
44
bucket_name = var.test_bucket_name
55
read_only_paths = var.read_only_paths # ["path/to/ro-folder"]

modules/encrypted-bucket/main.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ resource "aws_s3_bucket" "new_bucket" {
55

66
force_destroy = var.force_destroy
77
tags = var.tags
8+
9+
# Managed by resource below
10+
lifecycle {
11+
ignore_changes = [
12+
server_side_encryption_configuration,
13+
]
14+
}
815
}
916

1017
resource "aws_s3_bucket_server_side_encryption_configuration" "encryption_for_new_bucket" {

0 commit comments

Comments
 (0)