ci: refactor terraform

terraform/dev/main.tf

@@ -10,6 +10,8 @@ terraform {
 }
 
 module "infra" {
-  source = "../shared"
-  stage  = "dev"
+  source       = "../shared"
+  stage        = var.stage
+  project-name = var.project-name
+  region       = var.region
 }

terraform/dev/terraform.tfvars.example

@@ -0,0 +1,3 @@
+project-name = ""
+stage = ""
+region = ""

terraform/dev/variables.tf

@@ -0,0 +1,14 @@
+variable "project-name" {
+  description = "Project name"
+  default     = "personal-website"
+}
+
+variable "stage" {
+  description = "Stage (dev, prod)"
+  default     = "dev"
+}
+
+variable "region" {
+  description = "AWS region"
+  default     = "us-east-1"
+}

terraform/init-state/main.tf

@@ -10,29 +10,11 @@ terraform {
 }
 
 provider "aws" {
-  region = "us-east-1"
+  region = var.region
 }
 
 data "aws_caller_identity" "current" {}
 
-variable "common_tags" {
-  description = "Common tags to be applied to all resources"
-  type        = map(string)
-  default = {
-    awsApplication = "personal-website"
-  }
-}
-
-variable "project-name" {
-  description = "Project name"
-  default     = "personal-website"
-}
-
-locals {
-  bucket_name         = "${var.project-name}-${data.aws_caller_identity.current.account_id}-terraform-state"
-  dynamodb_table_name = "${var.project-name}-terraform-locks"
-}
-
 resource "aws_resourcegroups_group" "resource_group" {
   name = var.project-name
 
@@ -53,6 +35,14 @@ resource "aws_resourcegroups_group" "resource_group" {
   }
 }
 
+# Route 53 Hosted Zone
+# Creates a Route 53 hosted zone for the domain name 'jedwards.cc'. This hosted zone is used to
+# manage DNS records for the domain.
+resource "aws_route53_zone" "main" {
+  name = var.domain_name
+  tags = var.common_tags
+}
+
 resource "aws_s3_bucket" "terraform_state" {
   bucket = local.bucket_name
   tags   = var.common_tags

terraform/init-state/terraform.tfvars.example

@@ -0,0 +1,3 @@
+project-name = ""
+region = ""
+domain_name = ""

terraform/init-state/variables.tf

@@ -0,0 +1,27 @@
+variable "common_tags" {
+  description = "Common tags to be applied to all resources"
+  type        = map(string)
+  default = {
+    awsApplication = "personal-website"
+  }
+}
+
+variable "project-name" {
+  description = "Project name"
+  default     = "personal-website"
+}
+
+variable "region" {
+  description = "AWS region"
+  default     = "us-east-1"
+}
+
+variable "domain_name" {
+  description = "Domain name"
+  default     = "example.com"
+}
+
+locals {
+  bucket_name         = "${var.project-name}-${data.aws_caller_identity.current.account_id}-terraform-state"
+  dynamodb_table_name = "${var.project-name}-terraform-locks"
+}

terraform/prod/main.tf

@@ -10,6 +10,8 @@ terraform {
 }
 
 module "infra" {
-  source = "../shared"
-  stage  = "prod"
+  source       = "../shared"
+  stage        = var.stage
+  project-name = var.project-name
+  region       = var.region
 }

terraform/prod/terraform.tfvars.example

@@ -0,0 +1,3 @@
+project-name = ""
+stage = ""
+region = ""

terraform/prod/variables.tf

@@ -0,0 +1,14 @@
+variable "project-name" {
+  description = "Project name"
+  default     = "personal-website"
+}
+
+variable "stage" {
+  description = "Stage (dev, prod)"
+  default     = "dev"
+}
+
+variable "region" {
+  description = "AWS region"
+  default     = "us-east-1"
+}

terraform/shared/network.tf

@@ -1,11 +1,3 @@
-# Route 53 Hosted Zone
-# Creates a Route 53 hosted zone for the domain name 'lanecontrols.net'. This hosted zone is used to
-# manage DNS records for the domain.
-resource "aws_route53_zone" "main" {
-  name = "jedwards.cc"
-  tags = local.common_tags
-}
-
 # Request a new ACM certificate
 resource "aws_acm_certificate" "cert" {
   domain_name       = "test.jedwards.cc"