Merge pull request #169 from trussworks/ee-cleanup

Cleanup
trussworks · Dec 29, 2020 · 942fcba · 942fcba
2 parents ec0b7e7 + f01dab7
commit 942fcba
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 37 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,22 +1,25 @@
+references:
+  circleci_docker: &circleci_docker trussworks/circleci:efb1042e31538677779971798e0912390f699e72
 jobs:
   terratest:
     docker:
     - auth:
         password: $DOCKER_PASSWORD
         username: $DOCKER_USERNAME
-      image: trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c
+      image: *circleci_docker
     steps:
     - checkout
     - restore_cache:
         keys:
         - pre-commit-dot-cache-{{ checksum ".pre-commit-config.yaml" }}
         - go-mod-sources-v1-{{ checksum "go.sum" }}
     - run:
-        command: "temp_role=$(aws sts assume-role \\\n        --role-arn arn:aws:iam::313564602749:role/circleci\
-          \ \\\n        --role-session-name circleci)\nexport AWS_ACCESS_KEY_ID=$(echo\
-          \ $temp_role | jq .Credentials.AccessKeyId | xargs)\nexport AWS_SECRET_ACCESS_KEY=$(echo\
-          \ $temp_role | jq .Credentials.SecretAccessKey | xargs)\nexport AWS_SESSION_TOKEN=$(echo\
-          \ $temp_role | jq .Credentials.SessionToken | xargs)\nmake test\n"
+        command: |
+          temp_role=$(aws sts assume-role --role-arn arn:aws:iam::313564602749:role/circleci --role-session-name circleci)
+          export AWS_ACCESS_KEY_ID=$(echo $temp_role | jq .Credentials.AccessKeyId | xargs)
+          export AWS_SECRET_ACCESS_KEY=$(echo $temp_role | jq .Credentials.SecretAccessKey | xargs)
+          export AWS_SESSION_TOKEN=$(echo $temp_role | jq .Credentials.SessionToken | xargs)
+          make test
         name: Assume role, run pre-commit and run terratest
     - save_cache:
         key: pre-commit-dot-cache-{{ checksum ".pre-commit-config.yaml" }}
@@ -26,8 +29,6 @@ jobs:
         key: go-mod-sources-v1-{{ checksum "go.sum" }}
         paths:
         - ~/go/pkg/mod
-references:
-  circleci: trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c
 version: 2.1
 workflows:
   validate:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v3.4.0
     hooks:
       - id: check-json
       - id: check-merge-conflict
@@ -12,7 +12,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: git://github.com/igorshubovych/markdownlint-cli
-    rev: v0.25.0
+    rev: v0.26.0
     hooks:
       - id: markdownlint
 

diff --git a/README.md b/README.md
@@ -25,8 +25,6 @@ Terraform 0.13. Pin module version to ~> 4.0. Submit pull-requests to master bra
 
 Terraform 0.12. Pin module version to ~> 3.0. Submit pull-requests to terraform012 branch.
 
-Terraform 0.11. Pin module version to ~> 1.14. Submit pull-requests to terraform011 branch.
-
 ## Usage
 
 ### ECS service associated with an Application Load Balancer (ALB)
@@ -107,14 +105,14 @@ module "app_ecs_service" {
 
 | Name | Version |
 |------|---------|
-| terraform | ~> 0.13 |
-| aws | >= 2.70, < 4.0 |
+| terraform | >= 0.13 |
+| aws | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | >= 2.70, < 4.0 |
+| aws | >= 3.0 |
 
 ## Inputs
 

diff --git a/examples/load-balancer/main.tf b/examples/load-balancer/main.tf
@@ -6,7 +6,7 @@ locals {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 2.50.0"
+  version = "~> 2.64.0"
 
   name = var.test_name
   cidr = "10.0.0.0/16"

diff --git a/examples/load-balancer/versions.tf b/examples/load-balancer/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 0.13"
+  required_version = ">= 0.13"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 2.70, < 4.0"
+      version = ">= 2.70"
     }
   }
-}
+}
diff --git a/examples/no-load-balancer/main.tf b/examples/no-load-balancer/main.tf
@@ -5,7 +5,7 @@ locals {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 2.50.0"
+  version = "~> 2.64.0"
 
   name = var.test_name
   cidr = "10.0.0.0/16"

diff --git a/examples/no-load-balancer/versions.tf b/examples/no-load-balancer/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 0.13"
+  required_version = ">= 0.13"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 2.70, < 4.0"
+      version = ">= 2.70"
     }
   }
