Merge pull request #864 from rust-lang/update-aws-provider-and-fix-warning-in-docs-rs-terragrunt-module

marcoieni · web-flow · commit aa7f42463006 · 2025-12-19T13:07:36.000+01:00
update aws provider and fix warning in docs-rs terragrunt module
diff --git a/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl b/terragrunt/accounts/docs-rs-staging/docs-rs/.terraform.lock.hcl
diff --git a/terragrunt/modules/acm-certificate/_terraform.tf b/terragrunt/modules/acm-certificate/_terraform.tf
@@ -2,8 +2,8 @@ terraform {
   required_providers {
     aws = {
       source = "hashicorp/aws"
-      // Allow both 4.x and 5.x while we upgrade everything to 5.x.
-      version = ">= 4.20, < 6"
+      // Allow 4.x, 5.x and 6.x
+      version = ">= 4.20, < 7"
     }
   }
 }
diff --git a/terragrunt/modules/docs-rs/_terraform.tf b/terragrunt/modules/docs-rs/_terraform.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.32"
+      version = "~> 6.27"
     }
     random = {
       source  = "hashicorp/random"
diff --git a/terragrunt/modules/docs-rs/builder.tf b/terragrunt/modules/docs-rs/builder.tf
@@ -49,6 +49,7 @@ resource "aws_launch_template" "builder" {
 data "aws_ami" "builder" {
   most_recent = true
   name_regex  = "^docs-rs-builder-*"
+  owners      = ["self"]
 }
 
 // The instance profile the builder will assume when communicating with s3
diff --git a/terragrunt/modules/docs-rs/s3.tf b/terragrunt/modules/docs-rs/s3.tf
@@ -67,8 +67,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "backups" {
     }
 
     expiration {
-      days                         = 30
-      expired_object_delete_marker = false
+      days = 30
     }
 
     noncurrent_version_expiration {
diff --git a/terragrunt/modules/ecs-task/main.tf b/terragrunt/modules/ecs-task/main.tf
@@ -20,7 +20,7 @@ resource "aws_ecs_task_definition" "task" {
         logDriver = "awslogs"
         options = {
           "awslogs-group"         = aws_cloudwatch_log_group.task.name
-          "awslogs-region"        = data.aws_region.current.name
+          "awslogs-region"        = data.aws_region.current.id
           "awslogs-stream-prefix" = var.container_name
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`aws = {`
`4`	`4`	`source = "hashicorp/aws"`
`5`		`- // Allow both 4.x and 5.x while we upgrade everything to 5.x.`
`6`		`- version = ">= 4.20, < 6"`
	`5`	`+ // Allow 4.x, 5.x and 6.x`
	`6`	`+ version = ">= 4.20, < 7"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "~> 4.32"`
	`7`	`+ version = "~> 6.27"`
`8`	`8`	`}`
`9`	`9`	`random = {`
`10`	`10`	`source = "hashicorp/random"`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ resource "aws_launch_template" "builder" {`
`49`	`49`	`data "aws_ami" "builder" {`
`50`	`50`	`most_recent = true`
`51`	`51`	`name_regex = "^docs-rs-builder-*"`
	`52`	`+ owners = ["self"]`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`// The instance profile the builder will assume when communicating with s3`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "backups" {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`expiration {`
`70`		`- days = 30`
`71`		`- expired_object_delete_marker = false`
	`70`	`+ days = 30`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`noncurrent_version_expiration {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ resource "aws_ecs_task_definition" "task" {`
`20`	`20`	`logDriver = "awslogs"`
`21`	`21`	`options = {`
`22`	`22`	`"awslogs-group" = aws_cloudwatch_log_group.task.name`
`23`		`- "awslogs-region" = data.aws_region.current.name`
	`23`	`+ "awslogs-region" = data.aws_region.current.id`
`24`	`24`	`"awslogs-stream-prefix" = var.container_name`
`25`	`25`	`}`
`26`	`26`	`}`