Skip to content

Commit 6c74058

Browse files
committed
fix: error IAM role attachement when applying the module the first time (#591)
1 parent c58aaaa commit 6c74058

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

logging.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
resource "aws_iam_role_policy" "instance" {
22
count = var.enable_cloudwatch_logging && var.create_runner_iam_role ? 1 : 0
33
name = "${local.name_iam_objects}-logging"
4-
role = local.aws_iam_role_instance_name
4+
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : var.runner_iam_role_name
55
policy = templatefile("${path.module}/policies/instance-logging-policy.json", { partition = data.aws_partition.current.partition })
66
}
77

main.tf

+5-5
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ resource "aws_iam_policy" "instance_docker_machine_policy" {
370370
resource "aws_iam_role_policy_attachment" "instance_docker_machine_policy" {
371371
count = var.create_runner_iam_role ? 1 : 0
372372

373-
role = local.aws_iam_role_instance_name
373+
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : var.runner_iam_role_name
374374
policy_arn = aws_iam_policy.instance_docker_machine_policy[count.index].arn
375375
}
376376

@@ -390,14 +390,14 @@ resource "aws_iam_policy" "instance_session_manager_policy" {
390390
resource "aws_iam_role_policy_attachment" "instance_session_manager_policy" {
391391
count = var.enable_runner_ssm_access ? 1 : 0
392392

393-
role = local.aws_iam_role_instance_name
393+
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : var.runner_iam_role_name
394394
policy_arn = aws_iam_policy.instance_session_manager_policy[0].arn
395395
}
396396

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

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

@@ -407,7 +407,7 @@ resource "aws_iam_role_policy_attachment" "instance_session_manager_aws_managed"
407407
resource "aws_iam_role_policy_attachment" "user_defined_policies" {
408408
count = length(var.runner_iam_policy_arns)
409409

410-
role = local.aws_iam_role_instance_name
410+
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : var.runner_iam_role_name
411411
policy_arn = var.runner_iam_policy_arns[count.index]
412412
}
413413

@@ -420,7 +420,7 @@ resource "aws_iam_role_policy_attachment" "docker_machine_cache_instance" {
420420
use aws_iam_role.docker_machine.name here! See https://docs.gitlab.com/runner/configuration/advanced-configuration.html */
421421
count = var.cache_bucket["create"] || length(lookup(var.cache_bucket, "policy", "")) > 0 ? 1 : 0
422422

423-
role = local.aws_iam_role_instance_name
423+
role = var.create_runner_iam_role ? aws_iam_role.instance[0].name : var.runner_iam_role_name
424424
policy_arn = local.bucket_policy
425425
}
426426

0 commit comments

Comments
 (0)