Skip to content

Commit 8bd61d2

Browse files
alexalbu001npalm
andauthored
feat: use prefix variable for POWERTOOLS_SERVICE_NAME in Lambda functions (#4948)
Updates `POWERTOOLS_SERVICE_NAME` to use the `prefix` variable instead of hardcoded values in pool, ami-housekeeper, scale-down, scale-up, webhook and dispatcher Lambda functions. ## Why - function names already include prefix, `POWERTOOLS_SERVICE_NAME` should too Co-authored-by: Niek Palm <npalm@users.noreply.github.com>
1 parent 7e1a0a1 commit 8bd61d2

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

modules/ami-housekeeper/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ resource "aws_lambda_function" "ami_housekeeper" {
2222
LOG_LEVEL = var.log_level
2323
POWERTOOLS_LOGGER_LOG_EVENT = var.log_level == "debug" ? "true" : "false"
2424
AMI_CLEANUP_OPTIONS = jsonencode(var.cleanup_config)
25-
POWERTOOLS_SERVICE_NAME = "ami-housekeeper"
25+
POWERTOOLS_SERVICE_NAME = "${var.prefix}-ami-housekeeper"
2626
POWERTOOLS_TRACE_ENABLED = var.tracing_config.mode != null ? true : false
2727
POWERTOOLS_TRACER_CAPTURE_HTTPS_REQUESTS = var.tracing_config.capture_http_requests
2828
POWERTOOLS_TRACER_CAPTURE_ERROR = var.tracing_config.capture_error

modules/runners/pool/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ resource "aws_lambda_function" "pool" {
4242
SSM_TOKEN_PATH = var.config.ssm_token_path
4343
SSM_CONFIG_PATH = var.config.ssm_config_path
4444
SUBNET_IDS = join(",", var.config.subnet_ids)
45-
POWERTOOLS_SERVICE_NAME = "runners-pool"
45+
POWERTOOLS_SERVICE_NAME = "${var.config.prefix}-pool"
4646
POWERTOOLS_TRACE_ENABLED = var.tracing_config.mode != null ? true : false
4747
POWERTOOLS_TRACER_CAPTURE_HTTPS_REQUESTS = var.tracing_config.capture_http_requests
4848
POWERTOOLS_TRACER_CAPTURE_ERROR = var.tracing_config.capture_error

modules/runners/scale-down.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ resource "aws_lambda_function" "scale_down" {
3434
POWERTOOLS_LOGGER_LOG_EVENT = var.log_level == "debug" ? "true" : "false"
3535
RUNNER_BOOT_TIME_IN_MINUTES = var.runner_boot_time_in_minutes
3636
SCALE_DOWN_CONFIG = jsonencode(var.idle_config)
37-
POWERTOOLS_SERVICE_NAME = "runners-scale-down"
37+
POWERTOOLS_SERVICE_NAME = "${var.prefix}-scale-down"
3838
POWERTOOLS_METRICS_NAMESPACE = var.metrics.namespace
3939
POWERTOOLS_TRACE_ENABLED = var.tracing_config.mode != null ? true : false
4040
POWERTOOLS_TRACER_CAPTURE_HTTPS_REQUESTS = var.tracing_config.capture_http_requests

modules/runners/scale-up.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ resource "aws_lambda_function" "scale_up" {
5454
RUNNER_GROUP_NAME = var.runner_group_name
5555
RUNNER_NAME_PREFIX = var.runner_name_prefix
5656
RUNNERS_MAXIMUM_COUNT = var.runners_maximum_count
57-
POWERTOOLS_SERVICE_NAME = "runners-scale-up"
57+
POWERTOOLS_SERVICE_NAME = "${var.prefix}-scale-up"
5858
SSM_TOKEN_PATH = local.token_path
5959
SSM_CONFIG_PATH = "${var.ssm_paths.root}/${var.ssm_paths.config}"
6060
SSM_PARAMETER_STORE_TAGS = local.parameter_store_tags

modules/runners/ssm-housekeeper.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resource "aws_lambda_function" "ssm_housekeeper" {
3232
ENVIRONMENT = var.prefix
3333
LOG_LEVEL = var.log_level
3434
SSM_CLEANUP_CONFIG = jsonencode(local.ssm_housekeeper.config)
35-
POWERTOOLS_SERVICE_NAME = "ssm-housekeeper"
35+
POWERTOOLS_SERVICE_NAME = "${var.prefix}-ssm-housekeeper"
3636
POWERTOOLS_TRACE_ENABLED = var.tracing_config.mode != null ? true : false
3737
POWERTOOLS_TRACER_CAPTURE_HTTPS_REQUESTS = var.tracing_config.capture_http_requests
3838
POWERTOOLS_TRACER_CAPTURE_ERROR = var.tracing_config.capture_error

modules/webhook/eventbridge/dispatcher.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ resource "aws_lambda_function" "dispatcher" {
3939
for k, v in {
4040
LOG_LEVEL = var.config.log_level
4141
POWERTOOLS_LOGGER_LOG_EVENT = var.config.log_level == "debug" ? "true" : "false"
42-
POWERTOOLS_SERVICE_NAME = "dispatcher"
42+
POWERTOOLS_SERVICE_NAME = "${var.config.prefix}-dispatcher"
4343
POWERTOOLS_TRACE_ENABLED = var.config.tracing_config.mode != null ? true : false
4444
POWERTOOLS_TRACER_CAPTURE_HTTPS_REQUESTS = var.config.tracing_config.capture_http_requests
4545
POWERTOOLS_TRACER_CAPTURE_ERROR = var.config.tracing_config.capture_error

modules/webhook/eventbridge/webhook.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ resource "aws_lambda_function" "webhook" {
2323
for k, v in {
2424
LOG_LEVEL = var.config.log_level
2525
POWERTOOLS_LOGGER_LOG_EVENT = var.config.log_level == "debug" ? "true" : "false"
26-
POWERTOOLS_SERVICE_NAME = "webhook"
26+
POWERTOOLS_SERVICE_NAME = "${var.config.prefix}-webhook"
2727
POWERTOOLS_TRACE_ENABLED = var.config.tracing_config.mode != null ? true : false
2828
POWERTOOLS_TRACER_CAPTURE_HTTPS_REQUESTS = var.config.tracing_config.capture_http_requests
2929
POWERTOOLS_TRACER_CAPTURE_ERROR = var.config.tracing_config.capture_error

0 commit comments

Comments
 (0)