Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: trigger cold start dispatcher after update SSM parameters #4243

Merged
merged 5 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modules/webhook/direct/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ No modules.
| [aws_lambda_function.webhook](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) | resource |
| [aws_lambda_permission.webhook](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_permission) | resource |
| [null_resource.github_app_parameters](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
| [null_resource.ssm_parameter_runner_matcher_config](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
| [aws_iam_policy_document.lambda_assume_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
| [aws_iam_policy_document.lambda_xray](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |

Expand Down
6 changes: 0 additions & 6 deletions modules/webhook/direct/main.tf

This file was deleted.

5 changes: 3 additions & 2 deletions modules/webhook/direct/webhook.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ resource "aws_lambda_function" "webhook" {
REPOSITORY_ALLOW_LIST = jsonencode(var.config.repository_white_list)
SQS_WORKFLOW_JOB_QUEUE = try(var.config.sqs_workflow_job_queue.id, null)
PARAMETER_RUNNER_MATCHER_CONFIG_PATH = var.config.ssm_parameter_runner_matcher_config.name
PARAMETER_RUNNER_MATCHER_VERSION = var.config.ssm_parameter_runner_matcher_config.version # enforce cold start after Changes in SSM parameter
} : k => v if v != null
}
}
Expand All @@ -50,7 +51,7 @@ resource "aws_lambda_function" "webhook" {
}

lifecycle {
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
replace_triggered_by = [null_resource.github_app_parameters]
}
}

Expand All @@ -68,7 +69,7 @@ resource "aws_lambda_permission" "webhook" {
principal = "apigateway.amazonaws.com"
source_arn = var.config.api_gw_source_arn
lifecycle {
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
replace_triggered_by = [null_resource.github_app_parameters]
}
}

Expand Down
3 changes: 1 addition & 2 deletions modules/webhook/eventbridge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ No modules.
| [aws_cloudwatch_event_archive.main](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_archive) | resource |
| [aws_cloudwatch_event_bus.main](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_bus) | resource |
| [aws_cloudwatch_event_rule.workflow_job](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_rule) | resource |
| [aws_cloudwatch_event_target.github_welcome](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_target) | resource |
| [aws_cloudwatch_event_target.dispatcher](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_target) | resource |
| [aws_cloudwatch_log_group.dispatcher](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
| [aws_cloudwatch_log_group.webhook](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
| [aws_iam_role.dispatcher_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
Expand All @@ -48,7 +48,6 @@ No modules.
| [aws_lambda_permission.allow_cloudwatch_to_call_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_permission) | resource |
| [aws_lambda_permission.webhook](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_permission) | resource |
| [null_resource.github_app_parameters](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
| [null_resource.ssm_parameter_runner_matcher_config](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
| [aws_iam_policy_document.lambda_assume_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
| [aws_iam_policy_document.lambda_xray](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |

Expand Down
9 changes: 2 additions & 7 deletions modules/webhook/eventbridge/dispatcher.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ resource "aws_cloudwatch_event_rule" "workflow_job" {
EOF
}


resource "aws_cloudwatch_event_target" "github_welcome" {
resource "aws_cloudwatch_event_target" "dispatcher" {
arn = aws_lambda_function.dispatcher.arn
rule = aws_cloudwatch_event_rule.workflow_job.name
event_bus_name = aws_cloudwatch_event_bus.main.name
}


resource "aws_lambda_function" "dispatcher" {
s3_bucket = var.config.lambda_s3_bucket != null ? var.config.lambda_s3_bucket : null
s3_key = var.config.lambda_s3_key != null ? var.config.lambda_s3_key : null
Expand All @@ -45,6 +43,7 @@ resource "aws_lambda_function" "dispatcher" {
POWERTOOLS_TRACER_CAPTURE_ERROR = var.config.tracing_config.capture_error
# Parameters required for lambda configuration
PARAMETER_RUNNER_MATCHER_CONFIG_PATH = var.config.ssm_parameter_runner_matcher_config.name
PARAMETER_RUNNER_MATCHER_VERSION = var.config.ssm_parameter_runner_matcher_config.version # enforce cold start after Changes in SSM parameter
REPOSITORY_ALLOW_LIST = jsonencode(var.config.repository_white_list)
SQS_WORKFLOW_JOB_QUEUE = try(var.config.sqs_workflow_job_queue.id, null)
} : k => v if v != null
Expand All @@ -67,10 +66,6 @@ resource "aws_lambda_function" "dispatcher" {
mode = var.config.tracing_config.mode
}
}

lifecycle {
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
}
}

resource "aws_cloudwatch_log_group" "dispatcher" {
Expand Down
6 changes: 0 additions & 6 deletions modules/webhook/eventbridge/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,3 @@ resource "aws_cloudwatch_event_archive" "main" {
event_source_arn = aws_cloudwatch_event_bus.main.arn
retention_days = var.config.archive.retention_days
}

resource "null_resource" "ssm_parameter_runner_matcher_config" {
triggers = {
version = var.config.ssm_parameter_runner_matcher_config.version
}
}
17 changes: 9 additions & 8 deletions modules/webhook/eventbridge/webhook.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
resource "null_resource" "github_app_parameters" {
triggers = {
github_app_webhook_secret_name = var.config.github_app_parameters.webhook_secret.name
}
}

resource "aws_lambda_function" "webhook" {
s3_bucket = var.config.lambda_s3_bucket != null ? var.config.lambda_s3_bucket : null
s3_key = var.config.lambda_s3_key != null ? var.config.lambda_s3_key : null
Expand Down Expand Up @@ -48,7 +54,7 @@ resource "aws_lambda_function" "webhook" {
}

lifecycle {
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
replace_triggered_by = [null_resource.github_app_parameters]
}
}

Expand All @@ -65,14 +71,9 @@ resource "aws_lambda_permission" "webhook" {
function_name = aws_lambda_function.webhook.function_name
principal = "apigateway.amazonaws.com"
source_arn = var.config.api_gw_source_arn
lifecycle {
replace_triggered_by = [null_resource.ssm_parameter_runner_matcher_config, null_resource.github_app_parameters]
}
}

resource "null_resource" "github_app_parameters" {
triggers = {
github_app_webhook_secret = var.config.github_app_parameters.webhook_secret.name
lifecycle {
replace_triggered_by = [null_resource.github_app_parameters]
}
}

Expand Down