From 76a18a736201c5241b468dfce2aa1c5c62933f78 Mon Sep 17 00:00:00 2001 From: arnol377 Date: Thu, 19 Sep 2024 17:47:37 -0400 Subject: [PATCH] adding stuff --- main.tf | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/main.tf b/main.tf index 89214de..b4514ae 100644 --- a/main.tf +++ b/main.tf @@ -20,7 +20,7 @@ locals { #"AWS_SECRET_ACCESS_KEY", #"AWS_SESSION_TOKEN", #"AWS_ACCESS_KEY_ID", - #"GITHUB_TOKEN" + "GITHUB_TOKEN" ] } @@ -74,7 +74,7 @@ module "github-runner" { source = "HappyPathway/github-runner/ecs" ecs_cluster = data.aws_ecs_cluster.github-runner.cluster_name hostname = each.value - image = "229685449397.dkr.ecr.us-gov-west-1.amazonaws.com/docker-image-pipeline/${var.image_name}:${var.image_version}" + image = "229685449397.dkr.ecr.us-gov-west-1.amazonaws.com/github-runners/${var.image_name}:${var.image_version}" repo_org = var.repo_org repo_name = each.value namespace = "${terraform.workspace}-${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}" @@ -103,23 +103,17 @@ module "env_var" { env_var = each.value } -#module "repo_secrets" { -# source = "HappyPathway/vars/repo" -# for_each = toset(local.all_repos) -# repo = { -# name = each.value -# } -# secrets = [ -# for secret in [for secret in local.secrets : secret if secret != "AWS_ACCESS_KEY_ID"] : -# { -# name = replace(secret, "GITHUB", "GH") -# value = lookup(module.env_var, secret).value -# } -# ] -# vars = [ -# { -# name = "AWS_ACCESS_KEY_ID" -# value = lookup(module.env_var, "AWS_ACCESS_KEY_ID").value -# } -# ] -#} +module "repo_secrets" { + source = "HappyPathway/vars/repo" + for_each = toset(local.all_repos) + repo = { + name = each.value + } + secrets = [ + for secret in local.secrets : + { + name = replace(secret, "GITHUB", "GH") + value = lookup(module.env_var, secret).value + } + ] +}