From cac939e31fed621d38ec108cfd4037b78e99b79a Mon Sep 17 00:00:00 2001
From: Daniel Tomlinson <dtomlinson@panaetius.co.uk>
Date: Tue, 21 Jul 2020 23:26:23 +0100
Subject: [PATCH] Updating terraform

---
 .../lambda/prod-panaetius-blog-lambda/main.js |  13 +-
 .../prod-panaetius-blog-lambda/main.js.zip    | Bin 0 -> 601 bytes
 .../prod-panaetius-blog-lambda/main.zip       | Bin 546 -> 0 bytes
 infrastructure/main.tf                        |  63 ++++----
 .../prod-eu-west-1/terraform.tfstate          | 151 ++++++-----------
 .../prod-eu-west-1/terraform.tfstate.backup   | 153 ++++++------------
 .../variables/prod-eu-west-1.tfvars           |   2 +-
 7 files changed, 135 insertions(+), 247 deletions(-)
 create mode 100644 infrastructure/lambda/prod-panaetius-blog-lambda/main.js.zip
 delete mode 100644 infrastructure/lambda/prod-panaetius-blog-lambda/main.zip

diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.js b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js
index 8ddc9f2..6c9f2bf 100644
--- a/infrastructure/lambda/prod-panaetius-blog-lambda/main.js
+++ b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js
@@ -5,10 +5,17 @@ exports.handler = (event, context, callback) => {
   var request = event.Records[0].cf.request;
 
   // Extract the URI from the request
-  var oldURI = request.url;
+  var oldURI = request.uri;
 
   // Match any '/' that occurs at the end of a URI. Replace it with a default index
-  var newURI = oldURI.replace(/\/$, '\/index.html'/);
+  function replace_uri(uri) {
+    uri = uri.replace(/\/$/, "/index.html");
+    // uri = uri.replace(/\.io\/search\?q\=(.*)/, ".io/search/index.html?q=$1");
+    // console.log(uri)
+    return uri;
+  }
+  // var newURI = oldURI.replace(/\/$/, "/index.html");
+  var newURI = replace_uri(oldURI);
 
   // Log the URI as received by Cloudfront and the new URI to be used to fetch from the origin
   console.log(`Old URI: ${oldURI}`);
@@ -18,5 +25,5 @@ exports.handler = (event, context, callback) => {
   request.uri = newURI;
 
   // Return to Cloudfront
-  return callback(null, request)
+  return callback(null, request);
 };
diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.js.zip b/infrastructure/lambda/prod-panaetius-blog-lambda/main.js.zip
new file mode 100644
index 0000000000000000000000000000000000000000..bfff512512451196e00197d92602eee1e58489f2
GIT binary patch
literal 601
zcmWIWW@Zs#-~d7f2E{HQ0SD|rR&HWuo?cdQOR#UYw4unJ_v<Bm6z&OadAl`jw$sUl
z6SgJ1SgF^mv-fM)sYz@3Z!7-TFYdYf+$^yw!%vqp?(M1Ey!i#EorUV5oWRhMTan^6
zuXj$IB@=b#rGwfX#|YsUQ}|+Dn~Lwx-Xi}Yh|#yXJ-8r-rDfiO4EdAnCFk;rA5PvD
zSaxn!!<p6#pBbJ${4C$?zAx7M-$%#16-<10Vl8fcYSQ(LQ2*P%-G1ha8wI;p{LA}S
z`}614j}6imYp1>3CVN`P$~36vq2rea&m^~>&Api3+HtN~JkCgH8?!&J#I!A!V+2AD
z1h&e_OtO+IZ7`bTCwjqExoH#II){4K<<Bmzw6bP%S$<(zycxr@v#WMyzB9-+Vtsu$
z?EEWNHuJOgAAN3yKJK)>xc=Su)n(`IUFmGpw4S0K^Zoa?XLnlyA|9_*TlQA%^{G;K
zMXTl<o&vplD(`t@yUULr`QN>-%H-<;fh&tY_Lmjkl>T0z;vwsi^w*}B*W73^kF2p#
z#2U_vlYNf&UHYUKz1=T&%E|)MN0-fYFJJz?qf%4ooPXpC(HGed{TC?NHFsSqe6AYN
zd`3l0Jz>s5m)jh&sy}1So=Z4hyiNV0v$e#RTMDz~-=utcwQ2Il)w5@>_<GkPM1R%i
zMZbg@82<kc@Mh<Dzx#CfO-2TWBg_m80p5&EBFu>NfGh_}4=}K#5yXO~jsR~~HV~H)
M2u*=B9}|cN05+xs(f|Me

literal 0
HcmV?d00001

diff --git a/infrastructure/lambda/prod-panaetius-blog-lambda/main.zip b/infrastructure/lambda/prod-panaetius-blog-lambda/main.zip
deleted file mode 100644
index 8913aa049804cde1ce8bb7b5067aeb1ca23237d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 546
zcmWIWW@Zs#U|`^2NSggI;A-KwraDFjhO0~r4D1Xt47rJ!d3ssJp&^_M%oT41<12x<
zw1S&~k>x8;6<A|xkasqdp}@ZP>m^)nh^B0R-nBHqMkI&Z$$x8t+05DtGj7<Fxc+&6
zHu<{lTiuywYSy1TlEso6;(az{qRI`~B}P{H9SJg`I*Nytxs2JhS`VI+=XkEVFy1)A
z?tm(z23JI>n_$)f6ArHZx>?LqC;bkncy!6AT$qh%nzj)0S~gidp=&AeMxS;hnOf~o
z4m9scopZw6V`<W_$M1}nhu+(7we$ap`{w7B3-4b~_B!|Hb&<yNu#b$7S|x5V2&Q{<
zo4lGlC2DD-ON<Cl3hNQ!CmRkjtBWi&Ey(JXW@!`McxR^&&+d5v4>X0`($uYeQjcz%
zaZd5B*h0(vGxL@o&6%)i+Sjw37yWdOe(T^l_4&QR-72T)k2&V*9ThtGcGAz})_do4
z*;n4$CCYd2ZGd;5<@C~R)sN5g-#h$8h&8U<@5uaR*E`<NUNrZD$W%VfBP*(B#`&B`
z`5-V|S7SR*=?b>n1qz9`9~(tY4|yWN*%Nw5T54|l!~nT}iE28}KQm@bixEG`AK=Z%
uB*%;^0wsVE%fJAPDTXDDAQn72Ss~Gh7L@_stZX1<j6moMr1yh#G5`QX_tC-t

diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index 76e1ac0..8ccdb20 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -35,16 +35,11 @@ module "cloudfront_s3_cdn" {
   tags                     = local.tags
   aliases                  = var.aliases
   index_document           = "index.html"
-
-  ordered_cache = [
+  lambda_function_association = [
     {
-      lambda_function_association = [
-        {
-          event_type : "origin-request",
-          lambda_arn : aws_lambda_function.directory_indexes.qualified_arn,
-          include_body : false
-        }
-      ]
+      event_type : "origin-request",
+      lambda_arn : aws_lambda_function.directory_indexes.qualified_arn,
+      include_body : false
     }
   ]
 
@@ -65,34 +60,42 @@ module "cloudfront_s3_cdn" {
   EOT
 }
 
-# cloudfront lambda@edge
+# # cloudfront lambda@edge
 
-resource "aws_s3_bucket" "lambda_s3" {
-  provider = aws.us_east_1
-  region   = var.s3_region
-  bucket   = "${var.stage}-${var.name}-lambda-function"
-  acl      = var.acl
-  tags     = local.tags
+# resource "aws_s3_bucket" "lambda_s3" {
+#   provider = aws.us_east_1
+#   region   = var.s3_region
+#   bucket   = "${var.stage}-${var.name}-lambda-function"
+#   acl      = var.acl
+#   tags     = local.tags
+# }
+
+data "archive_file" "lambda_main" {
+  type        = "zip"
+  source_file = var.source_file
+  output_path = "${var.source_file}.zip"
 }
 
-resource "aws_s3_bucket_object" "main" {
-  provider = aws.us_east_1
-  bucket   = aws_s3_bucket.lambda_s3.id
-  key      = var.lambda_key
-  acl      = var.acl
-  source   = var.source_file
-}
+# resource "aws_s3_bucket_object" "main" {
+#   provider = aws.us_east_1
+#   bucket   = aws_s3_bucket.lambda_s3.id
+#   key      = var.lambda_key
+#   acl      = var.acl
+#   source   = var.source_file
+# }
 
 resource "aws_lambda_function" "directory_indexes" {
   provider      = aws.us_east_1
   function_name = "${var.stage}-${var.name}-directory_indexes"
-  s3_bucket     = aws_s3_bucket.lambda_s3.id
-  s3_key        = var.lambda_key
-  handler       = var.handler
-  runtime       = var.runtime
-  role          = aws_iam_role.lambda_role.arn
-  publish       = true
-  tags          = local.tags
+  filename      = "${var.source_file}.zip"
+  source_code_hash = data.archive_file.lambda_main.output_base64sha256
+  # s3_bucket     = aws_s3_bucket.lambda_s3.id
+  # s3_key        = var.lambda_key
+  handler = var.handler
+  runtime = var.runtime
+  role    = aws_iam_role.lambda_role.arn
+  publish = true
+  tags    = local.tags
 
   depends_on = [aws_iam_role_policy_attachment.lambda_logging]
 }
diff --git a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate
index 4da18b0..4e242b5 100644
--- a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate
+++ b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "0.12.26",
-  "serial": 244,
+  "serial": 281,
   "lineage": "cda52006-90fc-4aec-a630-42e69057b365",
   "outputs": {
     "cf_arn": {
@@ -13,7 +13,7 @@
       "type": "string"
     },
     "cf_etag": {
-      "value": "E3169NR3BVK3DJ",
+      "value": "E2UYU85RHS3J18",
       "type": "string"
     },
     "cf_hosted_zone_id": {
@@ -38,6 +38,32 @@
     }
   },
   "resources": [
+    {
+      "mode": "data",
+      "type": "archive_file",
+      "name": "lambda_main",
+      "provider": "provider.archive",
+      "instances": [
+        {
+          "schema_version": 0,
+          "attributes": {
+            "excludes": null,
+            "id": "320d4868dd37d1674e98bd790b8a54b006838d04",
+            "output_base64sha256": "5EVmwQDkgGfYMpMXNaWHUz3cmb/dSssoWl8mM8o3aMs=",
+            "output_md5": "611fc9e8b494e4b399217f632b8e35ed",
+            "output_path": "./lambda/prod-panaetius-blog-lambda/main.js.zip",
+            "output_sha": "320d4868dd37d1674e98bd790b8a54b006838d04",
+            "output_size": 601,
+            "source": [],
+            "source_content": null,
+            "source_content_filename": null,
+            "source_dir": null,
+            "source_file": "./lambda/prod-panaetius-blog-lambda/main.js",
+            "type": "zip"
+          }
+        }
+      ]
+    },
     {
       "module": "module.cloudfront_s3_cdn",
       "mode": "data",
@@ -307,7 +333,7 @@
                   {
                     "event_type": "origin-request",
                     "include_body": false,
-                    "lambda_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:1"
+                    "lambda_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:7"
                   }
                 ],
                 "max_ttl": 31536000,
@@ -321,13 +347,13 @@
             "default_root_object": "index.html",
             "domain_name": "d244ranky0ff54.cloudfront.net",
             "enabled": true,
-            "etag": "E3169NR3BVK3DJ",
+            "etag": "E2UYU85RHS3J18",
             "hosted_zone_id": "Z2FDTNDATAQYW2",
             "http_version": "http2",
             "id": "E2IHXIMPI3MZ2X",
             "in_progress_validation_batches": 0,
             "is_ipv6_enabled": true,
-            "last_modified_time": "2020-07-19 01:54:58.16 +0000 UTC",
+            "last_modified_time": "2020-07-21 21:34:03.839 +0000 UTC",
             "logging_config": [
               {
                 "bucket": "prod-panaetius-blog-logs.s3.amazonaws.com",
@@ -384,6 +410,8 @@
           },
           "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
           "dependencies": [
+            "aws_iam_role.lambda_role",
+            "aws_iam_role_policy_attachment.lambda_logging",
             "aws_lambda_function.directory_indexes",
             "module.cloudfront_s3_cdn.aws_cloudfront_origin_access_identity.default",
             "module.cloudfront_s3_cdn.aws_s3_bucket.origin",
@@ -446,7 +474,7 @@
           "attributes": {
             "arn": "arn:aws:iam::745437999005:role/prod-panaetius-blog-lambda",
             "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":[\"lambda.amazonaws.com\",\"edgelambda.amazonaws.com\"]},\"Action\":\"sts:AssumeRole\"}]}",
-            "create_date": "2020-07-19T01:43:08Z",
+            "create_date": "2020-07-21T20:01:43Z",
             "description": "",
             "force_detach_policies": false,
             "id": "prod-panaetius-blog-lambda",
@@ -459,7 +487,7 @@
               "Description": "terraform resources to host the blog",
               "Project": "panaetius-blog"
             },
-            "unique_id": "AROA23D4RF6OUVG5PVTDO"
+            "unique_id": "AROA23D4RF6O2VEGAGEXM"
           },
           "private": "bnVsbA=="
         }
@@ -474,7 +502,7 @@
         {
           "schema_version": 0,
           "attributes": {
-            "id": "prod-panaetius-blog-lambda-20200719014309715500000001",
+            "id": "prod-panaetius-blog-lambda-20200721200145100500000001",
             "policy_arn": "arn:aws:iam::745437999005:policy/prod-panaetius-blog-lambda_logging",
             "role": "prod-panaetius-blog-lambda"
           },
@@ -500,25 +528,25 @@
             "description": "",
             "environment": [],
             "file_system_config": [],
-            "filename": null,
+            "filename": "./lambda/prod-panaetius-blog-lambda/main.js.zip",
             "function_name": "prod-panaetius-blog-directory_indexes",
             "handler": "main.handler",
             "id": "prod-panaetius-blog-directory_indexes",
             "invoke_arn": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes/invocations",
             "kms_key_arn": "",
-            "last_modified": "2020-07-19T01:48:58.316+0000",
+            "last_modified": "2020-07-21T21:34:00.971+0000",
             "layers": [],
             "memory_size": 128,
             "publish": true,
-            "qualified_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:1",
+            "qualified_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:7",
             "reserved_concurrent_executions": -1,
             "role": "arn:aws:iam::745437999005:role/prod-panaetius-blog-lambda",
             "runtime": "nodejs12.x",
-            "s3_bucket": "prod-panaetius-blog-lambda-function",
-            "s3_key": "main.zip",
+            "s3_bucket": null,
+            "s3_key": null,
             "s3_object_version": null,
-            "source_code_hash": "ltLABbdLTpAeXF5xOPf8vYj2Tq2wvINv206umQzPv0E=",
-            "source_code_size": 546,
+            "source_code_hash": "5EVmwQDkgGfYMpMXNaWHUz3cmb/dSssoWl8mM8o3aMs=",
+            "source_code_size": 601,
             "tags": {
               "Description": "terraform resources to host the blog",
               "Project": "panaetius-blog"
@@ -530,14 +558,13 @@
                 "mode": "PassThrough"
               }
             ],
-            "version": "1",
+            "version": "7",
             "vpc_config": []
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDB9fQ==",
           "dependencies": [
             "aws_iam_role.lambda_role",
-            "aws_iam_role_policy_attachment.lambda_logging",
-            "aws_s3_bucket.lambda_s3"
+            "aws_iam_role_policy_attachment.lambda_logging"
           ]
         }
       ]
@@ -736,53 +763,6 @@
         }
       ]
     },
-    {
-      "mode": "managed",
-      "type": "aws_s3_bucket",
-      "name": "lambda_s3",
-      "provider": "provider.aws.us_east_1",
-      "instances": [
-        {
-          "schema_version": 0,
-          "attributes": {
-            "acceleration_status": "",
-            "acl": "private",
-            "arn": "arn:aws:s3:::prod-panaetius-blog-lambda-function",
-            "bucket": "prod-panaetius-blog-lambda-function",
-            "bucket_domain_name": "prod-panaetius-blog-lambda-function.s3.amazonaws.com",
-            "bucket_prefix": null,
-            "bucket_regional_domain_name": "prod-panaetius-blog-lambda-function.s3.amazonaws.com",
-            "cors_rule": [],
-            "force_destroy": false,
-            "grant": [],
-            "hosted_zone_id": "Z3AQBSTGFYJSTF",
-            "id": "prod-panaetius-blog-lambda-function",
-            "lifecycle_rule": [],
-            "logging": [],
-            "object_lock_configuration": [],
-            "policy": null,
-            "region": "us-east-1",
-            "replication_configuration": [],
-            "request_payer": "BucketOwner",
-            "server_side_encryption_configuration": [],
-            "tags": {
-              "Description": "terraform resources to host the blog",
-              "Project": "panaetius-blog"
-            },
-            "versioning": [
-              {
-                "enabled": false,
-                "mfa_delete": false
-              }
-            ],
-            "website": [],
-            "website_domain": null,
-            "website_endpoint": null
-          },
-          "private": "bnVsbA=="
-        }
-      ]
-    },
     {
       "module": "module.cloudfront_s3_cdn",
       "mode": "managed",
@@ -856,47 +836,6 @@
         }
       ]
     },
-    {
-      "mode": "managed",
-      "type": "aws_s3_bucket_object",
-      "name": "main",
-      "provider": "provider.aws.us_east_1",
-      "instances": [
-        {
-          "schema_version": 0,
-          "attributes": {
-            "acl": "private",
-            "bucket": "prod-panaetius-blog-lambda-function",
-            "cache_control": "",
-            "content": null,
-            "content_base64": null,
-            "content_disposition": "",
-            "content_encoding": "",
-            "content_language": "",
-            "content_type": "binary/octet-stream",
-            "etag": "e93809f5fe6e069bfa1fbee683a28d8c",
-            "force_destroy": false,
-            "id": "main.zip",
-            "key": "main.zip",
-            "kms_key_id": null,
-            "metadata": {},
-            "object_lock_legal_hold_status": "",
-            "object_lock_mode": "",
-            "object_lock_retain_until_date": "",
-            "server_side_encryption": "",
-            "source": "./lambda/prod-panaetius-blog-lambda/main.zip",
-            "storage_class": "STANDARD",
-            "tags": {},
-            "version_id": "",
-            "website_redirect": ""
-          },
-          "private": "bnVsbA==",
-          "dependencies": [
-            "aws_s3_bucket.lambda_s3"
-          ]
-        }
-      ]
-    },
     {
       "module": "module.cloudfront_s3_cdn",
       "mode": "managed",
diff --git a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup
index b5f0714..5453742 100644
--- a/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup
+++ b/infrastructure/terraform.tfstate.d/prod-eu-west-1/terraform.tfstate.backup
@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "0.12.26",
-  "serial": 242,
+  "serial": 278,
   "lineage": "cda52006-90fc-4aec-a630-42e69057b365",
   "outputs": {
     "cf_arn": {
@@ -13,7 +13,7 @@
       "type": "string"
     },
     "cf_etag": {
-      "value": "E3169NR3BVK3DJ",
+      "value": "E1CTWNZ643PUQZ",
       "type": "string"
     },
     "cf_hosted_zone_id": {
@@ -38,6 +38,32 @@
     }
   },
   "resources": [
+    {
+      "mode": "data",
+      "type": "archive_file",
+      "name": "lambda_main",
+      "provider": "provider.archive",
+      "instances": [
+        {
+          "schema_version": 0,
+          "attributes": {
+            "excludes": null,
+            "id": "502af9bcd8bac1822a4052c962a3bd322746084b",
+            "output_base64sha256": "W5HchTpXhL2+aBI5O1Qzo25q4hxfbf+uhEln7zcrZpM=",
+            "output_md5": "e7f26d9ad3488ef6867a7f6bc2a7356a",
+            "output_path": "./lambda/prod-panaetius-blog-lambda/main.js.zip",
+            "output_sha": "502af9bcd8bac1822a4052c962a3bd322746084b",
+            "output_size": 597,
+            "source": [],
+            "source_content": null,
+            "source_content_filename": null,
+            "source_dir": null,
+            "source_file": "./lambda/prod-panaetius-blog-lambda/main.js",
+            "type": "zip"
+          }
+        }
+      ]
+    },
     {
       "module": "module.cloudfront_s3_cdn",
       "mode": "data",
@@ -307,7 +333,7 @@
                   {
                     "event_type": "origin-request",
                     "include_body": false,
-                    "lambda_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:1"
+                    "lambda_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:6"
                   }
                 ],
                 "max_ttl": 31536000,
@@ -321,13 +347,13 @@
             "default_root_object": "index.html",
             "domain_name": "d244ranky0ff54.cloudfront.net",
             "enabled": true,
-            "etag": "E3169NR3BVK3DJ",
+            "etag": "E1CTWNZ643PUQZ",
             "hosted_zone_id": "Z2FDTNDATAQYW2",
             "http_version": "http2",
             "id": "E2IHXIMPI3MZ2X",
             "in_progress_validation_batches": 0,
             "is_ipv6_enabled": true,
-            "last_modified_time": "2020-07-19 01:54:58.16 +0000 UTC",
+            "last_modified_time": "2020-07-21 21:18:38.945 +0000 UTC",
             "logging_config": [
               {
                 "bucket": "prod-panaetius-blog-logs.s3.amazonaws.com",
@@ -384,6 +410,8 @@
           },
           "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
           "dependencies": [
+            "aws_iam_role.lambda_role",
+            "aws_iam_role_policy_attachment.lambda_logging",
             "aws_lambda_function.directory_indexes",
             "module.cloudfront_s3_cdn.aws_cloudfront_origin_access_identity.default",
             "module.cloudfront_s3_cdn.aws_s3_bucket.origin",
@@ -445,8 +473,8 @@
           "schema_version": 0,
           "attributes": {
             "arn": "arn:aws:iam::745437999005:role/prod-panaetius-blog-lambda",
-            "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Action\":\"sts:AssumeRole\"},{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"edgelambda.amazonaws.com\"},\"Action\":\"sts:AssumeRole\"}]}",
-            "create_date": "2020-07-19T01:43:08Z",
+            "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"Service\":[\"lambda.amazonaws.com\",\"edgelambda.amazonaws.com\"]},\"Action\":\"sts:AssumeRole\"}]}",
+            "create_date": "2020-07-21T20:01:43Z",
             "description": "",
             "force_detach_policies": false,
             "id": "prod-panaetius-blog-lambda",
@@ -459,7 +487,7 @@
               "Description": "terraform resources to host the blog",
               "Project": "panaetius-blog"
             },
-            "unique_id": "AROA23D4RF6OUVG5PVTDO"
+            "unique_id": "AROA23D4RF6O2VEGAGEXM"
           },
           "private": "bnVsbA=="
         }
@@ -474,7 +502,7 @@
         {
           "schema_version": 0,
           "attributes": {
-            "id": "prod-panaetius-blog-lambda-20200719014309715500000001",
+            "id": "prod-panaetius-blog-lambda-20200721200145100500000001",
             "policy_arn": "arn:aws:iam::745437999005:policy/prod-panaetius-blog-lambda_logging",
             "role": "prod-panaetius-blog-lambda"
           },
@@ -500,25 +528,25 @@
             "description": "",
             "environment": [],
             "file_system_config": [],
-            "filename": null,
+            "filename": "./lambda/prod-panaetius-blog-lambda/main.js.zip",
             "function_name": "prod-panaetius-blog-directory_indexes",
             "handler": "main.handler",
             "id": "prod-panaetius-blog-directory_indexes",
             "invoke_arn": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes/invocations",
             "kms_key_arn": "",
-            "last_modified": "2020-07-19T01:48:58.316+0000",
+            "last_modified": "2020-07-21T21:18:36.437+0000",
             "layers": [],
             "memory_size": 128,
             "publish": true,
-            "qualified_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:1",
+            "qualified_arn": "arn:aws:lambda:us-east-1:745437999005:function:prod-panaetius-blog-directory_indexes:6",
             "reserved_concurrent_executions": -1,
             "role": "arn:aws:iam::745437999005:role/prod-panaetius-blog-lambda",
             "runtime": "nodejs12.x",
-            "s3_bucket": "prod-panaetius-blog-lambda-function",
-            "s3_key": "main.zip",
+            "s3_bucket": null,
+            "s3_key": null,
             "s3_object_version": null,
-            "source_code_hash": "ltLABbdLTpAeXF5xOPf8vYj2Tq2wvINv206umQzPv0E=",
-            "source_code_size": 546,
+            "source_code_hash": "W5HchTpXhL2+aBI5O1Qzo25q4hxfbf+uhEln7zcrZpM=",
+            "source_code_size": 597,
             "tags": {
               "Description": "terraform resources to host the blog",
               "Project": "panaetius-blog"
@@ -530,14 +558,13 @@
                 "mode": "PassThrough"
               }
             ],
-            "version": "1",
+            "version": "6",
             "vpc_config": []
           },
           "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDB9fQ==",
           "dependencies": [
             "aws_iam_role.lambda_role",
-            "aws_iam_role_policy_attachment.lambda_logging",
-            "aws_s3_bucket.lambda_s3"
+            "aws_iam_role_policy_attachment.lambda_logging"
           ]
         }
       ]
