Restructure variables for organisation

Author: Script47

package.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.0.4"
+  "version": "0.0.5"
 }

static-site/cloudfront.tf

@@ -1,6 +1,6 @@
 resource "aws_cloudfront_distribution" "static_site" {
   comment             = "Distribution for ${var.domain_name}"
-  aliases             = [var.domain_name]
+  aliases             = var.cloudfront.aliases
   enabled             = true
   is_ipv6_enabled     = true
   default_root_object = "index.html"
@@ -13,8 +13,8 @@ resource "aws_cloudfront_distribution" "static_site" {
 
   restrictions {
     geo_restriction {
-      restriction_type = var.restriction_type
-      locations        = var.locations
+      restriction_type = var.cloudfront.type
+      locations        = var.cloudfront.locations
     }
   }
 
@@ -39,7 +39,7 @@ resource "aws_cloudfront_distribution" "static_site" {
   viewer_certificate {
     acm_certificate_arn            = aws_acm_certificate.cloudfront_cert.arn
     ssl_support_method             = "sni-only"
-    minimum_protocol_version       = var.minimum_protocol_version
+    minimum_protocol_version       = var.cloudfront.viewer_certificate.minimum_protocol_version
     cloudfront_default_certificate = false
   }
 

static-site/variables.tf

@@ -8,36 +8,46 @@ variable "domain_name" {
   description = "The custom domain for your CloudFront distribution"
 }
 
-variable "minimum_protocol_version" {
-  type        = string
-  description = "Set the minimum viewer certificate version for the CloudFront distribution"
-  default     = "TLSv1.2_2021"
-}
-
 variable "role_name" {
   type        = string
   description = "The name of the role and policy with the ability to deploy"
   default     = "deploy-static-site"
 }
 
-variable "restriction_type" {
-  type        = string
-  description = "The restriction type for the CloudFront distribution"
-  default     = "none"
+variable "repo" {
+  type = string
+  description = "The repo path for the project"
 }
 
-variable "locations" {
-  type        = list(string)
-  description = "The locations for the restriction type"
-  default     = []
+variable "cloudfront" {
+  type = object({
+    aliases = list(string)
+
+    restriction = object({
+      type = string
+      locations = list(string)
+    })
+
+    viewer_certificate = object({
+      minimum_protocol_version = string
+    })
+  })
+
+  default = {
+    aliases = [var.domain_name]
+
+    restriction = {
+      type = "none"
+      locations = []
+    }
+
+    viewer_certificate = {
+      minimum_protocol_version = "TLSv1.2_2021"
+    }
+  }
 }
 
 variable "tags" {
   type        = map(string)
   description = "The tags to apply to all resources created"
 }
-
-variable "repo_path" {
-  type = string
-  description = "The repo path for the project"
-}