Merge pull request #2 from asicsdigital/terraform12

Upgrade Module to Terraform 0.12.9

.envrc

@@ -0,0 +1 @@
+dotenv

.terraform-version

@@ -0,0 +1 @@
+0.12.9

locals.tf

@@ -1,3 +1,7 @@
 locals {
-  x_manual_auth_secret_target_string = "${coalesce(var.x_manual_auth_secret, random_id.default_x_manual_auth_secret.b64)}"
+  x_manual_auth_secret_target_string = coalesce(
+    var.x_manual_auth_secret,
+    random_id.default_x_manual_auth_secret.b64,
+  )
 }
+

main.tf

@@ -7,14 +7,14 @@ resource "aws_wafregional_byte_match_set" "byte_match" {
   name = "${var.waf_name_alpha}ByteMatch"
 
   byte_match_tuples {
-    "field_to_match" {
+    field_to_match {
       type = "HEADER"
       data = "x-manual-auth"
     }
 
     positional_constraint = "EXACTLY"
     text_transformation   = "NONE"
-    target_string         = "${local.x_manual_auth_secret_target_string}"
+    target_string         = local.x_manual_auth_secret_target_string
   }
 }
 
@@ -23,14 +23,14 @@ resource "aws_wafregional_rule" "auth_rule" {
   name        = "${var.waf_name_alpha}Rule"
 
   predicate {
-    data_id = "${aws_wafregional_byte_match_set.byte_match.id}"
+    data_id = aws_wafregional_byte_match_set.byte_match.id
     negated = false
     type    = "ByteMatch"
   }
 }
 
 resource "aws_wafregional_web_acl" "auth_acl" {
-  "default_action" {
+  default_action {
     type = "BLOCK"
   }
 
@@ -43,11 +43,12 @@ resource "aws_wafregional_web_acl" "auth_acl" {
     }
 
     priority = 1
-    rule_id  = "${aws_wafregional_rule.auth_rule.id}"
+    rule_id  = aws_wafregional_rule.auth_rule.id
   }
 }
 
 resource "aws_wafregional_web_acl_association" "alb_association" {
-  resource_arn = "${var.alb_arn}"
-  web_acl_id   = "${aws_wafregional_web_acl.auth_acl.id}"
+  resource_arn = var.alb_arn
+  web_acl_id   = aws_wafregional_web_acl.auth_acl.id
 }
+

outputs.tf

@@ -1,11 +1,12 @@
 # provide the secret, needed if it was randomly generated
 
 output "x_manual_auth_target_string" {
-  value       = "${local.x_manual_auth_secret_target_string}"
+  value       = local.x_manual_auth_secret_target_string
   description = "Secret that this WAF will check for in x-manual-auth header"
   sensitive   = true
 }
 
 output "test_authentication_curl_command" {
   value = "curl -H \"x-manual-auth: ${local.x_manual_auth_secret_target_string}\" https://<your application hostname here>"
 }
+

variables.tf

@@ -10,3 +10,4 @@ variable "x_manual_auth_secret" {
 variable "waf_name_alpha" {
   description = "Name for WAF resources. Note this needs to be alphanumeric only."
 }
+