-}
+}
diff --git a/main.tf b/main.tf
@@ -1,7 +1,7 @@
 locals {
-  awslogs_group         = "${var.logs_cloudwatch_group == "" ? "/ecs/${var.environment}/${var.name}" : var.logs_cloudwatch_group}"
-  target_container_name = "${var.target_container_name == "" ? "${var.name}-${var.environment}" : var.target_container_name}"
-  cloudwatch_alarm_name = "${var.cloudwatch_alarm_name == "" ? "${var.name}-${var.environment}" : var.cloudwatch_alarm_name}"
+  awslogs_group         = var.logs_cloudwatch_group == "" ? "/ecs/${var.environment}/${var.name}" : var.logs_cloudwatch_group
+  target_container_name = var.target_container_name == "" ? "${var.name}-${var.environment}" : var.target_container_name
+  cloudwatch_alarm_name = var.cloudwatch_alarm_name == "" ? "${var.name}-${var.environment}" : var.cloudwatch_alarm_name
 
   # for each target group, allow ingress from the alb to ecs container port
   lb_ingress_container_ports = distinct(
@@ -143,7 +143,7 @@ resource "aws_cloudwatch_metric_alarm" "alarm_mem" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "alarm_cpu_no_lb" {
-  count = var.cloudwatch_alarm_cpu_enable && ! (var.associate_alb || var.associate_nlb) ? 1 : 0
+  count = var.cloudwatch_alarm_cpu_enable && !(var.associate_alb || var.associate_nlb) ? 1 : 0
 
   alarm_name        = "${local.cloudwatch_alarm_name}-cpu"
   alarm_description = "Monitors ECS CPU Utilization when no load balancer is attached"
@@ -164,7 +164,7 @@ resource "aws_cloudwatch_metric_alarm" "alarm_cpu_no_lb" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "alarm_mem_no_lb" {
-  count = var.cloudwatch_alarm_mem_enable && ! (var.associate_alb || var.associate_nlb) ? 1 : 0
+  count = var.cloudwatch_alarm_mem_enable && !(var.associate_alb || var.associate_nlb) ? 1 : 0
 
   alarm_name        = "${local.cloudwatch_alarm_name}-mem"
   alarm_description = "Monitors ECS memory Utilization when no load balancer is attached"
@@ -496,7 +496,7 @@ resource "aws_ecs_service" "main" {
   deployment_minimum_healthy_percent = var.tasks_minimum_healthy_percent
   deployment_maximum_percent         = var.tasks_maximum_percent
 
-  dynamic ordered_placement_strategy {
+  dynamic "ordered_placement_strategy" {
     for_each = local.ecs_service_ordered_placement_strategy[local.ecs_service_launch_type]
 
     content {
@@ -505,7 +505,7 @@ resource "aws_ecs_service" "main" {
     }
   }
 
-  dynamic placement_constraints {
+  dynamic "placement_constraints" {
     for_each = local.ecs_service_placement_constraints[local.ecs_service_launch_type]
 
     content {
@@ -519,7 +519,7 @@ resource "aws_ecs_service" "main" {
     assign_public_ip = var.assign_public_ip
   }
 
-  dynamic load_balancer {
+  dynamic "load_balancer" {
     for_each = var.lb_target_groups
     content {
       container_name   = local.target_container_name
@@ -528,7 +528,7 @@ resource "aws_ecs_service" "main" {
     }
   }
 
-  dynamic service_registries {
+  dynamic "service_registries" {
     for_each = var.service_registries
     content {
       registry_arn   = service_registries.value.registry_arn
@@ -565,7 +565,7 @@ resource "aws_ecs_service" "main_no_lb" {
   deployment_minimum_healthy_percent = var.tasks_minimum_healthy_percent
   deployment_maximum_percent         = var.tasks_maximum_percent
 
-  dynamic ordered_placement_strategy {
+  dynamic "ordered_placement_strategy" {
     for_each = local.ecs_service_ordered_placement_strategy[local.ecs_service_launch_type]
     #    for_each = var.ecs_use_fargate ? [] : ["attribute:ecs.availability-zone", "instanceId"]
 
@@ -575,7 +575,7 @@ resource "aws_ecs_service" "main_no_lb" {
     }
   }
 
-  dynamic placement_constraints {
+  dynamic "placement_constraints" {
     for_each = local.ecs_service_placement_constraints[local.ecs_service_launch_type]
     #    for_each = var.ecs_use_fargate ? [] : ["distinctInstance"]
 
@@ -590,7 +590,7 @@ resource "aws_ecs_service" "main_no_lb" {
     assign_public_ip = var.assign_public_ip
   }
 
-  dynamic service_registries {
+  dynamic "service_registries" {
     for_each = var.service_registries
     content {
       registry_arn   = service_registries.value.registry_arn

diff --git a/versions.tf b/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 0.13"
+  required_version = ">= 0.13"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 2.70, < 4.0"
+      version = ">= 3.0"
     }
   }
 }