From c14cc37e0ced977388baaff750648dbbfd9a36de Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Thu, 11 May 2023 09:48:07 -0300 Subject: [PATCH 1/1] 20482: Improves readability of instance profile assignment code. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- tools/salt-install/terraform/aws/services/locals.tf | 6 ++++++ tools/salt-install/terraform/aws/services/main.tf | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/salt-install/terraform/aws/services/locals.tf b/tools/salt-install/terraform/aws/services/locals.tf index 191b7e03e0..9b95ebdbc7 100644 --- a/tools/salt-install/terraform/aws/services/locals.tf +++ b/tools/salt-install/terraform/aws/services/locals.tf @@ -18,4 +18,10 @@ locals { instance_ami_id = var.instance_ami != "" ? var.instance_ami : data.aws_ami.debian-11.image_id custom_tags = data.terraform_remote_state.vpc.outputs.custom_tags compute_node_iam_role_name = data.terraform_remote_state.data-storage.outputs.compute_node_iam_role_name + instance_profile = { + default = aws_iam_instance_profile.default_instance_profile + controller = aws_iam_instance_profile.dispatcher_instance_profile + keep0 = aws_iam_instance_profile.keepstore_instance_profile + keep1 = aws_iam_instance_profile.keepstore_instance_profile + } } diff --git a/tools/salt-install/terraform/aws/services/main.tf b/tools/salt-install/terraform/aws/services/main.tf index 48b6ef23cb..06b89dc779 100644 --- a/tools/salt-install/terraform/aws/services/main.tf +++ b/tools/salt-install/terraform/aws/services/main.tf @@ -58,9 +58,10 @@ resource "aws_instance" "arvados_service" { subnet_id = contains(local.user_facing_hosts, each.value) ? data.terraform_remote_state.vpc.outputs.public_subnet_id : data.terraform_remote_state.vpc.outputs.private_subnet_id vpc_security_group_ids = [ data.terraform_remote_state.vpc.outputs.arvados_sg_id ] # This should be done in a more readable way - iam_instance_profile = each.value == "controller" ? aws_iam_instance_profile.dispatcher_instance_profile.name : length(regexall("^keep[0-9]+", each.value)) > 0 ? aws_iam_instance_profile.keepstore_instance_profile.name : aws_iam_instance_profile.default_instance_profile.name + # iam_instance_profile = each.value == "controller" ? aws_iam_instance_profile.dispatcher_instance_profile.name : length(regexall("^keep[0-9]+", each.value)) > 0 ? aws_iam_instance_profile.keepstore_instance_profile.name : aws_iam_instance_profile.default_instance_profile.name + iam_instance_profile = try(local.instance_profile[each.value], local.instance_profile.default).name tags = { - Name = "arvados_service_${each.value}" + Name = "${local.cluster_name}_arvados_service_${each.value}" } root_block_device { volume_type = "gp3" -- 2.30.2