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

Commit 0bebeef

Browse files
fix: remove duplicate vpc execution permissions (#3304)
* fix(runners): remove duplicate VPC permissions * fix(syncer): remove duplicate permissions * docs: auto update terraform docs * fix(pool): remove duplicate permissions --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 96ca1cd commit 0bebeef

File tree

8 files changed

+0
-63
lines changed

8 files changed

+0
-63
lines changed

Diff for: modules/runner-binaries-syncer/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ No modules.
6363
| [aws_iam_role.syncer_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
6464
| [aws_iam_role_policy.lambda_kms](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
6565
| [aws_iam_role_policy.lambda_logging](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
66-
| [aws_iam_role_policy.lambda_syncer_vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
6766
| [aws_iam_role_policy.syncer](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
6867
| [aws_iam_role_policy.syncer_lambda_xray](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
6968
| [aws_iam_role_policy_attachment.syncer_vpc_execution_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |

Diff for: modules/runner-binaries-syncer/policies/lambda-vpc.json

-14
This file was deleted.

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

-8
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ resource "aws_iam_role_policy" "lambda_logging" {
108108
})
109109
}
110110

111-
resource "aws_iam_role_policy" "lambda_syncer_vpc" {
112-
count = length(var.lambda_subnet_ids) > 0 && length(var.lambda_security_group_ids) > 0 ? 1 : 0
113-
name = "${var.prefix}-lambda-syncer-vpc"
114-
role = aws_iam_role.syncer_lambda.id
115-
116-
policy = file("${path.module}/policies/lambda-vpc.json")
117-
}
118-
119111
resource "aws_iam_role_policy" "syncer" {
120112
name = "${var.prefix}-lambda-syncer-s3-policy"
121113
role = aws_iam_role.syncer_lambda.id

Diff for: modules/runners/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ yarn run dist
8787
| [aws_iam_role_policy.describe_tags](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
8888
| [aws_iam_role_policy.dist_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
8989
| [aws_iam_role_policy.ec2](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
90-
| [aws_iam_role_policy.lambda_scale_down_vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
91-
| [aws_iam_role_policy.lambda_scale_up_vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
9290
| [aws_iam_role_policy.runner_session_manager_aws_managed](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
9391
| [aws_iam_role_policy.scale_down](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
9492
| [aws_iam_role_policy.scale_down_logging](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |

Diff for: modules/runners/policies/lambda-vpc.json

-14
This file was deleted.

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

-8
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,6 @@ resource "aws_iam_role_policy" "pool_logging" {
9494
})
9595
}
9696

97-
resource "aws_iam_role_policy" "lambda_pool_vpc" {
98-
count = length(var.config.lambda.subnet_ids) > 0 && length(var.config.lambda.security_group_ids) > 0 ? 1 : 0
99-
name = "${var.config.prefix}-lambda-pool-vpc"
100-
role = aws_iam_role.pool.id
101-
102-
policy = file("${path.module}/../policies/lambda-vpc.json")
103-
}
104-
10597
resource "aws_iam_role_policy_attachment" "pool_vpc_execution_role" {
10698
count = length(var.config.lambda.subnet_ids) > 0 ? 1 : 0
10799
role = aws_iam_role.pool.name

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

-8
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,6 @@ resource "aws_iam_role_policy" "scale_down_logging" {
104104
})
105105
}
106106

107-
resource "aws_iam_role_policy" "lambda_scale_down_vpc" {
108-
count = length(var.lambda_subnet_ids) > 0 && length(var.lambda_security_group_ids) > 0 ? 1 : 0
109-
name = "${var.prefix}-lambda-scale-down-vpc"
110-
role = aws_iam_role.scale_down.id
111-
112-
policy = file("${path.module}/policies/lambda-vpc.json")
113-
}
114-
115107
resource "aws_iam_role_policy_attachment" "scale_down_vpc_execution_role" {
116108
count = length(var.lambda_subnet_ids) > 0 ? 1 : 0
117109
role = aws_iam_role.scale_down.name

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

-8
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,6 @@ resource "aws_iam_role_policy" "service_linked_role" {
118118
policy = templatefile("${path.module}/policies/service-linked-role-create-policy.json", { aws_partition = var.aws_partition })
119119
}
120120

121-
resource "aws_iam_role_policy" "lambda_scale_up_vpc" {
122-
count = length(var.lambda_subnet_ids) > 0 && length(var.lambda_security_group_ids) > 0 ? 1 : 0
123-
name = "${var.prefix}-lambda-scale-up-vpc"
124-
role = aws_iam_role.scale_up.id
125-
126-
policy = file("${path.module}/policies/lambda-vpc.json")
127-
}
128-
129121
resource "aws_iam_role_policy_attachment" "scale_up_vpc_execution_role" {
130122
count = length(var.lambda_subnet_ids) > 0 ? 1 : 0
131123
role = aws_iam_role.scale_up.name

0 commit comments

Comments
 (0)