From 6200cef9e121484f0ed7934d5e4acfa3770b599f Mon Sep 17 00:00:00 2001
From: rstuhlmuller <rodmans@aviatrix.com>
Date: Thu, 7 Dec 2023 14:01:22 -0800
Subject: [PATCH] fix: token override

---
 main.tf      | 13 ++++++++-----
 variables.tf |  4 ++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/main.tf b/main.tf
index 7b50aad..ae79755 100644
--- a/main.tf
+++ b/main.tf
@@ -5,13 +5,14 @@ locals {
   dkr_img_src_path   = "${path.module}/docker-src"
   dkr_img_src_sha256 = sha256(join("", [for f in fileset(".", "${local.dkr_img_src_path}/**") : file(f)]))
 
-  dkr_build_cmd = <<-EOT
+  dkr_build_cmd    = <<-EOT
         docker build -t ${aws_ecr_repository.runner_image.repository_url}:${local.image_tag} ${local.dkr_img_src_path}
 
         aws ecr get-login-password --region ${data.aws_region.current.name} | docker login --username AWS --password-stdin ${data.aws_caller_identity.current.account_id}.dkr.ecr.${data.aws_region.current.name}.amazonaws.com
 
         docker push ${aws_ecr_repository.runner_image.repository_url}:${local.image_tag}
     EOT
+  github_token_arn = try(var.secret_arn_override, aws_secretsmanager_secret.github_token[0].arn)
 }
 
 resource "aws_ecr_repository" "runner_image" {
@@ -57,11 +58,13 @@ resource "aws_ecs_service" "runner" {
 }
 
 resource "aws_secretsmanager_secret" "github_token" {
-  name = var.secret_name
+  count = var.secret_arn_override == null ? 1 : 0
+  name  = var.secret_name
 }
 
 resource "aws_secretsmanager_secret_version" "github_token" {
-  secret_id     = aws_secretsmanager_secret.github_token.id
+  count         = var.secret_arn_override == null ? 1 : 0
+  secret_id     = aws_secretsmanager_secret.github_token[0].id
   secret_string = var.runner_token
 }
 
@@ -92,7 +95,7 @@ resource "aws_iam_role" "ecs_task_execution_role" {
           Action = [
             "secretsmanager:GetSecretValue"
           ]
-          Resource = "${aws_secretsmanager_secret.github_token.arn}"
+          Resource = "${local.github_token_arn}"
         },
         {
           Sid    = "ECR"
@@ -163,7 +166,7 @@ resource "aws_ecs_task_definition" "runner" {
       "secrets" : [
         {
           "name" : "GH_TOKEN",
-          "valueFrom" : "${aws_secretsmanager_secret.github_token.arn}"
+          "valueFrom" : "${local.github_token_arn}"
         }
       ],
       "essential" : true,
diff --git a/variables.tf b/variables.tf
index c5549d9..427fd1e 100644
--- a/variables.tf
+++ b/variables.tf
@@ -43,3 +43,7 @@ variable "service_name" {
   type    = string
   default = "github-runner"
 }
+
+variable "secret_arn_override" {
+  type = string
+}
\ No newline at end of file