Merge branch 'terraform' of https://github.com/byu-oit/web-cdn into t…

…erraform
byu-oit · Apr 11, 2024 · 969e184 · 969e184
2 parents 7987015 + f09f007
commit 969e184
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 7 deletions.
diff --git a/iac/modules/app/log-analyzer-lambda.tf b/iac/modules/app/log-analyzer-lambda.tf
@@ -0,0 +1,47 @@
+data "archive_file" "LogAnalyzerSorterFuncLambda" {
+  type        = "zip"
+  source_dir  = "../../../log-analyzer/sorter-lambda/"
+  output_path = "../../../log-analyzer/sorter-lambda.zip"
+}
+
+resource "aws_lambda_function" "LogAnalyzerSorterFunc" {
+  filename         = data.archive_file.LogAnalyzerSorterFuncLambda.output_path
+  function_name    = "${var.cdn_name}-${var.env}-LogAnalyzer-Sorter"
+  role             = aws_iam_role.EdgeLambdaExecutionRole.arn
+  handler          = "lib/lambda.handler"
+  runtime          = "nodejs16.x"
+  source_code_hash = base64sha256(data.archive_file.LogAnalyzerSorterFuncLambda.output_path)
+  publish          = true
+  timeout          = 20
+  memory_size      = 128
+
+  environment {
+    variables = {
+      TZ : "America/Denver"
+      LOG_BUCKET : aws_s3_bucket.LogBucket.id
+      UNPROCESSED_PREFIX : local.unprocessed_log_prefix
+      PREPROCESSED_PREFIX : local.preprocessed_log_prefix
+    }
+  }
+}
+
+resource "aws_lambda_permission" "LogAnalyzerSorterTriggerPermission" {
+  statement_id  = "LogAnalyzerSorterTriggerPermission"
+  action        = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.LogAnalyzerSorterFunc.arn
+  #   principal     = "s3.amazonaws.com"
+  principal  = data.aws_caller_identity.current.account_id # TODO figure this out
+  source_arn = aws_s3_bucket.LogBucket.arn
+}
+
+resource "aws_s3_bucket_notification" "LogAnalyzerSorterFuncTrigger" {
+  bucket = aws_s3_bucket.LogBucket.id
+
+  lambda_function {
+    lambda_function_arn = aws_lambda_function.LogAnalyzerSorterFunc.id
+    events              = ["s3:ObjectCreated:*"]
+    filter_prefix       = local.unprocessed_log_prefix
+  }
+
+  depends_on = [aws_lambda_permission.LogAnalyzerSorterTriggerPermission]
+}
diff --git a/log-analyzer/sorter-lambda/package.json b/log-analyzer/sorter-lambda/package.json
@@ -6,11 +6,12 @@
   "scripts": {
     "build": "tsc",
     "test": "mocha --recursive",
-    "cli": "ts-node src/cli.ts"
+    "cli": "ts-node src/cli.ts",
+    "postinstall": "npm run build"
   },
   "engines": {
-    "node": ">=14.0.0",
-    "npm": ">=6.0.0"
+    "node": ">=16.0.0",
+    "npm": ">=8.0.0"
   },
   "author": "",
   "license": "Apache-2.0",
@@ -20,7 +21,7 @@
   "devDependencies": {
     "@types/aws-lambda": "^8.10.7",
     "@types/luxon": "^1.2.0",
-    "@types/node": "^10.3.6",
+    "@types/node": "^16.18.96",
     "aws-sdk": "^2.89.0",
     "ts-node": "^10.9.1",
     "typescript": "^2.9.2"

diff --git a/log-analyzer/sorter-lambda/yarn.lock b/log-analyzer/sorter-lambda/yarn.lock
@@ -55,9 +55,10 @@
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-1.2.0.tgz#fa52e0d1cb0966a0190b8b7409b1d7e76aacd055"
 
-"@types/node@^10.3.6":
-  version "10.5.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc"
+"@types/node@^16.18.96":
+  version "16.18.96"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.96.tgz#eb0012d23ff53d14d64ec8a352bf89792de6aade"
+  integrity sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==
 
 acorn-walk@^8.1.1:
   version "8.2.0"