some more typo fixes and fmt.

Author: Brzhk

Readme.md

@@ -194,7 +194,7 @@ For more complicated service discovery which handles cases like versioning, we'd
 
 ### Bastion
 
-The bastion host acts as the "jump point" for the rest of the infrastructure. Since most of our instances aren't exposed to the external internet, the bastion acts as the gatekeeper for any direct SSH access.
+The bastion host acts as the "jump point" for the rest of the infrastructure. Since most of our instances are not exposed to the external internet, the bastion acts as the gatekeeper for any direct SSH access.
 
 The bastion is provisioned using the key name that you pass to the stack (and hopefully have stored somewhere). If you ever need to access an instance directly, you can do it by "jumping through" the bastion:
 

defaults/main.tf

@@ -24,6 +24,7 @@ variable "cidr" {
 
 variable "default_ecs_ami" {
   type = "map"
+
   default = {
     us-east-1      = "ami-dde4e6ca"
     us-west-1      = "ami-6d21770d"
@@ -41,6 +42,7 @@ variable "default_ecs_ami" {
 # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/enable-access-logs.html#attach-bucket-policy
 variable "default_log_account_ids" {
   type = "map"
+
   default = {
     us-east-1      = "127311923021"
     us-west-2      = "797873946194"

docs.md

@@ -88,7 +88,7 @@ Usage:
 # bastion
 
 The bastion host acts as the "jump point" for the rest of the infrastructure.
-Since most of our instances aren't exposed to the external internet, the bastion acts as the gatekeeper for any direct SSH access.
+Since most of our instances are not exposed to the external internet, the bastion acts as the gatekeeper for any direct SSH access.
 The bastion is provisioned using the key name that you pass to the stack (and hopefully have stored somewhere).
 If you ever need to access an instance directly, you can do it by "jumping through" the bastion.
 
@@ -130,7 +130,7 @@ Usage:
 # defaults
 
 This module is used to set configuration defaults for the AWS infrastructure.
-It doesn't provide much value when used on its own because terraform makes it
+It does not provide much value when used on its own because terraform makes it
 hard to do dynamic generations of things like subnets, for now it's used as
 a helper module for the stack.
 
@@ -248,7 +248,7 @@ Usage:
 | instance_type | The instance type to use, e.g t2.small | - | yes |
 | instance_ebs_optimized | When set to true the instance will be launched with EBS optimized turned on | `true` | no |
 | min_size | Minimum instance count | `3` | no |
-| max_size | Maxmimum instance count | `100` | no |
+| max_size | Maximum instance count | `100` | no |
 | desired_capacity | Desired instance count | `3` | no |
 | associate_public_ip_address | Should created instances be publicly accessible (if the SG allows) | `false` | no |
 | root_volume_size | Root volume size in GB | `25` | no |

ecs-cluster/main.tf

@@ -93,7 +93,7 @@ variable "desired_capacity" {
 
 variable "associate_public_ip_address" {
   description = "Should created instances be publicly accessible (if the SG allows)"
-  default = false
+  default     = false
 }
 
 variable "root_volume_size" {

iam-role/main.tf

@@ -95,9 +95,9 @@ EOF
 }
 
 resource "aws_iam_instance_profile" "default_ecs" {
-  name  = "ecs-instance-profile-${var.name}-${var.environment}"
-  path  = "/"
-  role  = "${aws_iam_role.default_ecs_role.name}"
+  name = "ecs-instance-profile-${var.name}-${var.environment}"
+  path = "/"
+  role = "${aws_iam_role.default_ecs_role.name}"
 }
 
 output "default_ecs_role_id" {

main.tf

@@ -46,31 +46,31 @@ variable "cidr" {
 }
 
 variable "internal_subnets" {
-  type = "list"
+  type        = "list"
   description = "a list of CIDRs for internal subnets in your VPC, must be set if the cidr variable is defined, needs to have as many elements as there are availability zones"
-  default     = ["10.30.0.0/19" ,"10.30.64.0/19", "10.30.128.0/19"]
+  default     = ["10.30.0.0/19", "10.30.64.0/19", "10.30.128.0/19"]
 }
 
 variable "external_subnets" {
-  type = "list"
+  type        = "list"
   description = "a list of CIDRs for external subnets in your VPC, must be set if the cidr variable is defined, needs to have as many elements as there are availability zones"
   default     = ["10.30.32.0/20", "10.30.96.0/20", "10.30.160.0/20"]
 }
 
 variable "availability_zones" {
-  type = "list"
+  type        = "list"
   description = "a comma-separated list of availability zones, defaults to all AZ of the region, if set to something other than the defaults, both internal_subnets and external_subnets have to be defined as well"
   default     = ["us-west-2a", "us-west-2b", "us-west-2c"]
 }
 
 variable "bastion_instance_type" {
   description = "Instance type for the bastion"
-  default = "t2.micro"
+  default     = "t2.micro"
 }
 
 variable "ecs_cluster_name" {
   description = "the name of the cluster, if not specified the variable name will be used"
-  default = ""
+  default     = ""
 }
 
 variable "ecs_instance_type" {
@@ -205,28 +205,28 @@ module "iam_role" {
 }
 
 module "ecs_cluster" {
-  source                 = "./ecs-cluster"
-  name                   = "${coalesce(var.ecs_cluster_name, var.name)}"
-  environment            = "${var.environment}"
-  vpc_id                 = "${module.vpc.id}"
-  image_id               = "${coalesce(var.ecs_ami, module.defaults.ecs_ami)}"
-  subnet_ids             = "${module.vpc.internal_subnets}"
-  key_name               = "${var.key_name}"
-  instance_type          = "${var.ecs_instance_type}"
-  instance_ebs_optimized = "${var.ecs_instance_ebs_optimized}"
-  iam_instance_profile   = "${module.iam_role.profile}"
-  min_size               = "${var.ecs_min_size}"
-  max_size               = "${var.ecs_max_size}"
-  desired_capacity       = "${var.ecs_desired_capacity}"
-  region                 = "${var.region}"
-  availability_zones     = "${module.vpc.availability_zones}"
-  root_volume_size       = "${var.ecs_root_volume_size}"
-  docker_volume_size     = "${var.ecs_docker_volume_size}"
-  docker_auth_type       = "${var.ecs_docker_auth_type}"
-  docker_auth_data       = "${var.ecs_docker_auth_data}"
-  security_groups        = "${coalesce(var.ecs_security_groups, format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb))}"
-  extra_cloud_config_type     = "${var.extra_cloud_config_type}"
-  extra_cloud_config_content  = "${var.extra_cloud_config_content}"
+  source                     = "./ecs-cluster"
+  name                       = "${coalesce(var.ecs_cluster_name, var.name)}"
+  environment                = "${var.environment}"
+  vpc_id                     = "${module.vpc.id}"
+  image_id                   = "${coalesce(var.ecs_ami, module.defaults.ecs_ami)}"
+  subnet_ids                 = "${module.vpc.internal_subnets}"
+  key_name                   = "${var.key_name}"
+  instance_type              = "${var.ecs_instance_type}"
+  instance_ebs_optimized     = "${var.ecs_instance_ebs_optimized}"
+  iam_instance_profile       = "${module.iam_role.profile}"
+  min_size                   = "${var.ecs_min_size}"
+  max_size                   = "${var.ecs_max_size}"
+  desired_capacity           = "${var.ecs_desired_capacity}"
+  region                     = "${var.region}"
+  availability_zones         = "${module.vpc.availability_zones}"
+  root_volume_size           = "${var.ecs_root_volume_size}"
+  docker_volume_size         = "${var.ecs_docker_volume_size}"
+  docker_auth_type           = "${var.ecs_docker_auth_type}"
+  docker_auth_data           = "${var.ecs_docker_auth_data}"
+  security_groups            = "${coalesce(var.ecs_security_groups, format("%s,%s,%s", module.security_groups.internal_ssh, module.security_groups.internal_elb, module.security_groups.external_elb))}"
+  extra_cloud_config_type    = "${var.extra_cloud_config_type}"
+  extra_cloud_config_content = "${var.extra_cloud_config_content}"
 }
 
 module "s3_logs" {

s3-logs/main.tf

@@ -1,11 +1,8 @@
-variable "name" {
-}
+variable "name" {}
 
-variable "environment" {
-}
+variable "environment" {}
 
-variable "account_id" {
-}
+variable "account_id" {}
 
 variable "logs_expiration_enabled" {
   default = false
@@ -28,8 +25,8 @@ resource "aws_s3_bucket" "logs" {
   bucket = "${var.name}-${var.environment}-logs"
 
   lifecycle_rule {
-    id = "logs-expiration"
-    prefix = ""
+    id      = "logs-expiration"
+    prefix  = ""
     enabled = "${var.logs_expiration_enabled}"
 
     expiration {

web-service/elb/main.tf

@@ -48,8 +48,7 @@ variable "internal_zone_id" {
   description = "The zone ID to create the record in"
 }
 
-variable "ssl_certificate_id" {
-}
+variable "ssl_certificate_id" {}
 
 /**
  * Resources.