Reformat files

run.sh

@@ -5,6 +5,7 @@ usage() {
 usage: ${0##*/} [command]
     -h          Print this help message.
     -v          Validate terraform config.
+    -p          Show changes required by the current terraform config.
     -a          Create or update infraestructure.
     -d          Destroy infraestructure.
 EOF
@@ -12,10 +13,11 @@ EOF
 }
 
 RUN=
-while getopts "hvad" OPTION; do
+while getopts "hvpad" OPTION; do
     case $OPTION in
     a) RUN=apply ;;
     v) RUN=validate ;;
+    p) RUN=plan ;;
     d) RUN=destroy ;;
     *) usage ;;
     esac
@@ -23,7 +25,7 @@ done
 
 dir="$PWD"
 
-cd "$dir/terraform/organization/bsmsapp" || exit
+cd "$dir/terraform/organization" || exit
 
 terraform init
 if [ "$RUN" = 'apply' ]; then

terraform/modules/cloudfront/main.tf

@@ -1,5 +1,5 @@
 # ---------------------------------------------------------------------------
-# Amazon Cloudfront
+# Amazon CloudFront
 # ---------------------------------------------------------------------------
 
 resource "aws_cloudfront_distribution" "this" {

terraform/modules/cloudfront/outputs.tf

@@ -0,0 +1,3 @@
+# --------------------------------------------------------------------
+# CloudFront outputs
+# --------------------------------------------------------------------

terraform/modules/cloudfront/variables.tf

@@ -1,5 +1,5 @@
 # ---------------------------------------------------------------------------
-# Amazon Cloudfront variables
+# Amazon CloudFront variables
 # ---------------------------------------------------------------------------
 
 variable "web_acl_id" {

terraform/modules/dynamodb/main.tf

@@ -8,11 +8,6 @@ resource "aws_dynamodb_table" "this" {
   write_capacity = var.write_capacity
   billing_mode   = var.billing_mode
 
-  # attribute {
-  #   name = var.hash_key
-  #   type = "S"
-  # }
-
   dynamic "attribute" {
     for_each = var.attributes
 

terraform/modules/s3/main.tf

@@ -2,13 +2,11 @@
 # Amazon S3
 # ------------------------------------------------------------------------------
 
-# 1 - S3 bucket
 resource "aws_s3_bucket" "this" {
   bucket              = var.bucket_name
   object_lock_enabled = false
 }
 
-# 2 -Bucket policy
 resource "aws_s3_bucket_policy" "this" {
   count = var.objects != {} ? 1 : 0
 
@@ -16,7 +14,6 @@ resource "aws_s3_bucket_policy" "this" {
   policy = data.aws_iam_policy_document.this.json
 }
 
-# 3 -Website configuration
 resource "aws_s3_bucket_website_configuration" "this" {
   bucket = aws_s3_bucket.this.id
 
@@ -29,19 +26,17 @@ resource "aws_s3_bucket_website_configuration" "this" {
   }
 }
 
-# 4 - Access Control List
 resource "aws_s3_bucket_acl" "this" {
   bucket = aws_s3_bucket.this.id
   acl    = var.bucket_acl
 }
 
-# 5 - Upload objects
 resource "aws_s3_object" "this" {
-  for_each = try(var.objects, {}) #{ for object, key in var.objects: object => key if try(var.objects, {}) != {} }
+  for_each = try(var.objects, {})
 
   bucket        = aws_s3_bucket.this.id
-  key           = try(each.value.rendered, replace(each.value.filename, "html/", ""))         # remote path
-  source        = try(each.value.rendered, format("./../resources/%s", each.value.filename)) # where is the file located
+  key           = try(each.value.rendered, replace(each.value.filename, "html/", ""))
+  source        = try(each.value.rendered, format("./../resources/%s", each.value.filename))
   content_type  = each.value.content_type
   storage_class = try(each.value.tier, "STANDARD")
 }

terraform/modules/s3/outputs.tf

@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------
-# Amazon S3 buckets output
+# Amazon S3 output
 # --------------------------------------------------------------------
 
 output "id" {
@@ -14,5 +14,5 @@ output "arn" {
 
 output "website_endpoint" {
   description = "The website endpoint, if the bucket is configured with a website. If not, this will be an empty string."
-  value       = aws_s3_bucket.this.website_endpoint
+  value       = aws_s3_bucket_website_configuration.this.website_endpoint
 }

terraform/modules/sqs/main.tf

@@ -2,18 +2,16 @@
 # Amazon Simple Queue Service
 # ------------------------------------------------------------------------------
 
-resource "aws_sqs_queue" "terraform_queue" {
-  name                      = "terraform-example-queue"
-  delay_seconds             = 90
-  max_message_size          = 2048
-  message_retention_seconds = 86400
-  receive_wait_time_seconds = 10
-  redrive_policy = jsonencode({
-    deadLetterTargetArn = aws_sqs_queue.terraform_queue_deadletter.arn
-    maxReceiveCount     = 4
-  })
+# resource "aws_sqs_queue" "terraform_queue" {
+#   name                      = var.name
+#   delay_seconds             = 90
+#   max_message_size          = 2048
+#   message_retention_seconds = 86400
+#   receive_wait_time_seconds = 10
+#   redrive_policy = jsonencode({
+#     deadLetterTargetArn = aws_sqs_queue.terraform_queue_deadletter.arn
+#     maxReceiveCount     = 4
+#   })
 
-  tags = {
-    Environment = "production"
-  }
-}
+#   tags = var.tags
+# }

terraform/organization/sqs.tf

@@ -0,0 +1 @@
+

terraform/organization/vpc.tf

@@ -1,57 +1,31 @@
-# module "vpc" {
-#   source = "terraform-aws-modules/vpc/aws"
-
-#   name = "my-vpc"
-#   cidr = "10.0.0.0/16"
-
-#   azs             = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
-#   private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-#   public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
-
-#   enable_nat_gateway = true
-#   enable_vpn_gateway = true
-
-#   tags = {
-#     Terraform = "true"
-#     Environment = "dev"
-#   }
-# }
-
-locals {
-  name   = "ex-${replace(basename(path.cwd), "_", "-")}"
-  region = "us-east-1"
-
-  tags = {
-    Example    = local.name
-    GithubRepo = "terraform-aws-vpc"
-    GithubOrg  = "terraform-aws-modules"
-  }
-}
-
 ################################################################################
-# VPC Module
+# VPC Module (from terraform-aws-modules)
 ################################################################################
 
 module "vpc" {
   source = "terraform-aws-modules/vpc/aws"
 
-  name = local.name
+  providers = {
+    aws = aws.aws
+  }
+
+  name = "vpc-g3-bsmsapp"
   cidr = "10.0.0.0/16"
 
-  azs                 = ["${local.region}a", "${local.region}b"]
+  azs             = ["${data.aws_region.current.name}a", "${data.aws_region.current.name}b"]
   private_subnets = ["10.0.1.0/24", "10.0.2.0/24"]
   public_subnets  = ["10.0.3.0/24", "10.0.4.0/24"]
 
   create_database_subnet_group = false
 
   manage_default_network_acl = true
-  default_network_acl_tags   = { Name = "${local.name}-default" }
+  default_network_acl_tags   = { Name = "vpc-g3-bsmsapp-default" }
 
   manage_default_route_table = true
-  default_route_table_tags   = { Name = "${local.name}-default" }
+  default_route_table_tags   = { Name = "vpc-g3-bsmsapp-default" }
 
   manage_default_security_group = true
-  default_security_group_tags   = { Name = "${local.name}-default" }
+  default_security_group_tags   = { Name = "vpc-g3-bsmsapp-default" }
 
   enable_dns_hostnames = true
   enable_dns_support   = true
@@ -59,7 +33,9 @@ module "vpc" {
   enable_nat_gateway = true
   single_nat_gateway = true
 
-  tags = local.tags
+  tags = {
+    Name = "vpc-g3-bsmsapp"
+  }
 }
 
 module "vpc_endpoints" {
@@ -83,10 +59,11 @@ module "vpc_endpoints" {
     },
   }
 
-  tags = merge(local.tags, {
+  tags = {
+    Name = "vpc-g3-bsmsapp"
     Project  = "Secret"
     Endpoint = "true"
-  })
+  }
 }
 
 # module "vpc_endpoints_nocreate" {
@@ -145,7 +122,7 @@ data "aws_iam_policy_document" "generic_endpoint_policy" {
 }
 
 resource "aws_security_group" "vpc_tls" {
-  name_prefix = "${local.name}-vpc_tls"
+  name_prefix = "vpc-g3-bsmsapp-vpc_tls"
   description = "Allow TLS inbound traffic"
   vpc_id      = module.vpc.vpc_id
 
@@ -157,5 +134,7 @@ resource "aws_security_group" "vpc_tls" {
     cidr_blocks = [module.vpc.vpc_cidr_block]
   }
 
-  tags = local.tags
+  tags = {
+    Name = "vpc-g3-bsmsapp"
+  }
 }