@@ -736,53 +763,6 @@
         }
       ]
     },
-    {
-      "mode": "managed",
-      "type": "aws_s3_bucket",
-      "name": "lambda_s3",
-      "provider": "provider.aws.us_east_1",
-      "instances": [
-        {
-          "schema_version": 0,
-          "attributes": {
-            "acceleration_status": "",
-            "acl": "private",
-            "arn": "arn:aws:s3:::prod-panaetius-blog-lambda-function",
-            "bucket": "prod-panaetius-blog-lambda-function",
-            "bucket_domain_name": "prod-panaetius-blog-lambda-function.s3.amazonaws.com",
-            "bucket_prefix": null,
-            "bucket_regional_domain_name": "prod-panaetius-blog-lambda-function.s3.amazonaws.com",
-            "cors_rule": [],
-            "force_destroy": false,
-            "grant": [],
-            "hosted_zone_id": "Z3AQBSTGFYJSTF",
-            "id": "prod-panaetius-blog-lambda-function",
-            "lifecycle_rule": [],
-            "logging": [],
-            "object_lock_configuration": [],
-            "policy": null,
-            "region": "us-east-1",
-            "replication_configuration": [],
-            "request_payer": "BucketOwner",
-            "server_side_encryption_configuration": [],
-            "tags": {
-              "Description": "terraform resources to host the blog",
-              "Project": "panaetius-blog"
-            },
-            "versioning": [
-              {
-                "enabled": false,
-                "mfa_delete": false
-              }
-            ],
-            "website": [],
-            "website_domain": null,
-            "website_endpoint": null
-          },
-          "private": "bnVsbA=="
-        }
-      ]
-    },
     {
       "module": "module.cloudfront_s3_cdn",
       "mode": "managed",
@@ -856,47 +836,6 @@
         }
       ]
     },
