Skip to content

Commit 11ff8e9

Browse files
michemachemichemache
authored
feat!: Update S3 module to v3.6.1 and switch to resource aws_s3_object (#29)
1 parent 431e6ce commit 11ff8e9

File tree

15 files changed

+38
-27
lines changed

15 files changed

+38
-27
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
6666
| Name | Version |
6767
|------|---------|
6868
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
69-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
69+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
7070

7171
## Providers
7272

7373
| Name | Version |
7474
|------|---------|
75-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
75+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.9 |
7676

7777
## Modules
7878

‎docs/UPGRADE-5.0.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Upgrade from v4.x to v5.x
2+
3+
## Terraform State Moves
4+
The following Terraform state move commands are optional but recommended, if you want to avoid recreating the used S3 bucket.
5+
Because the resource `aws_s3_bucket_object` is deprecated and replaced by `aws_s3_bucket` with this release.
6+
7+
The associated state move command would look similar to (albeit with your correct module name):
8+
9+
```sh
10+
terraform state mv 'module.datadog_log_forwarder.aws_s3_bucket_object.this[0]' 'module.datadog_log_forwarder.aws_s3_object.this[0]'
11+
```

‎examples/complete/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ Note that this example may create resources which will incur monetary charges on
2424
| Name | Version |
2525
|------|---------|
2626
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
27-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
27+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
2828
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
2929

3030
## Providers
3131

3232
| Name | Version |
3333
|------|---------|
34-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
34+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.9 |
3535
| <a name="provider_random"></a> [random](#provider\_random) | >= 2.0 |
3636

3737
## Modules

‎examples/complete/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 4.0"
7+
version = ">= 4.9"
88
}
99
random = {
1010
source = "hashicorp/random"

‎examples/simple/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ Note that this example may create resources which will incur monetary charges on
2020
| Name | Version |
2121
|------|---------|
2222
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
23-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
23+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
2424
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
2525

2626
## Providers
2727

2828
| Name | Version |
2929
|------|---------|
30-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
30+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.9 |
3131
| <a name="provider_random"></a> [random](#provider\_random) | >= 2.0 |
3232

3333
## Modules

‎examples/simple/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 4.0"
7+
version = ">= 4.9"
88
}
99
random = {
1010
source = "hashicorp/random"

‎modules/log_forwarder/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ module "datadog_log_forwarder" {
4242
| Name | Version |
4343
|------|---------|
4444
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
45-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
45+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
4646
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
4747

4848
## Providers
4949

5050
| Name | Version |
5151
|------|---------|
52-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
52+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.9 |
5353
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
5454

5555
## Modules
5656

5757
| Name | Source | Version |
5858
|------|--------|---------|
59-
| <a name="module_this_s3_bucket"></a> [this\_s3\_bucket](#module\_this\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | v3.0.1 |
59+
| <a name="module_this_s3_bucket"></a> [this\_s3\_bucket](#module\_this\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | v3.6.1 |
6060

6161
## Resources
6262

@@ -69,7 +69,7 @@ module "datadog_log_forwarder" {
6969
| [aws_lambda_function.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
7070
| [aws_lambda_permission.cloudwatch](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_permission) | resource |
7171
| [aws_lambda_permission.s3](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_permission) | resource |
72-
| [aws_s3_bucket_object.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_object) | resource |
72+
| [aws_s3_object.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_object) | resource |
7373
| [null_resource.this](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
7474
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
7575
| [aws_iam_policy_document.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |

‎modules/log_forwarder/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ data "aws_region" "current" {}
2424

2525
module "this_s3_bucket" {
2626
source = "terraform-aws-modules/s3-bucket/aws"
27-
version = "v3.0.1"
27+
version = "v3.6.1"
2828

2929
create_bucket = var.create && var.create_bucket
3030
bucket = local.bucket_name
@@ -128,7 +128,7 @@ resource "null_resource" "this" {
128128
}
129129
}
130130

131-
resource "aws_s3_bucket_object" "this" {
131+
resource "aws_s3_object" "this" {
132132
count = var.create ? 1 : 0
133133

134134
bucket = var.create_bucket ? module.this_s3_bucket.s3_bucket_id : var.bucket_name
@@ -153,8 +153,8 @@ resource "aws_lambda_function" "this" {
153153
count = var.create ? 1 : 0
154154

155155
s3_bucket = var.create_bucket ? module.this_s3_bucket.s3_bucket_id : var.bucket_name
156-
s3_key = aws_s3_bucket_object.this[0].key
157-
s3_object_version = aws_s3_bucket_object.this[0].version_id
156+
s3_key = aws_s3_object.this[0].key
157+
s3_object_version = aws_s3_object.this[0].version_id
158158
function_name = var.name
159159
handler = "lambda_function.lambda_handler"
160160

‎modules/log_forwarder/outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ output "role_policy_name" {
5858
# Forwarder ZIP Archive
5959
output "s3_object_id" {
6060
description = "The `key` of the forwarder lambda zip archive"
61-
value = try(aws_s3_bucket_object.this[0].id, "")
61+
value = try(aws_s3_object.this[0].id, "")
6262
}
6363

6464
output "s3_object_etag" {
6565
description = "The ETag generated for the forwarder lambda zip object (an MD5 sum of the object content)"
66-
value = try(aws_s3_bucket_object.this[0].etag, "")
66+
value = try(aws_s3_object.this[0].etag, "")
6767
}
6868

6969
output "s3_object_version" {
7070
description = "A unique version ID value for the forwarder lambda zip object, if bucket versioning is enabled"
71-
value = try(aws_s3_bucket_object.this[0].version_id, "")
71+
value = try(aws_s3_object.this[0].version_id, "")
7272
}
7373

7474
# Forwarder Lambda Function

‎modules/log_forwarder/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 4.0"
7+
version = ">= 4.9"
88
}
99
null = {
1010
source = "hashicorp/null"

0 commit comments

Comments
 (0)