Merge pull request #19 from chris-qa-org/support-publii-pretty-urls

Support Publii 'Pretty URLs'

Author: Stretch96

README.md

@@ -78,6 +78,7 @@ Terraform module to host a static site generated by Publii
 | <a name="input_cloudfront_enable_ipv6"></a> [cloudfront\_enable\_ipv6](#input\_cloudfront\_enable\_ipv6) | Enable IPv6 on CloudFront | `bool` | `true` | no |
 | <a name="input_cloudfront_enable_waf"></a> [cloudfront\_enable\_waf](#input\_cloudfront\_enable\_waf) | Enable CloudFront WAF | `bool` | `true` | no |
 | <a name="input_cloudfront_tls_certificate_arn"></a> [cloudfront\_tls\_certificate\_arn](#input\_cloudfront\_tls\_certificate\_arn) | CloudFront TLS certificate ARN (must be created in us-east-1 region) | `string` | n/a | yes |
+| <a name="input_enable_publii_pretty_urls"></a> [enable\_publii\_pretty\_urls](#input\_enable\_publii\_pretty\_urls) | If you hae enabled 'Pretty URLs' in Publii, set this to true | `bool` | `false` | no |
 | <a name="input_s3_bucket_acl"></a> [s3\_bucket\_acl](#input\_s3\_bucket\_acl) | S3 bucket ACL | `string` | `"private"` | no |
 | <a name="input_site_url"></a> [site\_url](#input\_site\_url) | The desired site URL | `string` | n/a | yes |
 

cloudfront-frontend-viewer-request-function.tf

@@ -1,5 +1,9 @@
 data "template_file" "cloudfront_frontend_viewer_request_function" {
   template = file("${path.module}/cloudfront-functions/viewer-request.js")
+
+  vars = {
+    append_empty_extension = local.enable_publii_pretty_urls ? "/" : ""
+  }
 }
 
 resource "aws_cloudfront_function" "frontend_viewer_request" {

cloudfront-functions/viewer-request.js

@@ -1,10 +1,24 @@
+%{ if append_empty_extension != "" ~}
+function appendEmptyExtension(filePath, extension) {
+  if(filePath != "/" && filePath.indexOf('.') == -1) {
+    return filePath.concat("", extension);
+  }
+  return filePath;
+}
+%{ endif ~}
 function handler(event) {
   // default variables
   var req = event.request;
   var clientIp = event.viewer.ip;
 
   // set true-client-ip header
   req.headers['true-client-ip'] = {value: clientIp};
+  %{~ if append_empty_extension != "" ~}
+  // append empty extension
+  var newUri = appendEmptyExtension(req.uri, "${append_empty_extension}");
+  req.uri = newUri.replace("\/\/", "/", newUri);
+  %{~ endif ~}
+
 
   // return request
   return req;

locals.tf

@@ -6,4 +6,5 @@ locals {
   cloudfront_enable_ipv6                 = var.cloudfront_enable_ipv6
   cloudfront_enable_waf                  = var.cloudfront_enable_waf
   cloudfront_enable_apex_to_www_redirect = var.cloudfront_enable_apex_to_www_redirect
+  enable_publii_pretty_urls              = var.enable_publii_pretty_urls
 }

variables.tf

@@ -31,3 +31,9 @@ variable "cloudfront_enable_apex_to_www_redirect" {
   type        = bool
   default     = true
 }
+
+variable "enable_publii_pretty_urls" {
+  description = "If you hae enabled 'Pretty URLs' in Publii, set this to true"
+  type        = bool
+  default     = false
+}