feat: upgrade terraform hashicorp/aws provider to 4.0

gorilla-co · Jun 5, 2023 · 69bc668 · 69bc668
1 parent 3c75089
commit 69bc668
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }

diff --git a/terraform/modules/s3pypi/basic_auth/main.tf b/terraform/modules/s3pypi/basic_auth/main.tf
@@ -1,3 +1,12 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
+}
+
 variable "domain" {
   type        = string
   description = "Domain name"

diff --git a/terraform/modules/s3pypi/main.tf b/terraform/modules/s3pypi/main.tf
@@ -1,3 +1,15 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+      configuration_aliases = [
+        aws.us_east_1,
+      ]
+    }
+  }
+}
+
 variable "bucket" {
   type        = string
   description = "S3 bucket name"
@@ -30,10 +42,6 @@ locals {
   hosted_zone = replace(var.domain, "/^[^.]+\\./", "")
 }
 
-provider "aws" {
-  alias = "us_east_1"
-}
-
 data "aws_acm_certificate" "viewer" {
   provider = aws.us_east_1
   domain   = var.use_wildcard_certificate ? "*.${local.hosted_zone}" : var.domain
@@ -129,7 +137,6 @@ resource "aws_cloudfront_origin_access_identity" "oai" {}
 
 resource "aws_s3_bucket" "pypi" {
   bucket = var.bucket
-  acl    = "private"
 }
 
 resource "aws_s3_bucket_policy" "s3_policy" {