Update to latest AWS provider

3 files changed, 42 insertions, 28 deletions

diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
index 73fa662..76a026a 100644
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@@ -2,23 +2,23 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "2.70.4"
-  constraints = "~> 2.11"
+  version = "5.19.0"
   hashes = [
-    "h1:lslhOgktnvbh66VCd8cJPr590U1HRb8Z+436lPsnHL8=",
-    "zh:45f528103c5580623b15e7ac3986b72baa5d33cabc66c902594d666c7607a8f2",
-    "zh:538793ad294171370cc0c280c98cb5c8eb77669d0917c2ab727090016ec2626e",
-    "zh:631d5aea6ec7b13d8973f13fc70dc36ecc5e5614793c5141ccd254773bc4ec36",
-    "zh:7861c5e12c322717ff9684ac658be590d12906a9549204b6337f3f8d55bf0640",
-    "zh:8adfe014d0a0552a9a6b358cc0d7e3d0c660bc15aa5524e771525b0e5d14b20f",
-    "zh:9d81089842c0990d410bffc5702dec719145951c3f5cbc85c3bf8968985d50cc",
-    "zh:a4b0922e0fddccbb84958d4909896e8009c57885a41cc2e1c37dcdc56e2da796",
-    "zh:a6dcd0292e807d8d5b8a922d2e0cc3c6949461e18603cb48005c967329abe574",
-    "zh:ae07e0dae4e700c1f6623bd0b66ab4153d0b498ffd5f6681117101d2020815bc",
-    "zh:bd07ba17501b8b57d4455329770f4f520e709d12f8b0c364821f39d1b2df1a89",
-    "zh:ddbf1a0b63ac84462da002b44b249f86180804670f1070109785d00a19f88e16",
-    "zh:e2291e9efbd0100c555d3bae8f2b2af4d416f80105c250747cb5fd8f0b17062f",
-    "zh:e5d8e0ad489547118fd76f300d1cb6dd516997cf919dc0bbaedaacb5c91e697a",
-    "zh:eae90e616cec391546bf4ecf294e8a3ae56ce7c90ac0e1d45ebf2907957b9f16",
+    "h1:rgsqMIwX/2b2Ghrfd3lPasPoHupkWsEA+fcXod60+v8=",
+    "zh:03aa0f857c6dfce5f46c9bf3aad45534b9421e68983994b6f9dd9812beaece9c",
+    "zh:0639818c5bf9f9943667f39ec38bb945c9786983025dff407390133fa1ca5041",
+    "zh:0b82ad42ced8fb4a138eaf2fd37cf6059ca0bb482114b35fb84f22fc1500324a",
+    "zh:173e8c19a9f1d8f6457c80f4a73a92f420a81d650fc4ad0f97a5dc4b9485bba8",
+    "zh:42913a40ddfe9b4f3c78ad2e3cdc1dcfd48151bc132dc6b49fc32cd6da79db21",
+    "zh:452db5caca2e53d5f7090979d518e77aa5fd98385514b11ee2ce76a46e89cb53",
+    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
+    "zh:a12377ade89ee18d9be116436e411e8396898bd70b21ab027c161c785e86238d",
+    "zh:aa9e4746ba49044ad5b4dda57fcdba7bc16fe65f696766fb2c55c30a27abf844",
+    "zh:adfaee76d283f1c321fad2e4154be88d57da8c2ecfdca9516c8920bd2ece36ed",
+    "zh:bf6fbc6d60661c03ed2214173c1deced908dc62480dd41e67ac399fa4abd7467",
+    "zh:cb685da03ad00d1a27891f3d366d75e8795ac81f1b427888b434e6832ca40633",
+    "zh:e0432c78dfaf2baebe2bf5c0ad8087f547c69c2c5a00e4c1dcd5a6344ce726df",
+    "zh:e0ec9ccb8d34d6d0d8bf7f8628c223951832b4d50ea8887fc711fa854b3a28b4",
+    "zh:f274397ada4ef3c1dce2f70e719c8ccf19fc4e7a2e3f45d018764c6267fd7157",
   ]
 }
diff --git a/bliki.tf b/bliki.tf
index 1777e3f..3bdcd7d 100644
--- a/bliki.tf
+++ b/bliki.tf
@@ -19,15 +19,19 @@ provider "aws" {
 resource "aws_s3_bucket" "bliki" {
   bucket = "grimoire.ca"
 
-  website {
-    index_document = "index.html"
-  }
-
   tags = {
     Project = "bliki"
   }
 }
 
+resource "aws_s3_bucket_website_configuration" "bliki" {
+  bucket = aws_s3_bucket.bliki.id
+
+  index_document {
+    suffix = "index.html"
+  }
+}
+
 resource "aws_s3_bucket_policy" "bliki" {
   bucket = aws_s3_bucket.bliki.id
   policy = <<POLICY
@@ -62,12 +66,23 @@ resource "aws_acm_certificate" "bliki" {
 }
 
 resource "aws_route53_record" "bliki_validation" {
+  for_each = {
+    for dvo in aws_acm_certificate.bliki.domain_validation_options :
+      dvo.domain_name => {
+        name   = dvo.resource_record_name
+        record = dvo.resource_record_value
+        type   = dvo.resource_record_type
+      }
+  }
+
   zone_id = data.aws_route53_zone.grimoire_ca.zone_id
-  ttl = 60
-  name = aws_acm_certificate.bliki.domain_validation_options[0].resource_record_name
-  type = aws_acm_certificate.bliki.domain_validation_options[0].resource_record_type
+
+  ttl  = 60
+  name = each.value.name
+  type = each.value.type
+
   records = [
-    aws_acm_certificate.bliki.domain_validation_options[0].resource_record_value,
+    each.value.record,
   ]
 }
 
@@ -88,7 +103,7 @@ resource "aws_cloudfront_distribution" "bliki" {
 
     # Use the website endpoint, not the bucket endpoint, to get / -> /index.html
     # translation through S3's website config.
-    domain_name = aws_s3_bucket.bliki.website_endpoint
+    domain_name = aws_s3_bucket_website_configuration.bliki.website_endpoint
 
     custom_origin_config {
       http_port = 80
diff --git a/versions.tf b/versions.tf
index 002540c..f2702bf 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,8 +1,7 @@
 terraform {
   required_providers {
     aws = {
-      source  = "hashicorp/aws"
-      version = "~> 2.11"
+      source = "hashicorp/aws"
     }
   }
 }