updates

Author: devksingh4

Makefile

@@ -67,6 +67,8 @@ build: src/ cloudformation/
 	cp -r src/api/resources/ dist/api/resources
 	rm -rf dist/lambda/sqs
 	sam build --template-file cloudformation/main.yml --use-container --parallel
+	npm --prefix=dist/lambda/ i --cpu arm64 --os linux
+	npm --prefix=dist/sqsConsumer/ i --cpu arm64 --os linux
 	mkdir -p .aws-sam/build/AppApiLambdaFunction/node_modules/aws-crt/
 	cp -r node_modules/aws-crt/dist .aws-sam/build/AppApiLambdaFunction/node_modules/aws-crt
 ## IF WE EVER CHANGE THE LAMBDA ARCH, BE SURE TO CHANGE THESE ##
@@ -80,6 +82,17 @@ build: src/ cloudformation/
 	rm -rf .aws-sam/build/AppApiLambdaFunction/node_modules/argon2/prebuilds/win32-x64*
 	rm -rf .aws-sam/build/AppApiLambdaFunction/node_modules/argon2/prebuilds/linux-arm64/argon2.armv8.musl.node
 
+## NEW
+	rm -rf dist/lambda/node_modules/aws-crt/dist/bin/darwin*
+	rm -rf dist/lambda/node_modules/aws-crt/dist/bin/linux-x64*
+	rm -rf dist/lambda/node_modules/aws-crt/dist/bin/linux-arm64-musl
+	rm -rf dist/lambda/node_modules/argon2/prebuilds/darwin*
+	rm -rf dist/lambda/node_modules/argon2/prebuilds/freebsd*
+	rm -rf dist/lambda/node_modules/argon2/prebuilds/linux-arm
+	rm -rf dist/lambda/node_modules/argon2/prebuilds/linux-x64*
+	rm -rf dist/lambda/node_modules/argon2/prebuilds/win32-x64*
+	rm -rf dist/lambda/node_modules/argon2/prebuilds/linux-arm64/argon2.armv8.musl.node
+
 local:
 	VITE_BUILD_HASH=$(GIT_HASH) yarn run dev
 

src/api/createLambdaPackage.js

@@ -19,6 +19,7 @@ export const packagesToTransfer = [
   "@fastify/swagger",
   "zod-openapi",
   "zod",
+  "aws-crt",
 ];
 const filePath = `${getPath().dirname}/package.json`;
 const writeFilePath = `${getPath().dirname}/package.lambda.json`;

src/api/package.json

@@ -36,6 +36,7 @@
     "@middy/sqs-partial-batch-failure": "^6.1.6",
     "@touch4it/ical-timezones": "^1.9.0",
     "argon2": "^0.43.0",
+    "aws-crt": "^1.27.3",
     "base64-arraybuffer": "^1.0.2",
     "discord.js": "^14.19.1",
     "dotenv": "^16.5.0",
@@ -71,4 +72,4 @@
     "pino-pretty": "^13.0.0",
     "yaml": "^2.8.0"
   }
-}
+}

terraform/envs/qa/main.tf

@@ -45,8 +45,8 @@ module "dynamo" {
   ProjectId = var.ProjectId
 }
 
-resource "random_string" "origin_verify_key" {
-  length  = 16
+resource "random_password" "origin_verify_key" {
+  length  = 20
   special = false
   keepers = {
     force_recreation = uuid()
@@ -59,7 +59,7 @@ module "lambdas" {
   RunEnvironment   = "dev"
   EntraRoleArn     = "arn:aws:iam::427040638965:role/infra-core-api-AppSecurityRoles--EntraLambdaIAMRole-b3CFiiF0S5pN"
   LinkryKvArn      = "arn:aws:cloudfront::427040638965:key-value-store/0c2c02fd-7c47-4029-975d-bc5d0376bba1"
-  OriginVerifyKey  = random_string.origin_verify_key.result
+  OriginVerifyKey  = random_password.origin_verify_key.result
   LogRetentionDays = 30
 }
 

terraform/modules/lambdas/main.tf

@@ -45,7 +45,7 @@ resource "aws_iam_policy" "shared_iam_policy" {
       {
         Action   = ["logs:CreateLogGroup", "logs:CreateLogStream", "logs:PutLogEvents"],
         Effect   = "Allow",
-        Resource = [aws_cloudwatch_log_group.api_logs.arn]
+        Resource = ["${aws_cloudwatch_log_group.api_logs.arn}:*"]
       },
       {
         Action = ["secretsmanager:GetSecretValue"],

terraform/modules/lambdas/variables.tf

@@ -22,7 +22,8 @@ variable "RunEnvironment" {
 }
 
 variable "OriginVerifyKey" {
-  type = string
+  type      = string
+  sensitive = true
 }
 
 variable "LogRetentionDays" {

yarn.lock

@@ -3879,7 +3879,7 @@ avvio@^9.0.0:
     "@fastify/error" "^4.0.0"
     fastq "^1.17.1"
 
-aws-crt@^1.24.0:
+aws-crt@^1.24.0, aws-crt@^1.27.3:
   version "1.27.3"
   resolved "https://registry.yarnpkg.com/aws-crt/-/aws-crt-1.27.3.tgz#a48b1baf0e3ad9985f8b0be575b9723915e28c47"
   integrity sha512-LPVCX4If8nAy1OERzmFx/pVr4g6olBqbz30SoLTkVJu5m5WH5GkhbIKnucQ1e5ZbpfNh+nrsFM2dolXO8ow4PQ==