Skip to content

Commit 116dd5d

Browse files
harrim91harrim91
committed
CCM-8574: complete revert to original plan
1 parent f6f4546 commit 116dd5d

File tree

12 files changed

+51
-32
lines changed

12 files changed

+51
-32
lines changed

‎infrastructure/terraform/components/app/pre.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
root_dir=$(git rev-parse --show-toplevel)
2-
31
npm ci
42

53
npm run generate-dependencies --workspaces --if-present
6-
7-
$root_dir/lambdas/layers/pdfjs/build.sh

‎infrastructure/terraform/components/sandbox/pre.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
root_dir=$(git rev-parse --show-toplevel)
2-
31
if [ -z "$SKIP_SANDBOX_INSTALL" ]; then npm ci; fi
42

53
npm run generate-dependencies --workspaces --if-present
6-
7-
$root_dir/lambdas/layers/pdfjs/build.sh

‎infrastructure/terraform/modules/backend-api/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ No requirements.
3737
| <a name="module_get_template_lambda"></a> [get\_template\_lambda](#module\_get\_template\_lambda) | ../lambda-function | n/a |
3838
| <a name="module_lambda_copy_scanned_object_to_internal"></a> [lambda\_copy\_scanned\_object\_to\_internal](#module\_lambda\_copy\_scanned\_object\_to\_internal) | ../lambda-function | n/a |
3939
| <a name="module_lambda_delete_failed_scanned_object"></a> [lambda\_delete\_failed\_scanned\_object](#module\_lambda\_delete\_failed\_scanned\_object) | ../lambda-function | n/a |
40-
| <a name="module_lambda_layer_pdfjs"></a> [lambda\_layer\_pdfjs](#module\_lambda\_layer\_pdfjs) | ../lambda_layer | n/a |
40+
| <a name="module_lambda_layer_pdfjs"></a> [lambda\_layer\_pdfjs](#module\_lambda\_layer\_pdfjs) | ../lambda-layer | n/a |
4141
| <a name="module_lambda_set_file_virus_scan_status"></a> [lambda\_set\_file\_virus\_scan\_status](#module\_lambda\_set\_file\_virus\_scan\_status) | ../lambda-function | n/a |
4242
| <a name="module_lambda_validate_letter_template_files"></a> [lambda\_validate\_letter\_template\_files](#module\_lambda\_validate\_letter\_template\_files) | ../lambda-function | n/a |
4343
| <a name="module_list_template_lambda"></a> [list\_template\_lambda](#module\_list\_template\_lambda) | ../lambda-function | n/a |

‎infrastructure/terraform/modules/backend-api/module_lambda_layer_pdfjs.tf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
module "lambda_layer_pdfjs" {
2-
source = "../lambda_layer"
2+
source = "../lambda-layer"
33
name = "${local.csi}-nodejs20-pdfjs-dist"
4-
description = "pdfjs-dist dependencies for nodejs20.x"
5-
layer_dir = local.pdfjs_layer_dir
6-
source_dir = "dist/layer"
4+
description = "pdfjs-dist dependencies for Node.js v20"
5+
source_code_dir = local.pdfjs_layer_dir
76
nodejs_runtime_version = "20"
87
}

infrastructure/terraform/modules/lambda_layer/README.md renamed to infrastructure/terraform/modules/lambda-layer/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ No requirements.
1010
| Name | Description | Type | Default | Required |
1111
|------|-------------|------|---------|:--------:|
1212
| <a name="input_description"></a> [description](#input\_description) | Description of what your Lambda Layer does | `string` | n/a | yes |
13-
| <a name="input_layer_dir"></a> [layer\_dir](#input\_layer\_dir) | Path to the root directory of the layer code | `string` | n/a | yes |
1413
| <a name="input_name"></a> [name](#input\_name) | Unique name for your Lambda Layer | `string` | n/a | yes |
1514
| <a name="input_nodejs_runtime_version"></a> [nodejs\_runtime\_version](#input\_nodejs\_runtime\_version) | Node.js runtime version | `string` | `"20"` | no |
16-
| <a name="input_output_dir"></a> [output\_dir](#input\_output\_dir) | Name of the output directory (relative to layer\_dir) | `string` | `"dist"` | no |
17-
| <a name="input_source_dir"></a> [source\_dir](#input\_source\_dir) | Name of the source code directory (relative to layer\_dir) | `string` | n/a | yes |
15+
| <a name="input_output_dir"></a> [output\_dir](#input\_output\_dir) | Name of the output directory (relative to source\_code\_dir) | `string` | `"dist"` | no |
16+
| <a name="input_source_code_dir"></a> [source\_code\_dir](#input\_source\_code\_dir) | Path to the root directory of the project source code | `string` | n/a | yes |
1817
## Modules
1918

2019
No modules.

‎infrastructure/terraform/modules/lambda-layer/data_archive_file_zip.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
data "archive_file" "zip" {
2+
depends_on = [null_resource.package_layer]
3+
type = "zip"
4+
output_path = "${var.source_code_dir}/${var.output_dir}/layer.zip"
5+
source_dir = "${var.source_code_dir}/${var.output_dir}/layer"
6+
}

infrastructure/terraform/modules/lambda_layer/lambda_layer_version_main.tf renamed to infrastructure/terraform/modules/lambda-layer/lambda_layer_version_main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
resource "aws_lambda_layer_version" "lambda_layer" {
2-
depends_on = [data.archive_file.zip]
32
layer_name = var.name
43
description = var.description
54
filename = data.archive_file.zip.output_path

‎infrastructure/terraform/modules/lambda-layer/null_resource_package_layer.tf‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
resource "null_resource" "package_layer" {
2+
triggers = {
3+
always_run = timestamp()
4+
}
5+
6+
provisioner "local-exec" {
7+
working_dir = var.source_code_dir
8+
command = "rm -rf $OUTPUT_DIR/layer node_modules"
9+
environment = {
10+
OUTPUT_DIR = var.output_dir
11+
}
12+
}
13+
14+
provisioner "local-exec" {
15+
working_dir = var.source_code_dir
16+
command = "mkdir -p $OUTPUT_DIR/layer/nodejs/node_modules"
17+
environment = {
18+
OUTPUT_DIR = var.output_dir
19+
}
20+
}
21+
22+
provisioner "local-exec" {
23+
working_dir = var.source_code_dir
24+
command = "npm install --force"
25+
}
26+
27+
provisioner "local-exec" {
28+
working_dir = var.source_code_dir
29+
command = "cp -r node_modules/* $OUTPUT_DIR/layer/nodejs/node_modules"
30+
environment = {
31+
OUTPUT_DIR = var.output_dir
32+
}
33+
}
34+
}

infrastructure/terraform/modules/lambda_layer/outputs.tf renamed to infrastructure/terraform/modules/lambda-layer/outputs.tf

File renamed without changes.

infrastructure/terraform/modules/lambda_layer/variables.tf renamed to infrastructure/terraform/modules/lambda-layer/variables.tf

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,14 @@ variable "description" {
88
description = "Description of what your Lambda Layer does"
99
}
1010

11-
variable "layer_dir" {
11+
variable "source_code_dir" {
1212
type = string
13-
description = "Path to the root directory of the layer code"
14-
}
15-
16-
variable "source_dir" {
17-
type = string
18-
description = "Name of the source code directory (relative to layer_dir)"
13+
description = "Path to the root directory of the project source code"
1914
}
2015

2116
variable "output_dir" {
2217
type = string
23-
description = "Name of the output directory (relative to layer_dir)"
18+
description = "Name of the output directory (relative to source_code_dir)"
2419
default = "dist"
2520
}
2621

0 commit comments

Comments
 (0)