✨ feature: Add SPA error handling and upgrade to AWS provider 6.x (#63)

Author: bendoerr

aws-cloudfront.tf

@@ -34,6 +34,15 @@ resource "aws_cloudfront_distribution" "site" {
     }
   }
 
+  dynamic "custom_error_response" {
+    for_each = var.enable_spa_error_handling ? toset(["403", "404"]) : []
+    content {
+      error_code         = each.value
+      response_code      = 200
+      response_page_path = format("/%s", coalesce(var.default_root_object, "index.html"))
+    }
+  }
+
   restrictions {
     geo_restriction {
       restriction_type = "none"

aws-route53.tf

@@ -1,5 +1,5 @@
 resource "aws_route53_record" "alias" {
-  for_each = toset(flatten([[module.label_site.dns_name], var.extra_domain_prefixes]))
+  for_each = toset(flatten([[local.default_alias], var.extra_domain_prefixes]))
   name     = each.key
   type     = "A"
   zone_id  = var.domain_zone_id

examples/simple/main.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }

test/go.mod

@@ -103,7 +103,7 @@ require (
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/tmccombs/hcl2json v0.6.7 // indirect
-	github.com/ulikunitz/xz v0.5.12 // indirect
+	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/urfave/cli/v2 v2.27.6 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect

test/go.sum

@@ -218,6 +218,8 @@ github.com/tmccombs/hcl2json v0.6.7 h1:RYKTs4kd/gzRsEiv7J3M2WQ7TYRYZVc+0H0pZdERk
 github.com/tmccombs/hcl2json v0.6.7/go.mod h1:lJgBOOGDpbhjvdG2dLaWsqB4KBzul2HytfDTS3H465o=
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
+github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
 github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

variables.tf

@@ -65,3 +65,10 @@ variable "function_associations" {
   description = "A config block that triggers a lambda function with specific actions (maximum 4)."
   nullable    = false
 }
+
+variable "enable_spa_error_handling" {
+  type        = bool
+  default     = false
+  description = "Enable SPA error handling by redirecting 403 errors to / with 200 status code."
+  nullable    = false
+}

versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source                = "hashicorp/aws"
-      version               = "~> 5.0"
+      version               = "~> 6.0"
       configuration_aliases = [aws.route53]
     }
   }