-    {
-      "mode": "managed",
-      "type": "aws_s3_bucket_object",
-      "name": "main",
-      "provider": "provider.aws.us_east_1",
-      "instances": [
-        {
-          "schema_version": 0,
-          "attributes": {
-            "acl": "private",
-            "bucket": "prod-panaetius-blog-lambda-function",
-            "cache_control": "",
-            "content": null,
-            "content_base64": null,
-            "content_disposition": "",
-            "content_encoding": "",
-            "content_language": "",
-            "content_type": "binary/octet-stream",
-            "etag": "e93809f5fe6e069bfa1fbee683a28d8c",
-            "force_destroy": false,
-            "id": "main.zip",
-            "key": "main.zip",
-            "kms_key_id": null,
-            "metadata": {},
-            "object_lock_legal_hold_status": "",
-            "object_lock_mode": "",
-            "object_lock_retain_until_date": "",
-            "server_side_encryption": "",
-            "source": "./lambda/prod-panaetius-blog-lambda/main.zip",
-            "storage_class": "STANDARD",
-            "tags": {},
-            "version_id": "",
-            "website_redirect": ""
-          },
-          "private": "bnVsbA==",
-          "dependencies": [
-            "aws_s3_bucket.lambda_s3"
-          ]
-        }
-      ]
-    },
     {
       "module": "module.cloudfront_s3_cdn",
       "mode": "managed",
diff --git a/infrastructure/variables/prod-eu-west-1.tfvars b/infrastructure/variables/prod-eu-west-1.tfvars
index f2da85f..a330cef 100644
--- a/infrastructure/variables/prod-eu-west-1.tfvars
+++ b/infrastructure/variables/prod-eu-west-1.tfvars
@@ -13,7 +13,7 @@ allowed_origins     = ["*.panaetius.io"]
 # s3 & lambda
 acl         = "private"
 lambda_key  = "main.zip"
-source_file = "./lambda/prod-panaetius-blog-lambda/main.zip"
+source_file = "./lambda/prod-panaetius-blog-lambda/main.js"
 handler     = "main.handler"
 runtime     = "nodejs12.x"
 s3_region   = "us-east-1"