Fixed description typo, and modified the sql injection rule creation …

…and xss detection rule creation to deal with a bug since 0.9.6 and present in 0.9.11 -- see here: hashicorp/terraform-provider-aws#1107
cerbo · Jul 11, 2017 · 325b37d · 325b37d
1 parent 03c6075
commit 325b37d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.template.main.tf b/.template.main.tf
@@ -19,22 +19,18 @@
 # see: 'Change this line' #
 ###########################
 provider "aws" {
-    # Change this line:
+    # *** Change ONLY THIS LINE: ***
     shared_credentials_file  = "/Users/user/.aws/credentials"
     region = "${var.aws_region}"
 }
 
 variable "customer" {
     description = "[REQUIRED] Customer/Project Name (max 15 characters):"
-
-    # Change this line:
     default     = "cerboXYZcerbo"
 }
 
 variable "CloudFrontAccessLogBucket" {
     description = "[REQUIRED] CDN S3 Logs Bucket:"
-
-    # Change this line:
     default     = "cerboZYXcerbo"
 }
 ###############################################################################

diff --git a/solutionhelper.tf b/solutionhelper.tf
@@ -17,7 +17,7 @@
 resource "aws_lambda_function" "SolutionHelper" {
     depends_on = ["aws_s3_bucket_object.SolutionHelperZip"]
     function_name = "${var.customer}-SolutionHelper-${element(split("-",uuid()),0)}"
-    descripton = "This lambda function executes generic common tasks to support this solution."
+    description = "This lambda function executes generic common tasks to support this solution."
     role = "${aws_iam_role.SolutionHelperRole.arn}"
     handler = "log-parser.lambda_handler"
     #s3_bucket = "solutions-${var.aws_region}"

diff --git a/wafsqlinjectiondetection.tf b/wafsqlinjectiondetection.tf
@@ -21,36 +21,42 @@ resource "aws_waf_sql_injection_match_set" "WAFSqlInjectionDetection" {
         text_transformation = "URL_DECODE"
         field_to_match {
           type = "QUERY_STRING"
+          data = "none"
         }
     }
     sql_injection_match_tuples {
         text_transformation = "HTML_ENTITY_DECODE"
         field_to_match {
           type = "QUERY_STRING"
+          data = "none"
         }
     }
     sql_injection_match_tuples {
         text_transformation = "URL_DECODE"
         field_to_match {
           type = "BODY"
+          data = "none"
         }
     }
     sql_injection_match_tuples {
         text_transformation = "HTML_ENTITY_DECODE"
         field_to_match {
           type = "BODY"
+          data = "none"
         }
     }
     sql_injection_match_tuples {
         text_transformation = "URL_DECODE"
         field_to_match {
           type = "URI"
+          data = "none"
         }
     }
     sql_injection_match_tuples {
         text_transformation = "HTML_ENTITY_DECODE"
         field_to_match {
           type = "URI"
+          data = "none"
         }
     }
 }
diff --git a/wafxssdetection.tf b/wafxssdetection.tf
@@ -20,36 +20,42 @@ resource "aws_waf_xss_match_set" "WAFXssDetection" {
         text_transformation = "URL_DECODE"
         field_to_match {
             type = "QUERY_STRING"
+            data = "none"
         }
     }
     xss_match_tuples {
         text_transformation = "HTML_ENTITY_DECODE"
         field_to_match {
             type = "QUERY_STRING"
+            data = "none"
         }
     }
     xss_match_tuples {
         text_transformation = "URL_DECODE"
         field_to_match {
             type = "BODY"
+            data = "none"
         }
     }
     xss_match_tuples {
         text_transformation = "HTML_ENTITY_DECODE"
         field_to_match {
             type = "BODY"
+            data = "none"
         }
     }
     xss_match_tuples {
         text_transformation = "URL_DECODE"
         field_to_match {
             type = "URI"
+            data = "none"
         }
     }
     xss_match_tuples {
         text_transformation = "HTML_ENTITY_DECODE"
         field_to_match {
             type = "URI"
+            data = "none"
         }
     }
 }