Skip to content

fix: align inlince policies #4046

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 7, 2024
Merged

fix: align inlince policies #4046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c194f
fix: align inlince policies
npalm Aug 7, 2024
23eccf1
Merge branch 'main' into npalm/inline-policies
npalm Aug 7, 2024
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
7 changes: 4 additions & 3 deletions modules/ami-housekeeper/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ data "aws_iam_policy_document" "lambda_assume_role_policy" {
}

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

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

resource "aws_iam_role_policy" "ami_housekeeper" {
name = "${var.prefix}-lambda-ami-policy"
name = "lambda-ami-policy"
role = aws_iam_role.ami_housekeeper.id

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

resource "aws_cloudwatch_event_rule" "ami_housekeeper" {
name = "${var.prefix}-ami-housekeeper-rule"
name = "ami-housekeeper-rule"
schedule_expression = var.lambda_schedule_expression
tags = var.tags
state = var.state_event_rule_ami_housekeeper
Expand All @@ -127,6 +127,7 @@ resource "aws_lambda_permission" "ami_housekeeper" {

resource "aws_iam_role_policy" "ami_housekeeper_xray" {
count = var.tracing_config.mode != null ? 1 : 0
name = "xray-policy"
policy = data.aws_iam_policy_document.lambda_xray[0].json
role = aws_iam_role.ami_housekeeper.name
}
5 changes: 3 additions & 2 deletions modules/runner-binaries-syncer/runner-binaries-syncer.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ data "aws_iam_policy_document" "lambda_assume_role_policy" {
}

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

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

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

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

resource "aws_iam_role_policy" "syncer_lambda_xray" {
count = var.tracing_config.mode != null ? 1 : 0
name = "xray-policy"
policy = data.aws_iam_policy_document.lambda_xray[0].json
role = aws_iam_role.syncer_lambda.name
}
5 changes: 3 additions & 2 deletions modules/runners/pool/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ resource "aws_iam_role" "pool" {
}

resource "aws_iam_role_policy" "pool" {
name = "${var.config.prefix}-lambda-pool-policy"
name = "pool-policy"
role = aws_iam_role.pool.name
policy = templatefile("${path.module}/policies/lambda-pool.json", {
arn_ssm_parameters_path_config = var.config.arn_ssm_parameters_path_config
Expand All @@ -94,7 +94,7 @@ resource "aws_iam_role_policy" "pool" {
}

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

resource "aws_iam_role_policy" "pool_xray" {
count = var.tracing_config.mode != null ? 1 : 0
name = "xray-policy"
policy = data.aws_iam_policy_document.lambda_xray[0].json
role = aws_iam_role.pool.name
}
5 changes: 3 additions & 2 deletions modules/runners/scale-down.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ resource "aws_iam_role" "scale_down" {
}

resource "aws_iam_role_policy" "scale_down" {
name = "${var.prefix}-lambda-scale-down-policy"
name = "scale-down-policy"
role = aws_iam_role.scale_down.name
policy = templatefile("${path.module}/policies/lambda-scale-down.json", {
environment = var.prefix
Expand All @@ -101,7 +101,7 @@ resource "aws_iam_role_policy" "scale_down" {
}

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

resource "aws_iam_role_policy" "scale_down_xray" {
count = var.tracing_config.mode != null ? 1 : 0
name = "xray-policy"
policy = data.aws_iam_policy_document.lambda_xray[0].json
role = aws_iam_role.scale_down.name
}
7 changes: 4 additions & 3 deletions modules/runners/scale-up.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ resource "aws_iam_role" "scale_up" {
}

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


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

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

resource "aws_iam_role_policy" "scale_up_xray" {
count = var.tracing_config.mode != null ? 1 : 0
name = "xray-policy"
policy = data.aws_iam_policy_document.lambda_xray[0].json
role = aws_iam_role.scale_up.name
}
5 changes: 3 additions & 2 deletions modules/runners/ssm-housekeeper.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ resource "aws_iam_role" "ssm_housekeeper" {
}

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

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

resource "aws_iam_role_policy" "ssm_housekeeper_xray" {
count = var.tracing_config.mode != null ? 1 : 0
name = "xray-policy"
policy = data.aws_iam_policy_document.lambda_xray[0].json
role = aws_iam_role.ssm_housekeeper.name
}
9 changes: 5 additions & 4 deletions modules/webhook/webhook.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ resource "aws_iam_role" "webhook_lambda" {
}

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

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

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

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

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

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

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

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