Skip to content

Commit c14193d

Browse files
committed
update environment
1 parent 2a028a6 commit c14193d

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

Makefile

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ current_aws_account := $(shell aws sts get-caller-identity --query Account --out
55
src_directory_root = src/
66
dist_ui_directory_root = dist_ui/
77
integration_test_directory_root = tests/live_integration/
8+
npm_install_params = --production --target_arch=arm64 --target_platform=linux --target_libc=glibc --cpu arm64 --os linux --arch=arm64
89
GIT_HASH := $(shell git rev-parse --short HEAD)
910

1011
.PHONY: clean
@@ -39,8 +40,9 @@ build: src/
3940
make build_swagger
4041
cp -r src/api/resources/ dist/api/resources
4142
rm -rf dist/lambda/sqs
42-
npm --prefix=dist/lambda/ i --cpu arm64 --os linux
43-
npm --prefix=dist/sqsConsumer/ i --cpu arm64 --os linux
43+
docker run --rm -v "$(shell pwd)/dist/lambda":/var/task public.ecr.aws/sam/build-nodejs22.x:latest npm install $(npm_install_params)
44+
docker run --rm -v "$(shell pwd)/dist/sqsConsumer":/var/task public.ecr.aws/sam/build-nodejs22.x:latest npm install $(npm_install_params)
45+
# Lambda
4446
rm -rf dist/lambda/node_modules/aws-crt/dist/bin/darwin*
4547
rm -rf dist/lambda/node_modules/aws-crt/dist/bin/linux-x64*
4648
rm -rf dist/lambda/node_modules/aws-crt/dist/bin/linux-arm64-musl
@@ -50,6 +52,16 @@ build: src/
5052
rm -rf dist/lambda/node_modules/argon2/prebuilds/linux-x64*
5153
rm -rf dist/lambda/node_modules/argon2/prebuilds/win32-x64*
5254
rm -rf dist/lambda/node_modules/argon2/prebuilds/linux-arm64/argon2.armv8.musl.node
55+
# SQS
56+
rm -rf dist/sqsConsumer/node_modules/aws-crt/dist/bin/darwin*
57+
rm -rf dist/sqsConsumer/node_modules/aws-crt/dist/bin/linux-arm64-musl
58+
rm -rf dist/sqsConsumer/node_modules/aws-crt/dist/bin/linux-x64*
59+
rm -rf dist/sqsConsumer/node_modules/argon2/prebuilds/darwin*
60+
rm -rf dist/sqsConsumer/node_modules/argon2/prebuilds/freebsd*
61+
rm -rf dist/sqsConsumer/node_modules/argon2/prebuilds/linux-arm
62+
rm -rf dist/sqsConsumer/node_modules/argon2/prebuilds/linux-x64*
63+
rm -rf dist/sqsConsumer/node_modules/argon2/prebuilds/win32-x64*
64+
rm -rf dist/sqsConsumer/node_modules/argon2/prebuilds/linux-arm64/argon2.armv8.musl.node
5365

5466
local:
5567
VITE_BUILD_HASH=$(GIT_HASH) yarn run dev

terraform/modules/frontend/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ resource "null_resource" "upload_frontend" {
1818
}
1919

2020
resource "null_resource" "invalidate_frontend" {
21+
depends_on = [null_resource.upload_frontend]
2122
triggers = {
2223
ui_bucket_sha = data.archive_file.ui.output_sha
2324
}

terraform/modules/lambdas/main.tf

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,12 @@ resource "aws_lambda_function" "sqs_lambda" {
311311
source_code_hash = data.archive_file.sqs_lambda_code.output_sha256
312312
environment {
313313
variables = {
314-
"RunEnvironment" = var.RunEnvironment
315-
EntraRoleArn = aws_iam_role.entra_role.arn
316-
"NODE_OPTIONS" = "--enable-source-maps"
314+
"RunEnvironment" = var.RunEnvironment
315+
"AWS_CRT_NODEJS_BINARY_RELATIVE_PATH" = "node_modules/aws-crt/dist/bin/linux-arm64-glibc/aws-crt-nodejs.node"
316+
ORIGIN_VERIFY_KEY = var.OriginVerifyKey
317+
EntraRoleArn = aws_iam_role.entra_role.arn
318+
LinkryKvArn = var.LinkryKvArn
319+
"NODE_OPTIONS" = "--enable-source-maps"
317320
}
318321
}
319322
}

0 commit comments

Comments
 (0)