Migrate to Terraform 0.12 (techservicesillinois#34)

Author: JonRoma

.dockerignore

@@ -0,0 +1,7 @@
+*.swp
+
+terraform.tfstate
+terraform.tfstate.*
+
+.terraform
+.terragrunt-cache

.drone.yml

@@ -0,0 +1,11 @@
+pipeline:
+  build:
+    image: hashicorp/terraform
+    commands:
+      - apk add make
+      - make tfc
+  linter:
+    image: python:3
+    commands:
+      - pip3 install --extra-index-url https://pip-test.techservices.illinois.edu/index/test tflint
+      - make test

.gitignore

@@ -1,2 +1,7 @@
-#Pipenv files
-Pipfile
+*.swp
+
+terraform.tfstate
+terraform.tfstate.*
+
+.terraform
+.terragrunt-cache

Dockerfile

@@ -0,0 +1,17 @@
+FROM hashicorp/terraform
+
+RUN apk add make
+
+WORKDIR /tmp
+COPY . /tmp
+
+ENTRYPOINT [ "/usr/bin/make", "tfc" ]
+
+FROM python:3
+
+RUN pip3 install --extra-index-url https://pip-test.techservices.illinois.edu/index/test tflint
+
+WORKDIR /tmp
+COPY . /tmp
+
+ENTRYPOINT [ "/usr/bin/make", "test" ]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 by the Board of Trustees of the University of Illinois.
+Copyright (c) 2019 by the Board of Trustees of the University of Illinois.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -0,0 +1,74 @@
+.PHONY: test tfc clean docker sh shell
+
+REPO := $(shell basename $(shell git remote get-url origin) .git)
+
+GOPTS := -lR . -e
+GREP := grep $(GOPTS)
+EGREP := egrep $(GOPTS)
+SRCS := --include=*.tf
+DOCS := --include=README.md
+
+all: tfc test
+
+tfc: .terraform
+	@# Basic Terraform validation and formating checks
+	terraform version
+	AWS_DEFAULT_REGION=us-east-2 terraform validate
+	terraform fmt -check
+
+# Create .terraform if does not exist
+# A terraform init is requried to run a validate :-(
+.terraform:
+	terraform init -backend=false
+	terraform version
+
+test:
+	@####################################################
+	! $(EGREP) "TF-UPGRADE-TODO|cites-illinois|as-aws-modules" $(SRCS) $(DOCS)
+	# Do NOT put terraform-aws in the title of the top-level README
+	! grep "#\s*terraform-aws-" README.md
+	# Do NOT use type string when you can use type number or bool!
+	! $(EGREP) '"\d+"|"true"|"false"' $(SRCS) $(DOCS)
+	# Do NOT use old style maps in docs
+	! $(EGREP) "\w+\s*\{" $(DOCS)
+	# Do NOT drop the "s" in outputs.tf or variables.tf!
+	! find . -name output.tf -o -name variable.tf | grep '.*'
+	# Do NOT define an output in files other than outputs.tf
+	! $(EGREP) 'output\s+"\w+"\s*\{' $(SRCS) --exclude=outputs.tf
+	# Do NOT define a variable in files other than variables.tf
+	! $(EGREP) 'variable\s+"\w+"\s*\{' $(SRCS) --exclude=variables.tf
+	# DO put a badge in top-level README.md
+	grep -q "\[\!\[Build Status\]([^)]*$(REPO)/status.svg)\]([^)]*$(REPO))" README.md
+	# Do NOT split a source line over more than one line
+	! $(GREP) 'source\s*=\s*$$' $(SRCS) $(DOCS)
+	# Do NOT use ?ref= in source lines in a README.md!
+	! $(GREP) 'source\s*=.*?ref=' $(DOCS)
+	# Do NOT start a source line with git::
+	! $(GREP) 'source\s*=\s*"git::' $(SRCS) $(DOCS)
+	# Do NOT use .git in a source line
+	! $(GREP) 'source\s*=.*\.git.*"' $(SRCS) $(DOCS)
+	# Do NOT use double slashes with top-level modules
+	! $(GREP) 'source\s*=.*//?ref=.*"' $(SRCS) $(DOCS)
+	# Do NOT leave extra whitespace at the end of a line
+	! $(EGREP) '\s+$$' $(SRCS)
+	# Do NOT leave empty lines at the start or end of a file
+	! find . -type f -name "*.tf" -exec sh -c "awk 'NR==1; END{print}' {} | egrep -q '^\s*$$' && echo {}" \; | grep '.*'
+	@# Run tflint if it is installed
+	@if which tflint >/dev/null; then tflint ; fi
+
+# Launches the Makefile inside a container
+docker:
+	docker build . -t test/$(REPO)
+	docker run --rm test/$(REPO)
+
+# Create alias
+sh: shell
+
+# Launches the shell inside a container for debugging the Makefile
+shell:
+	docker build . -t test/$(REPO)
+	docker run -it --rm --entrypoint=sh test/$(REPO)
+
+clean:
+	-rm -rf .terraform
+	-docker rmi -f test/$(REPO) >/dev/null 2>&1

README.md

@@ -1,5 +1,7 @@
 # ecs-service
 
+[![Build Status](https://drone.techservices.illinois.edu/api/badges/techservicesillinois/terraform-aws-ecs-service/status.svg)](https://drone.techservices.illinois.edu/techservicesillinois/terraform-aws-ecs-service)
+
 Provides an ECS service - effectively a task that is expected to
 run until an error occurs or a user terminates it (typically a
 webserver or a database). This module's primary intent is to make
@@ -57,21 +59,21 @@ module "service_name" {
 
   name = "service_name"
 
-  load_balancer {
+  load_balancer = {
     name           = "load_balancer_name"
     port           = 443
     container_name = "main_container_name"
     container_port = 8080
     host_header    = "myservice.example.com"
   }
 
-  alias {
+  alias = {
     domain   = "example.com"
     hostname = "myservice"
   }
 
-  network_configuration {
-    assign_public_ip = "true"
+  network_configuration = {
+    assign_public_ip = true
     tier             = "public"
     vpc              = "my-vpc"
   }
@@ -85,11 +87,11 @@ module "service_name" {
 
   name  = "service_name"
 
-  service_discovery {
+  service_discovery = {
     namespace_id = "ns-cxn6fqejoygbxan5"
   }
 
-  network_configuration {
+  network_configuration = {
     tier = "nat"
     vpc  = "my-vpc"
   }
@@ -105,20 +107,20 @@ module "service_name" {
   name        = "service_name"
   launch_type = "EC2"
 
-  load_balancer {
+  load_balancer = {
     name           = "load_balancer_name"
     port           = 443
     container_name = "main_container_name"
     container_port = 8080
     host_header    = "myservice.example.com"
   }
 
-  alias {
+  alias = {
     domain   = "example.com"
     hostname = "myservice"
   }
 
-  task_definition {
+  task_definition = {
     network_mode = "bridge"
   }
 }
@@ -136,15 +138,15 @@ module "service_name" {
   task_definition_arn = "task_definition_name:revision"
   desired_count       = 3
 
-  load_balancer {
+  load_balancer = {
     name           = "load_balancer_name"
     port           = 443
     container_name = "main_container_name"
     container_port = 8080
     host_header    = "myservice.example.com"
   }
 
-  alias {
+  alias = {
     domain   = "example.com"
     hostname = "myservice"
   }
@@ -166,28 +168,28 @@ module "service_name" {
 ```
 ### Configure autoscaling policy and cloudwatch alarms for ECS service
 ```hcl
-autoscale {
-  autoscale_max_capacity        = "5"
+autoscale = {
+  autoscale_max_capacity        = 5
   metric_name                   = "CPUUtilization"
-  datapoints_to_alarm           = "1" 
-  evaluation_periods            = "1"
-  period                        = "60"
-  cooldown                      = "60"
+  datapoints_to_alarm           = 1 
+  evaluation_periods            = 1
+  period                        = 60
+  cooldown                      = 60
   adjustment_type               = "ChangeInCapacity"
 
   ### Cloudwatch Alaram Scale up and Scale down ###
-  scale_up_threshold            = "70"
-  scale_down_threshold          = "40"
+  scale_up_threshold            = 70
+  scale_down_threshold          = 40
 
   ### AutoScale Policy Scale up ###
   scale_up_comparison_operator   = "GreaterThanOrEqualToThreshold"
-  scale_up_interval_lower_bound  = "1"
-  scale_up_adjustment            = "1"
+  scale_up_interval_lower_bound  = 1
+  scale_up_adjustment            = 1
   
   ### AutoScale Policy Scale down ###
   scale_down_comparison_operator   = "LessThanThreshold"
-  scale_down_interval_lower_bound  = "0"
-  scale_down_adjustment            = "-1"
+  scale_down_interval_lower_bound  = 0
+  scale_down_adjustment            = -1
 
 }
 ```