Merge branch 'master' into chore-update-aws-3.59-terraform-provider

rust-lang · Aug 30, 2024 · 6d0cf46 · 6d0cf46
2 parents 19a1039 + 46da0db
commit 6d0cf46
Show file tree

Hide file tree

Showing 12 changed files with 139 additions and 137 deletions.
diff --git a/terraform/releases/.terraform.lock.hcl b/terraform/releases/.terraform.lock.hcl
diff --git a/terraform/releases/_terraform.tf b/terraform/releases/_terraform.tf
@@ -6,11 +6,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.58"
+      version = "~> 5.65"
     }
     external = {
       source  = "hashicorp/external"
-      version = "~> 2.3.1"
+      version = "~> 2.3.3"
     }
   }
 

diff --git a/terraform/releases/impl/main.tf b/terraform/releases/impl/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source                = "hashicorp/aws"
-      version               = "~> 5.58"
+      version               = "~> 5.65"
       configuration_aliases = [aws.east1]
     }
   }

diff --git a/terraform/shared/modules/lambda/main.tf b/terraform/shared/modules/lambda/main.tf
@@ -1,9 +1,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"
+      source  = "hashicorp/aws"
+      version = ">= 5.64"
     }
   }
 }

diff --git a/terraform/team-repo/.terraform.lock.hcl b/terraform/team-repo/.terraform.lock.hcl
diff --git a/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/resource-group/.terraform.lock.hcl
diff --git a/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westeurope/.terraform.lock.hcl
diff --git a/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl b/terragrunt/accounts/dev-desktops-prod/westus2/.terraform.lock.hcl
diff --git a/terragrunt/modules/dev-desktops-azure/_terraform.tf b/terragrunt/modules/dev-desktops-azure/_terraform.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.116.0"
+      version = "4.0.1"
     }
   }
 }