@@ -370,7 +370,7 @@ resource "aws_iam_policy" "instance_docker_machine_policy" {
370
370
resource "aws_iam_role_policy_attachment" "instance_docker_machine_policy" {
371
371
count = var. create_runner_iam_role ? 1 : 0
372
372
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
374
374
policy_arn = aws_iam_policy. instance_docker_machine_policy [count . index ]. arn
375
375
}
376
376
@@ -390,14 +390,14 @@ resource "aws_iam_policy" "instance_session_manager_policy" {
390
390
resource "aws_iam_role_policy_attachment" "instance_session_manager_policy" {
391
391
count = var. enable_runner_ssm_access ? 1 : 0
392
392
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
394
394
policy_arn = aws_iam_policy. instance_session_manager_policy [0 ]. arn
395
395
}
396
396
397
397
resource "aws_iam_role_policy_attachment" "instance_session_manager_aws_managed" {
398
398
count = var. enable_runner_ssm_access ? 1 : 0
399
399
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
401
401
policy_arn = " arn:${ data . aws_partition . current . partition } :iam::aws:policy/AmazonSSMManagedInstanceCore"
402
402
}
403
403
@@ -407,7 +407,7 @@ resource "aws_iam_role_policy_attachment" "instance_session_manager_aws_managed"
407
407
resource "aws_iam_role_policy_attachment" "user_defined_policies" {
408
408
count = length (var. runner_iam_policy_arns )
409
409
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
411
411
policy_arn = var. runner_iam_policy_arns [count . index ]
412
412
}
413
413
@@ -420,7 +420,7 @@ resource "aws_iam_role_policy_attachment" "docker_machine_cache_instance" {
420
420
use aws_iam_role.docker_machine.name here! See https://docs.gitlab.com/runner/configuration/advanced-configuration.html */
421
421
count = var. cache_bucket [" create" ] || length (lookup (var. cache_bucket , " policy" , " " )) > 0 ? 1 : 0
422
422
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
424
424
policy_arn = local. bucket_policy
425
425
}
426
426
0 commit comments