From c8c1c147297c97e246f4008423b3bade7d95d8f9 Mon Sep 17 00:00:00 2001 From: Jakob Diebold Date: Thu, 9 Jun 2022 13:35:04 +0200 Subject: [PATCH] feat: Enable for aws provider 4 (#82) BREAKING CHANGE: require aws-provider ~>4.0 --- .terraform.lock.hcl | 29 +++++++++++++++-------------- README.md | 15 ++++++++++----- versions.tf | 2 +- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 5b5e405..e55ab23 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,20 +2,21 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.75.1" - constraints = "~> 3.0" + version = "4.17.1" + constraints = "~> 4.0" hashes = [ - "h1:zgO9MSF32Rz6lOBumY+FyPZESYwlL5SUXOViTV5cs28=", - "zh:11c2ee541ca1da923356c9225575ba294523d7b6af82d6171c912470ef0f90cd", - "zh:19fe975993664252b4a2ff1079546f2b186b01d1a025a94a4f15c37e023806c5", - "zh:442e7fc145b2debebe9279b283d07f5f736dc1776c2e5b1702728a6eb03789d0", - "zh:7a77991b204ae2c16ac29a32226135d5fdbda40c8dafa77c5adf5439a346be77", - "zh:89a257933181c15293c15a858fbfe7252129cc57cc2ec05b6c0b595d1bfe9d38", - "zh:b1813ea5b6b0fd88ea85b1b21b8e4119566d1bc34feca297b4fb39d0536893cb", - "zh:c519f3292ae431bd2381f88a95bd37c52f7a56d91feef88511e929344c180549", - "zh:d3dbe88b661c073c174f04f73adc2720372143bdfa12f4fe8f411332e64662cf", - "zh:e92a27e3c7295b031b5d62dd9428966c96e3157fc768b3d848a9ac60d1661c8e", - "zh:ecd664c0d664fcf2d8a89a01462cb00bcae37da200305aef2de1b8fe185c9cd8", - "zh:ed6ce1f9fa96aa28dd65842f852abed25f919d20b5cf53d26cec5b3f4d845725", + "h1:Oso/TFSIASSroiCyJYKA4Dm7gPxKfcmoU4qXpkgSAm8=", + "zh:095c2ad4e42667b6e4c599f3fb7c1d0755b762983474fd3916e89867c30871a2", + "zh:0a987960f796289db7eac887d03dcde0311005cbf625499f4eea0a8882295aeb", + "zh:1fbe5f897afe3a9e5a41c2ecd1f312e79fb6745367a53f7bad11704aedb3b3e2", + "zh:52687f0753fa05a744bd37bb40bcba8ac5e0838cdcd227035b9ccb151635e5f9", + "zh:629835a96c682f4e168c12f6d3c0631409d8e6d28165a283d2fe232c4a8ba75a", + "zh:6fa6e6fbdc0b0377d750a7960768e22f71d8bd97d30e289b823a3923eb92fce7", + "zh:8dfef513861a7c779b34e2f3ea5692f5fb1fb51aa1ee9de78bc755f5652cb597", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:baf507b37a667c773f46d9779277ab9de44a5432694ef95fe9ef03a6af70435f", + "zh:bd006bd8f1403f71be8f490e33ea1bcbdd8135678ebe3f1c3c0ebd82615d9b33", + "zh:dd0a61fb654837d186376b1dbccc8a93ed1e2f176e3663daac2d5bc9190c7895", + "zh:f8db068265495a48476a5ea68aa7148ceb046cbfaad308ef8e12d8fd6f463126", ] } diff --git a/README.md b/README.md index 7548e70..977a846 100644 --- a/README.md +++ b/README.md @@ -67,14 +67,19 @@ If you set ``create_networking_config = false`` no subnets, eip, NAT gateway and ### S3 Bucket configuration MWAA needs a S3 bucket to store the DAG files. Here is a minimal configuration for this S3 bucket: + ```terraform resource "aws_s3_bucket" "mwaa" { bucket = "…" - versioning { - # required: https://docs.aws.amazon.com/mwaa/latest/userguide/mwaa-s3-bucket.html - enabled = true +} + +resource "aws_s3_bucket_versioning" "mwaa" { + bucket = aws_s3_bucket.mwaa.bucket + versioning_configuration { + status = "Enabled" } } + resource "aws_s3_bucket_public_access_block" "mwaa" { # required: https://docs.aws.amazon.com/mwaa/latest/userguide/mwaa-s3-bucket.html bucket = aws_s3_bucket.mwaa.id @@ -92,13 +97,13 @@ resource "aws_s3_bucket_public_access_block" "mwaa" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >=1.0.0 | -| [aws](#requirement\_aws) | ~> 3.0 | +| [aws](#requirement\_aws) | ~> 4.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 3.75.1 | +| [aws](#provider\_aws) | 4.17.1 | ## Modules diff --git a/versions.tf b/versions.tf index a1401f9..f993a22 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.0" + version = "~> 4.0" } } required_version = ">=1.0.0"