Skip to content

Commit 2be7ab3

Browse files
committed
fix: trigger cold start dispatcher after update SSM paramates
1 parent ad865a7 commit 2be7ab3

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

modules/webhook/eventbridge/dispatcher.tf

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ resource "aws_cloudwatch_event_rule" "workflow_job" {
1212
EOF
1313
}
1414

15-
16-
resource "aws_cloudwatch_event_target" "github_welcome" {
15+
resource "aws_cloudwatch_event_target" "dispatcher" {
1716
arn = aws_lambda_function.dispatcher.arn
1817
rule = aws_cloudwatch_event_rule.workflow_job.name
1918
event_bus_name = aws_cloudwatch_event_bus.main.name
2019
}
2120

22-
2321
resource "aws_lambda_function" "dispatcher" {
2422
s3_bucket = var.config.lambda_s3_bucket != null ? var.config.lambda_s3_bucket : null
2523
s3_key = var.config.lambda_s3_key != null ? var.config.lambda_s3_key : null
@@ -45,6 +43,7 @@ resource "aws_lambda_function" "dispatcher" {
4543
POWERTOOLS_TRACER_CAPTURE_ERROR = var.config.tracing_config.capture_error
4644
# Parameters required for lambda configuration
4745
PARAMETER_RUNNER_MATCHER_CONFIG_PATH = var.config.ssm_parameter_runner_matcher_config.name
46+
PARAMETER_RUNNER_MATCHER_VERSION = var.config.ssm_parameter_runner_matcher_config.version # enforce cold start after Changes in SSM parameter
4847
REPOSITORY_ALLOW_LIST = jsonencode(var.config.repository_white_list)
4948
SQS_WORKFLOW_JOB_QUEUE = try(var.config.sqs_workflow_job_queue.id, null)
5049
} : k => v if v != null
@@ -67,10 +66,6 @@ resource "aws_lambda_function" "dispatcher" {
6766
mode = var.config.tracing_config.mode
6867
}
6968
}
70-
71-
lifecycle {
72-
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
73-
}
7469
}
7570

7671
resource "aws_cloudwatch_log_group" "dispatcher" {

modules/webhook/eventbridge/main.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,3 @@ resource "aws_cloudwatch_event_archive" "main" {
1313
event_source_arn = aws_cloudwatch_event_bus.main.arn
1414
retention_days = var.config.archive.retention_days
1515
}
16-
17-
resource "null_resource" "ssm_parameter_runner_matcher_config" {
18-
triggers = {
19-
version = var.config.ssm_parameter_runner_matcher_config.version
20-
}
21-
}

modules/webhook/eventbridge/webhook.tf

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
resource "null_resource" "github_app_parameters" {
2+
triggers = {
3+
github_app_webhook_secret_name = var.config.github_app_parameters.webhook_secret.name
4+
}
5+
}
6+
17
resource "aws_lambda_function" "webhook" {
28
s3_bucket = var.config.lambda_s3_bucket != null ? var.config.lambda_s3_bucket : null
39
s3_key = var.config.lambda_s3_key != null ? var.config.lambda_s3_key : null
@@ -48,7 +54,7 @@ resource "aws_lambda_function" "webhook" {
4854
}
4955

5056
lifecycle {
51-
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
57+
replace_triggered_by = [null_resource.github_app_parameters]
5258
}
5359
}
5460

@@ -65,14 +71,9 @@ resource "aws_lambda_permission" "webhook" {
6571
function_name = aws_lambda_function.webhook.function_name
6672
principal = "apigateway.amazonaws.com"
6773
source_arn = var.config.api_gw_source_arn
68-
lifecycle {
69-
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
70-
}
71-
}
7274

73-
resource "null_resource" "github_app_parameters" {
74-
triggers = {
75-
github_app_webhook_secret = var.config.github_app_parameters.webhook_secret.name
75+
lifecycle {
76+
replace_triggered_by = [null_resource.github_app_parameters]
7677
}
7778
}
7879

0 commit comments

Comments
 (0)