Skip to content
This repository was archived by the owner on Jan 16, 2025. It is now read-only.

Commit 7235cdc

Browse files
authored
fix: align inlince policies (#4046)
## Description Most of the lambdas are defining inline policies in the dedicated role for the lambda. The naming of the inline policies is a bit chaotic. This PR aligns the naming removes redundant parts of the naming like the the lamba name or prefix. This is allready part of the role fix #4045
1 parent e32b14b commit 7235cdc

File tree

7 files changed

+25
-18
lines changed

7 files changed

+25
-18
lines changed

Diff for: modules/ami-housekeeper/main.tf

+4-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ data "aws_iam_policy_document" "lambda_assume_role_policy" {
8484
}
8585

8686
resource "aws_iam_role_policy" "lambda_logging" {
87-
name = "${var.prefix}-lambda-logging-policy-ami-housekeeper"
87+
name = "logging-policy"
8888
role = aws_iam_role.ami_housekeeper.id
8989

9090
policy = templatefile("${path.module}/policies/lambda-cloudwatch.json", {
@@ -93,14 +93,14 @@ resource "aws_iam_role_policy" "lambda_logging" {
9393
}
9494

9595
resource "aws_iam_role_policy" "ami_housekeeper" {
96-
name = "${var.prefix}-lambda-ami-policy"
96+
name = "lambda-ami-policy"
9797
role = aws_iam_role.ami_housekeeper.id
9898

9999
policy = templatefile("${path.module}/policies/lambda-ami-housekeeper.json", {})
100100
}
101101

102102
resource "aws_cloudwatch_event_rule" "ami_housekeeper" {
103-
name = "${var.prefix}-ami-housekeeper-rule"
103+
name = "ami-housekeeper-rule"
104104
schedule_expression = var.lambda_schedule_expression
105105
tags = var.tags
106106
state = var.state_event_rule_ami_housekeeper
@@ -127,6 +127,7 @@ resource "aws_lambda_permission" "ami_housekeeper" {
127127

128128
resource "aws_iam_role_policy" "ami_housekeeper_xray" {
129129
count = var.tracing_config.mode != null ? 1 : 0
130+
name = "xray-policy"
130131
policy = data.aws_iam_policy_document.lambda_xray[0].json
131132
role = aws_iam_role.ami_housekeeper.name
132133
}

Diff for: modules/runner-binaries-syncer/runner-binaries-syncer.tf

+3-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ data "aws_iam_policy_document" "lambda_assume_role_policy" {
103103
}
104104

105105
resource "aws_iam_role_policy" "lambda_logging" {
106-
name = "${var.prefix}-lambda-logging-policy-syncer"
106+
name = "logging-policys"
107107
role = aws_iam_role.syncer_lambda.id
108108

109109
policy = templatefile("${path.module}/policies/lambda-cloudwatch.json", {
@@ -112,7 +112,7 @@ resource "aws_iam_role_policy" "lambda_logging" {
112112
}
113113

114114
resource "aws_iam_role_policy" "syncer" {
115-
name = "${var.prefix}-lambda-syncer-s3-policy"
115+
name = "s3-policy"
116116
role = aws_iam_role.syncer_lambda.id
117117

118118
policy = templatefile("${path.module}/policies/lambda-syncer.json", {
@@ -186,6 +186,7 @@ resource "aws_lambda_permission" "on_deploy" {
186186

187187
resource "aws_iam_role_policy" "syncer_lambda_xray" {
188188
count = var.tracing_config.mode != null ? 1 : 0
189+
name = "xray-policy"
189190
policy = data.aws_iam_policy_document.lambda_xray[0].json
190191
role = aws_iam_role.syncer_lambda.name
191192
}

Diff for: modules/runners/pool/main.tf

+3-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ resource "aws_iam_role" "pool" {
8181
}
8282

8383
resource "aws_iam_role_policy" "pool" {
84-
name = "${var.config.prefix}-lambda-pool-policy"
84+
name = "pool-policy"
8585
role = aws_iam_role.pool.name
8686
policy = templatefile("${path.module}/policies/lambda-pool.json", {
8787
arn_ssm_parameters_path_config = var.config.arn_ssm_parameters_path_config
@@ -94,7 +94,7 @@ resource "aws_iam_role_policy" "pool" {
9494
}
9595

9696
resource "aws_iam_role_policy" "pool_logging" {
97-
name = "${var.config.prefix}-lambda-logging"
97+
name = "logging-policy"
9898
role = aws_iam_role.pool.name
9999
policy = templatefile("${path.module}/../policies/lambda-cloudwatch.json", {
100100
log_group_arn = aws_cloudwatch_log_group.pool.arn
@@ -174,6 +174,7 @@ data "aws_iam_policy_document" "lambda_xray" {
174174

175175
resource "aws_iam_role_policy" "pool_xray" {
176176
count = var.tracing_config.mode != null ? 1 : 0
177+
name = "xray-policy"
177178
policy = data.aws_iam_policy_document.lambda_xray[0].json
178179
role = aws_iam_role.pool.name
179180
}

Diff for: modules/runners/scale-down.tf

+3-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ resource "aws_iam_role" "scale_down" {
9090
}
9191

9292
resource "aws_iam_role_policy" "scale_down" {
93-
name = "${var.prefix}-lambda-scale-down-policy"
93+
name = "scale-down-policy"
9494
role = aws_iam_role.scale_down.name
9595
policy = templatefile("${path.module}/policies/lambda-scale-down.json", {
9696
environment = var.prefix
@@ -101,7 +101,7 @@ resource "aws_iam_role_policy" "scale_down" {
101101
}
102102

103103
resource "aws_iam_role_policy" "scale_down_logging" {
104-
name = "${var.prefix}-lambda-logging"
104+
name = "logging-policy"
105105
role = aws_iam_role.scale_down.name
106106
policy = templatefile("${path.module}/policies/lambda-cloudwatch.json", {
107107
log_group_arn = aws_cloudwatch_log_group.scale_down.arn
@@ -116,6 +116,7 @@ resource "aws_iam_role_policy_attachment" "scale_down_vpc_execution_role" {
116116

117117
resource "aws_iam_role_policy" "scale_down_xray" {
118118
count = var.tracing_config.mode != null ? 1 : 0
119+
name = "xray-policy"
119120
policy = data.aws_iam_policy_document.lambda_xray[0].json
120121
role = aws_iam_role.scale_down.name
121122
}

Diff for: modules/runners/scale-up.tf

+4-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ resource "aws_iam_role" "scale_up" {
9595
}
9696

9797
resource "aws_iam_role_policy" "scale_up" {
98-
name = "${var.prefix}-lambda-scale-up-policy"
98+
name = "scale-up-policy"
9999
role = aws_iam_role.scale_up.name
100100
policy = templatefile("${path.module}/policies/lambda-scale-up.json", {
101101
arn_runner_instance_role = aws_iam_role.runner.arn
@@ -110,7 +110,7 @@ resource "aws_iam_role_policy" "scale_up" {
110110

111111

112112
resource "aws_iam_role_policy" "scale_up_logging" {
113-
name = "${var.prefix}-lambda-logging"
113+
name = "logging-policy"
114114
role = aws_iam_role.scale_up.name
115115
policy = templatefile("${path.module}/policies/lambda-cloudwatch.json", {
116116
log_group_arn = aws_cloudwatch_log_group.scale_up.arn
@@ -119,7 +119,7 @@ resource "aws_iam_role_policy" "scale_up_logging" {
119119

120120
resource "aws_iam_role_policy" "service_linked_role" {
121121
count = var.create_service_linked_role_spot ? 1 : 0
122-
name = "${var.prefix}-service_linked_role"
122+
name = "service_linked_role"
123123
role = aws_iam_role.scale_up.name
124124
policy = templatefile("${path.module}/policies/service-linked-role-create-policy.json", { aws_partition = var.aws_partition })
125125
}
@@ -138,6 +138,7 @@ resource "aws_iam_role_policy_attachment" "ami_id_ssm_parameter_read" {
138138

139139
resource "aws_iam_role_policy" "scale_up_xray" {
140140
count = var.tracing_config.mode != null ? 1 : 0
141+
name = "xray-policy"
141142
policy = data.aws_iam_policy_document.lambda_xray[0].json
142143
role = aws_iam_role.scale_up.name
143144
}

Diff for: modules/runners/ssm-housekeeper.tf

+3-2
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ resource "aws_iam_role" "ssm_housekeeper" {
9292
}
9393

9494
resource "aws_iam_role_policy" "ssm_housekeeper" {
95-
name = "lambda-ssm"
95+
name = "ssm-policy"
9696
role = aws_iam_role.ssm_housekeeper.name
9797
policy = templatefile("${path.module}/policies/lambda-ssm-housekeeper.json", {
9898
ssm_token_path = "arn:${var.aws_partition}:ssm:${var.aws_region}:${data.aws_caller_identity.current.account_id}:parameter${local.token_path}"
9999
})
100100
}
101101

102102
resource "aws_iam_role_policy" "ssm_housekeeper_logging" {
103-
name = "lambda-logging"
103+
name = "logging-policy"
104104
role = aws_iam_role.ssm_housekeeper.name
105105
policy = templatefile("${path.module}/policies/lambda-cloudwatch.json", {
106106
log_group_arn = aws_cloudwatch_log_group.ssm_housekeeper.arn
@@ -115,6 +115,7 @@ resource "aws_iam_role_policy_attachment" "ssm_housekeeper_vpc_execution_role" {
115115

116116
resource "aws_iam_role_policy" "ssm_housekeeper_xray" {
117117
count = var.tracing_config.mode != null ? 1 : 0
118+
name = "xray-policy"
118119
policy = data.aws_iam_policy_document.lambda_xray[0].json
119120
role = aws_iam_role.ssm_housekeeper.name
120121
}

Diff for: modules/webhook/webhook.tf

+5-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ resource "aws_iam_role" "webhook_lambda" {
102102
}
103103

104104
resource "aws_iam_role_policy" "webhook_logging" {
105-
name = "${var.prefix}-lambda-logging-policy"
105+
name = "logging-policy"
106106
role = aws_iam_role.webhook_lambda.name
107107
policy = templatefile("${path.module}/policies/lambda-cloudwatch.json", {
108108
log_group_arn = aws_cloudwatch_log_group.webhook.arn
@@ -116,7 +116,7 @@ resource "aws_iam_role_policy_attachment" "webhook_vpc_execution_role" {
116116
}
117117

118118
resource "aws_iam_role_policy" "webhook_sqs" {
119-
name = "${var.prefix}-lambda-webhook-publish-sqs-policy"
119+
name = "publish-sqs-policy"
120120
role = aws_iam_role.webhook_lambda.name
121121

122122
policy = templatefile("${path.module}/policies/lambda-publish-sqs-policy.json", {
@@ -127,7 +127,7 @@ resource "aws_iam_role_policy" "webhook_sqs" {
127127

128128
resource "aws_iam_role_policy" "webhook_workflow_job_sqs" {
129129
count = var.sqs_workflow_job_queue != null ? 1 : 0
130-
name = "${var.prefix}-lambda-webhook-publish-workflow-job-sqs-policy"
130+
name = "publish-workflow-job-sqs-policy"
131131
role = aws_iam_role.webhook_lambda.name
132132

133133
policy = templatefile("${path.module}/policies/lambda-publish-sqs-policy.json", {
@@ -137,7 +137,7 @@ resource "aws_iam_role_policy" "webhook_workflow_job_sqs" {
137137
}
138138

139139
resource "aws_iam_role_policy" "webhook_ssm" {
140-
name = "${var.prefix}-lambda-webhook-publish-ssm-policy"
140+
name = "publish-ssm-policy"
141141
role = aws_iam_role.webhook_lambda.name
142142

143143
policy = templatefile("${path.module}/policies/lambda-ssm.json", {
@@ -148,6 +148,7 @@ resource "aws_iam_role_policy" "webhook_ssm" {
148148

149149
resource "aws_iam_role_policy" "xray" {
150150
count = var.tracing_config.mode != null ? 1 : 0
151+
name = "xray-policy"
151152
policy = data.aws_iam_policy_document.lambda_xray[0].json
152153
role = aws_iam_role.webhook_lambda.name
153154
}

0 commit comments

Comments
 (0)