update

Author: Scott Winkler

modules/cluster/main.tf

@@ -11,7 +11,7 @@ locals {
     instance_count = var.instance_count,
     namespace      = var.namespace,
     datacenter     = var.datacenter,
-    join_wan       = join(",",[for s in var.join_wan: join("",["\"",s,"\""])]),
+    join_wan       = join(",", [for s in var.join_wan : join("", ["\"", s, "\""])]),
   }) : ""
   nomad_config = var.nomad.mode != "disabled" ? templatefile("${path.module}/templates/nomad_${var.nomad.mode}.hcl", {
     instance_count = var.instance_count
@@ -49,8 +49,8 @@ resource "aws_launch_template" "server" {
   }
   network_interfaces {
     associate_public_ip_address = var.associate_public_ips
-    security_groups = [var.security_group_id]
-    delete_on_termination = true
+    security_groups             = [var.security_group_id]
+    delete_on_termination       = true
   }
 
   tags = {
@@ -87,10 +87,10 @@ resource "aws_autoscaling_group" "server" {
 
 data "aws_instances" "instances" {
   depends_on = [aws_autoscaling_group.server]
-  count = var.associate_public_ips ? 1 : 0
+  count      = var.associate_public_ips ? 1 : 0
   instance_tags = {
     ResourceGroup = var.namespace
-    Name = local.namespace
+    Name          = local.namespace
   }
 
   instance_state_names = ["running", "pending"]

modules/cluster/outputs.tf

@@ -1,3 +1,3 @@
 output "public_ips" {
-    value = var.associate_public_ips&&length(data.aws_instances.instances)>=1 ? data.aws_instances.instances[0].public_ips : []
+  value = var.associate_public_ips && length(data.aws_instances.instances) >= 1 ? data.aws_instances.instances[0].public_ips : []
 }

modules/loadbalancing/main.tf

@@ -78,9 +78,9 @@ resource "aws_lb_listener" "nomad_ui" {
 
 //fabio load balancer
 resource "aws_lb" "fabio_lb" {
-  name            = "${var.namespace}-fabio"
-  internal        = false
-  subnets         = var.vpc.public_subnets
+  name               = "${var.namespace}-fabio"
+  internal           = false
+  subnets            = var.vpc.public_subnets
   load_balancer_type = "network"
 }
 
@@ -93,7 +93,7 @@ resource "aws_lb_target_group" "fabio_ui" {
   health_check {
     port = 4646
   }
-  
+
   tags = {
     ResourceGroup = var.namespace
   }

modules/loadbalancing/variables.tf

@@ -3,7 +3,7 @@ variable "namespace" {
 }
 
 variable "vpc" {
-    type = any
+  type = any
 }
 
 variable "sg" {

modules/networking/main.tf

@@ -1,15 +1,15 @@
 data "aws_availability_zones" "available" {}
 
 module "vpc" {
-  source                           = "terraform-aws-modules/vpc/aws"
-  version                          = "2.70.0"
-  name                             = "${var.namespace}-vpc"
-  cidr                             = "10.0.0.0/16"
-  azs                              = data.aws_availability_zones.available.names
-  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
-  single_nat_gateway               = true
+  source             = "terraform-aws-modules/vpc/aws"
+  version            = "2.70.0"
+  name               = "${var.namespace}-vpc"
+  cidr               = "10.0.0.0/16"
+  azs                = data.aws_availability_zones.available.names
+  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
+  single_nat_gateway = true
   tags = {
     ResourceGroup = var.namespace
   }

modules/resourcegroup/outputs.tf

@@ -1,3 +1,3 @@
 output "namespace" {
-    value = local.namespace
+  value = local.namespace
 }

modules/resourcegroup/variable.tf

@@ -1,3 +1,3 @@
 variable "namespace" {
-    type = string
+  type = string
 }

outputs.tf

@@ -1,10 +1,10 @@
 output "addresses" {
-    value = module.loadbalancing.addresses
+  value = module.loadbalancing.addresses
 }
 
 output "public_ips" {
-    value = {
-        consul_servers = module.consul_servers.public_ips
-        nomad_servers = module.nomad_servers.public_ips
-    }
+  value = {
+    consul_servers = module.consul_servers.public_ips
+    nomad_servers  = module.nomad_servers.public_ips
+  }
 }

variables.tf

@@ -28,11 +28,6 @@ variable "nomad" {
   })
 }
 
-variable "region" {
-  default = "us-west-2"
-  type    = string
-}
-
 variable "namespace" {
   default = "terraforminaction"
   type    = string
@@ -55,5 +50,5 @@ variable "join_wan" {
 
 variable "associate_public_ips" {
   default = true
-  type = bool
+  type    = bool
 }