Skip to content

Commit f69b9d9

Browse files
committed
VED-153: Try a different way. Ensure ECR repos get removed.
1 parent 0a1c3f3 commit f69b9d9

File tree

8 files changed

+11
-4
lines changed

8 files changed

+11
-4
lines changed

azure/azure-pr-teardown-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: 'AWS-ECS'
2323
vmImage: 'ubuntu-latest'
2424
steps:
25-
- checkout: self@master
25+
- checkout: git://NHSDigital/immunisation-fhir-api@master
2626

2727
- bash: |
2828
echo $(action_pr_number)

terraform/ack_lambda.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ resource "aws_ecr_repository" "ack_lambda_repository" {
1111
scan_on_push = true
1212
}
1313
name = "${local.short_prefix}-ack-repo"
14+
force_delete = local.is_temp
1415
}
1516

1617
# Module for building and pushing Docker image to ECR
@@ -220,7 +221,7 @@ resource "aws_lambda_function" "ack_processor_lambda" {
220221
}
221222
}
222223

223-
reserved_concurrent_executions = startswith(local.environment, "pr-") ? -1 : 20
224+
reserved_concurrent_executions = local.is_temp ? -1 : 20
224225
depends_on = [
225226
aws_cloudwatch_log_group.ack_lambda_log_group
226227
]

terraform/delta.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ resource "aws_ecr_repository" "delta_lambda_repository" {
1212
scan_on_push = true
1313
}
1414
name = "${local.prefix}-delta-lambda-repo"
15+
force_delete = local.is_temp
1516
}
1617

1718
module "delta_docker_image" {

terraform/ecs_batch_processor_config.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ resource "aws_ecr_repository" "processing_repository" {
2121
scan_on_push = true
2222
}
2323
name = "${local.short_prefix}-processing-repo"
24+
force_delete = local.is_temp
2425
}
2526

2627
# Build and Push Docker Image to ECR (Reusing the existing module)

terraform/file_name_processor.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ resource "aws_ecr_repository" "file_name_processor_lambda_repository" {
1111
scan_on_push = true
1212
}
1313
name = "${local.short_prefix}-filenameproc-repo"
14+
force_delete = local.is_temp
1415
}
1516

1617
# Module for building and pushing Docker image to ECR
@@ -295,7 +296,7 @@ resource "aws_lambda_function" "file_processor_lambda" {
295296
}
296297
}
297298
kms_key_arn = data.aws_kms_key.existing_lambda_encryption_key.arn
298-
reserved_concurrent_executions = startswith(local.environment, "pr-") ? -1 : 20
299+
reserved_concurrent_executions = local.is_temp ? -1 : 20
299300
depends_on = [
300301
aws_cloudwatch_log_group.file_name_processor_log_group,
301302
aws_iam_policy.filenameprocessor_lambda_exec_policy

terraform/forwarder_lambda.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ resource "aws_ecr_repository" "forwarder_lambda_repository" {
1515
scan_on_push = true
1616
}
1717
name = "${local.short_prefix}-forwarding-repo"
18+
force_delete = local.is_temp
1819
}
1920

2021
module "forwarding_docker_image" {
@@ -217,7 +218,7 @@ resource "aws_lambda_function" "forwarding_lambda" {
217218
aws_cloudwatch_log_group.forwarding_lambda_log_group
218219
]
219220

220-
reserved_concurrent_executions = startswith(local.environment, "pr-") ? -1 : 20
221+
reserved_concurrent_executions = local.is_temp ? -1 : 20
221222
}
222223

223224
resource "aws_lambda_event_source_mapping" "kinesis_event_source_mapping_forwarder_lambda" {

terraform/lambda.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ resource "aws_ecr_repository" "operation_lambda_repository" {
1515
scan_on_push = true
1616
}
1717
name = "${local.prefix}-operation-lambda-repo"
18+
force_delete = local.is_temp
1819
}
1920

2021
#resource "docker_image" "lambda_function_docker" {

terraform/mesh_processor.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ resource "aws_ecr_repository" "mesh_file_converter_lambda_repository" {
1111
scan_on_push = true
1212
}
1313
name = "${local.short_prefix}-mesh_processor-repo"
14+
force_delete = local.is_temp
1415
}
1516

1617
# Module for building and pushing Docker image to ECR

0 commit comments

Comments
 (0)