Apply automatic changes

actions-user · Linter Bot · commit 3a5fb553eb76 · 2022-04-28T14:15:34.000Z
diff --git a/README.md b/README.md
@@ -230,6 +230,7 @@ For any issues relating to this module, [raise an issue against this repo.](http
 | <a name="input_aws_account_id"></a> [aws\_account\_id](#input\_aws\_account\_id) | The AWS account ID into which resources will be launched. | `string` | n/a | yes |
 | <a name="input_cloudfront_aliases"></a> [cloudfront\_aliases](#input\_cloudfront\_aliases) | The domain and sub-domain aliases to use for the cloudfront distribution. | `list(any)` | `[]` | no |
 | <a name="input_cloudfront_class"></a> [cloudfront\_class](#input\_cloudfront\_class) | The [price class](https://aws.amazon.com/cloudfront/pricing/) for the distribution. One of: PriceClass\_All, PriceClass\_200, PriceClass\_100 | `string` | `"PriceClass_All"` | no |
+| <a name="input_cloudfront_function_301_redirects"></a> [cloudfront\_function\_301\_redirects](#input\_cloudfront\_function\_301\_redirects) | A list of key value pairs of Regex match and destination for 301 redirects at CloudFront. | `map` | <pre>{<br>  "^(.*)index\\.php$": "$1"<br>}</pre> | no |
 | <a name="input_ecs_cpu"></a> [ecs\_cpu](#input\_ecs\_cpu) | The CPU limit password to the Wordpress container definition. | `number` | `256` | no |
 | <a name="input_ecs_memory"></a> [ecs\_memory](#input\_ecs\_memory) | The memory limit password to the Wordpress container definition. | `number` | `512` | no |
 | <a name="input_graviton_codebuild_enabled"></a> [graviton\_codebuild\_enabled](#input\_graviton\_codebuild\_enabled) | Flag that controls whether CodeBuild should use Graviton-based build agents in [supported regions](https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html). | `bool` | `false` | no |
diff --git a/modules/cloudfront/README.md b/modules/cloudfront/README.md
@@ -9,6 +9,7 @@ This module sets up the CloudFront distribution that fronts the static wordpress
 |------|-------------|------|---------|:--------:|
 | <a name="input_cloudfront_aliases"></a> [cloudfront\_aliases](#input\_cloudfront\_aliases) | The domain and sub-domain aliases to use for the cloudfront distribution. | `list(any)` | `[]` | no |
 | <a name="input_cloudfront_class"></a> [cloudfront\_class](#input\_cloudfront\_class) | The [price class](https://aws.amazon.com/cloudfront/pricing/) for the distribution. One of: PriceClass\_All, PriceClass\_200, PriceClass\_100 | `string` | `"PriceClass_All"` | no |
+| <a name="input_cloudfront_function_301_redirects"></a> [cloudfront\_function\_301\_redirects](#input\_cloudfront\_function\_301\_redirects) | A list of key value pairs of Regex match and destination for 301 redirects at CloudFront. | `map` | <pre>{<br>  "^(.*)index\\.php$": "$1"<br>}</pre> | no |
 | <a name="input_cloudfront_ssl"></a> [cloudfront\_ssl](#input\_cloudfront\_ssl) | The ARN of the ACM certificate used for the CloudFront domain. | `string` | n/a | yes |
 | <a name="input_site_domain"></a> [site\_domain](#input\_site\_domain) | The site domain name to configure (without any subdomains such as 'www') | `string` | n/a | yes |
 | <a name="input_site_name"></a> [site\_name](#input\_site\_name) | The unique name for this instance of the module. Required to deploy multiple wordpress instances to the same AWS account (if desired). | `string` | n/a | yes |
@@ -33,19 +34,11 @@ No requirements.
 | Name | Type |
 |------|------|
 | [aws_cloudfront_distribution.wordpress_distribution](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_distribution) | resource |
+| [aws_cloudfront_function.object_rewrite](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_function) | resource |
 | [aws_cloudfront_origin_access_identity.wordpress_distribution](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_origin_access_identity) | resource |
-| [aws_cloudwatch_log_group.object_redirect](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
-| [aws_cloudwatch_log_group.object_redirect_ue1](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
-| [aws_cloudwatch_log_group.object_redirect_ue1_local](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
-| [aws_iam_role.lambda-edge](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
-| [aws_iam_role_policy.lambda-edge-cloudwatch-logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
-| [aws_iam_role_policy_attachment.basic](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
-| [aws_lambda_function.object_redirect](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
+| [aws_cloudwatch_log_group.object_rewrite](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
 | [aws_s3_bucket.wordpress_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
 | [aws_s3_bucket_policy.wordpress_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_policy) | resource |
 | [aws_s3_bucket_public_access_block.wordpress_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block) | resource |
 | [aws_s3_bucket_server_side_encryption_configuration.wordpress_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_server_side_encryption_configuration) | resource |
-| [archive_file.index_html](https://registry.terraform.io/providers/hashicorp/archive/latest/docs/data-sources/file) | data source |
-| [aws_iam_policy_document.lambda-edge-cloudwatch-logs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
-| [aws_iam_policy_document.lambda-edge-service-role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 <!-- END_TF_DOCS -->
diff --git a/modules/cloudfront/function_rewrite/index.js.tftpl b/modules/cloudfront/function_rewrite/index.js.tftpl
@@ -1,7 +1,7 @@
 function handler(event) {
     var request = event.request;
-    var uri = request.uri; 
-    
+    var uri = request.uri;
+
     try {
         %{ for match, target in REDIRECTS }
         if (/${match}/.test(uri)) {
@@ -12,7 +12,7 @@ function handler(event) {
         // Check whether the URI is missing a file name.
         if (uri.endsWith('/')) {
             request.uri += 'index.html';
-            return request;        
+            return request;
         }
     }
     catch (e) {
diff --git a/modules/cloudfront/main.tf b/modules/cloudfront/main.tf
@@ -4,18 +4,18 @@ resource "aws_cloudwatch_log_group" "object_rewrite" {
   retention_in_days = 7
   # CloudFront Functions always creates log streams in us-east-1, no matter which edge location ran the function.
   # The purpose of this resource is to set the retention days.
-  provider          = aws.ue1
+  provider = aws.ue1
 }
 
 resource "aws_cloudfront_function" "object_rewrite" {
   depends_on = [
     aws_cloudwatch_log_group.object_rewrite
   ]
-  
+
   name    = "${var.site_name}_rewrite"
   runtime = "cloudfront-js-1.0"
   publish = true
-  code    = templatefile(
+  code = templatefile(
     "${path.module}/function_rewrite/index.js.tftpl",
     {
       REDIRECTS = var.cloudfront_function_301_redirects
diff --git a/modules/cloudfront/variables.tf b/modules/cloudfront/variables.tf
@@ -38,9 +38,9 @@ variable "waf_acl_arn" {
 }
 
 variable "cloudfront_function_301_redirects" {
-  type        = map
-  default     = {
-    "^(.*)index\\.php$": "$1"
+  type = map(any)
+  default = {
+    "^(.*)index\\.php$" : "$1"
   }
   description = "A list of key value pairs of Regex match and destination for 301 redirects at CloudFront."
 }
diff --git a/variables.tf b/variables.tf
@@ -105,9 +105,9 @@ variable "cloudfront_class" {
 }
 
 variable "cloudfront_function_301_redirects" {
-  type        = map
-  default     = {
-    "^(.*)index\\.php$": "$1"
+  type = map(any)
+  default = {
+    "^(.*)index\\.php$" : "$1"
   }
   description = "A list of key value pairs of Regex match and destination for 301 redirects at CloudFront."
 }

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ variable "waf_acl_arn" {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`variable "cloudfront_function_301_redirects" {`
`41`		`- type = map`
`42`		`- default = {`
`43`		`- "^(.*)index\\.php$": "$1"`
	`41`	`+ type = map(any)`
	`42`	`+ default = {`
	`43`	`+ "^(.*)index\\.php$" : "$1"`
`44`	`44`	`}`
`45`	`45`	`description = "A list of key value pairs of Regex match and destination for 301 redirects at CloudFront."`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,9 @@ variable "cloudfront_class" {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`variable "cloudfront_function_301_redirects" {`
`108`		`- type = map`
`109`		`- default = {`
`110`		`- "^(.*)index\\.php$": "$1"`
	`108`	`+ type = map(any)`
	`109`	`+ default = {`
	`110`	`+ "^(.*)index\\.php$" : "$1"`
`111`	`111`	`}`
`112`	`112`	`description = "A list of key value pairs of Regex match and destination for 301 redirects at CloudFront."`
`113`	`113`	`}`