Skip to content

fix: error IAM role attachement when applying the module the first ti… #659

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

Merged
merged 9 commits into from
Feb 26, 2023
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
27 changes: 14 additions & 13 deletions examples/runner-default/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion logging.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resource "aws_iam_role_policy" "instance" {
count = var.enable_cloudwatch_logging && var.create_runner_iam_role ? 1 : 0
name = "${local.name_iam_objects}-logging"
role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy = templatefile("${path.module}/policies/instance-logging-policy.json", { partition = data.aws_partition.current.partition })
}

Expand Down
14 changes: 7 additions & 7 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,14 @@ resource "aws_iam_policy" "instance_session_manager_policy" {
resource "aws_iam_role_policy_attachment" "instance_session_manager_policy" {
count = var.enable_runner_ssm_access ? 1 : 0

role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy_arn = aws_iam_policy.instance_session_manager_policy[0].arn
}

resource "aws_iam_role_policy_attachment" "instance_session_manager_aws_managed" {
count = var.enable_runner_ssm_access ? 1 : 0

role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonSSMManagedInstanceCore"
}

Expand All @@ -413,7 +413,7 @@ resource "aws_iam_role_policy_attachment" "instance_session_manager_aws_managed"
resource "aws_iam_role_policy_attachment" "user_defined_policies" {
count = length(var.runner_iam_policy_arns)

role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy_arn = var.runner_iam_policy_arns[count.index]
}

Expand All @@ -426,7 +426,7 @@ resource "aws_iam_role_policy_attachment" "docker_machine_cache_instance" {
use aws_iam_role.docker_machine.name here! See https://docs.gitlab.com/runner/configuration/advanced-configuration.html */
count = var.runners_executor == "docker+machine" ? (var.cache_bucket["create"] || lookup(var.cache_bucket, "policy", "") != "" ? 1 : 0) : 0

role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy_arn = local.bucket_policy
}

Expand Down Expand Up @@ -482,7 +482,7 @@ resource "aws_iam_policy" "service_linked_role" {
resource "aws_iam_role_policy_attachment" "service_linked_role" {
count = var.allow_iam_service_linked_role_creation ? 1 : 0

role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy_arn = aws_iam_policy.service_linked_role[0].arn
}

Expand All @@ -506,7 +506,7 @@ resource "aws_iam_policy" "ssm" {
resource "aws_iam_role_policy_attachment" "ssm" {
count = var.enable_manage_gitlab_token ? 1 : 0

role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy_arn = aws_iam_policy.ssm[0].arn
}

Expand All @@ -526,7 +526,7 @@ resource "aws_iam_policy" "eip" {
resource "aws_iam_role_policy_attachment" "eip" {
count = var.enable_eip ? 1 : 0

role = local.aws_iam_role_instance_name
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : local.aws_iam_role_instance_name
policy_arn = aws_iam_policy.eip[0].arn
}

Expand Down