Merge pull request #19 from opzkit/aws-provider-4.x

feat: update to AWS-provider 4.x
opzkit · Mar 20, 2022 · 3435e95 · 3435e95
2 parents fa113f8 + 5e5a263
commit 3435e95
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 6 deletions.
diff --git a/examples/additional_nodes/main.tf b/examples/additional_nodes/main.tf
@@ -26,5 +26,9 @@ module "k8s" {
 
 resource "aws_s3_bucket" "state-store" {
   bucket = "state-store"
+}
+
+resource "aws_s3_bucket_acl" "state-store" {
+  bucket = aws_s3_bucket.state-store.id
   acl    = "public-read"
 }
diff --git a/examples/additional_nodes/provider.tf b/examples/additional_nodes/provider.tf
@@ -21,7 +21,7 @@ terraform {
 
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -16,5 +16,10 @@ module "k8s" {
 
 resource "aws_s3_bucket" "state-store" {
   bucket = "state-store"
+}
+
+resource "aws_s3_bucket_acl" "state-store" {
+  bucket = aws_s3_bucket.state-store.id
   acl    = "public-read"
 }
+
diff --git a/examples/basic/provider.tf b/examples/basic/provider.tf
@@ -21,7 +21,7 @@ terraform {
 
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }
diff --git a/examples/policies/main.tf b/examples/policies/main.tf
@@ -16,6 +16,10 @@ module "k8s" {
 
 resource "aws_s3_bucket" "state-store" {
   bucket = "state-store"
+}
+
+resource "aws_s3_bucket_acl" "state-store" {
+  bucket = aws_s3_bucket.state-store.id
   acl    = "public-read"
 }
 

diff --git a/examples/policies/provider.tf b/examples/policies/provider.tf
@@ -21,7 +21,7 @@ terraform {
 
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
   }
 }
diff --git a/k8s.tf b/k8s.tf
@@ -1,4 +1,4 @@
-resource "aws_s3_bucket_object" "extra_addons" {
+resource "aws_s3_object" "extra_addons" {
   for_each = { for a in local.addons : a.name => a }
   bucket   = var.bucket_state_store.id
   key      = "${var.name}-addons/${each.value.name}/v${each.value.version}.yaml"
@@ -8,7 +8,7 @@ resource "aws_s3_bucket_object" "extra_addons" {
   metadata = {}
 }
 
-resource "aws_s3_bucket_object" "addons" {
+resource "aws_s3_object" "addons" {
   bucket   = var.bucket_state_store.id
   key      = "${var.name}-addons/addon.yaml"
   content  = local.addons_yaml

diff --git a/providers.tf b/providers.tf
@@ -1,5 +1,9 @@
 terraform {
   required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
     kops = {
       source  = "eddycharly/kops"
       version = "~>1.21.0"

diff --git a/s3.tf b/s3.tf
@@ -1,6 +1,11 @@
 resource "aws_s3_bucket" "issuer" {
   count         = var.aws_oidc_provider ? 1 : 0
   bucket        = "${replace(var.name, ".", "-")}-irsa-issuer"
-  acl           = "public-read"
   force_destroy = true
 }
+
+resource "aws_s3_bucket_acl" "issuer" {
+  count  = var.aws_oidc_provider ? 1 : 0
+  bucket = aws_s3_bucket.issuer[count.index].id
+  acl    = "public-read"
+}