add: improve tf module

JordiiBru · Jun 14, 2024 · 75caa20 · 75caa20
1 parent 06d7b58
commit 75caa20
Showing 5 changed files with 17 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -2,28 +2,25 @@
 
 Terraform module to create an ACM (AWS Certificate Manager) certificate with Route 53 resources for DNS validation.
 
-## Required Variables
+## Common Variables
 
-| Name      | Description                                         | Type   | Validation                                     | Default |
-|-----------|-----------------------------------------------------|--------|------------------------------------------------|---------|
-| `stage`   | The stage of development (e.g., test, dev, staging, prod). | string | Must be one of `test`, `dev`, `staging`, `prod` | N/A     |
-| `purpose` | A short description about the purpose of the created resource. | string | Must match the regex `^[a-zA-Z0-9-_]*$`        | N/A     |
-| `owner`   | The owner of the deployed infrastructure.           | string | Must have more than three characters           | N/A     |
+| Name      | Description                                                    | Type   | Validation                                      | Default | Required |
+|-----------|----------------------------------------------------------------|--------|-------------------------------------------------|---------|----------|
+| `stage`   | The stage of development (e.g., test, dev, staging, prod).     | string | Must be one of `test`, `dev`, `staging`, `prod` |         | yes      |
+| `purpose` | A short description about the purpose of the created resource. | string | Must match the regex `^[a-zA-Z0-9-_]*$`         |         | yes      |
+| `owner`   | The owner of the deployed infrastructure.                      | string | Must have more than three characters            |         | yes      |
 
 ## Custom Variables
 
-| Name            | Description                                      | Type   | Default              |
-|-----------------|--------------------------------------------------|--------|----------------------|
-| `domain_name`   | The name of the domain to attach the certificate.| string | `null`               |
-| `validate_cert` | Indicate whether to validate the certificate.    | bool   | `true`               |
-| `zone_name`     | The name of the Route 53 hosted zone.            | string | `jordibru.cloud`     |
+| Name        | Description                 | Type   | Validation  | Default | Required |
+|-------------|-----------------------------|--------|-------------|---------|----------|
+| `subdomain` | The name of the subdomain.  | string |             |         | yes      |
 
 ## Outputs
 
 | Name                       | Description                                      |
 |----------------------------|--------------------------------------------------|
 | `certificate_arn`          | The ARN of the validated ACM certificate.        |
-| `domain_validation_options`| The domain validation options for the ACM certificate. |
 
 ## Usage
 

diff --git a/examples/basic-acm.tf b/examples/basic-acm.tf
@@ -7,5 +7,5 @@ module "acm" {
   purpose = "tfg"
 
   # Custom variables
-  domain_name = "test.jordibru.cloud"
+  subdomain = "portfolio" # This will create record portfolio.jordibru.cloud
 }
diff --git a/main.tf b/main.tf
@@ -1,9 +1,9 @@
 data "aws_route53_zone" "jordibru_cloud" {
-  name = var.zone_name
+  name = "jordibru.cloud"
 }
 
 resource "aws_acm_certificate" "domain_certificate" {
-  domain_name       = var.domain_name
+  domain_name       = "${var.subdomain}.jordibru.cloud"
   validation_method = "DNS"
 
   lifecycle {
@@ -19,7 +19,6 @@ resource "aws_acm_certificate" "domain_certificate" {
   }
 }
 
-# record validation
 resource "aws_route53_record" "cert_validations" {
   for_each = {
     for dvo in aws_acm_certificate.domain_certificate.domain_validation_options : dvo.domain_name => {

diff --git a/outputs.tf b/outputs.tf
@@ -2,9 +2,4 @@
 output "certificate_arn" {
   description = "The ARN of the validated ACM certificate."
   value       = aws_acm_certificate_validation.validations.certificate_arn
-}
-
-output "domain_validation_options" {
-  description = "The domain validation options for the ACM certificate."
-  value       = aws_acm_certificate.domain_certificate[*].domain_validation_options
 }
diff --git a/variables.tf b/variables.tf
@@ -1,4 +1,4 @@
-# REQUIRED VARIABLES
+# COMMON VARIABLES
 
 variable "stage" {
   description = "The stage of development (e.g., test, dev, staging, prod)."
@@ -34,25 +34,12 @@ variable "owner" {
 
 # CUSTOM VARIABLES
 
-variable "domain_name" {
-  description = "The name of the domain to attach the certificate."
+variable "subdomain" {
+  description = "The name of the subdomain."
   type        = string
-  default     = null
 
   validation {
-    condition     = length(var.domain_name) >= 3
-    error_message = "You must define a domain name with at least three characters that exists on the account."
+    condition     = length(var.subdomain) >= 3
+    error_message = "You must define a subdomain name with at least three characters."
   }
 }
-
-variable "validate_cert" {
-  description = "Indicate whether to validate the certificate."
-  type        = bool
-  default     = true
-}
-
-variable "zone_name" {
-  description = "The name of the Route 53 hosted zone."
-  type        = string
-  default     = "jordibru.cloud"
-}