From 77efa8a60953b860773d991fd4164c3811572b1a Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Sat, 29 Jun 2024 16:41:07 -0400
Subject: [PATCH] Make bors app ID distinct for each env

---
 terragrunt/accounts/bors-prod/app/terragrunt.hcl    | 1 +
 terragrunt/accounts/bors-staging/app/terragrunt.hcl | 1 +
 terragrunt/modules/bors/main.tf                     | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/terragrunt/accounts/bors-prod/app/terragrunt.hcl b/terragrunt/accounts/bors-prod/app/terragrunt.hcl
index 3ac378254..653fdb183 100644
--- a/terragrunt/accounts/bors-prod/app/terragrunt.hcl
+++ b/terragrunt/accounts/bors-prod/app/terragrunt.hcl
@@ -9,4 +9,5 @@ include {
 
 inputs = {
   domain = "bors-prod.rust-lang.net"
+  gh_app_id = "278306"
 }
diff --git a/terragrunt/accounts/bors-staging/app/terragrunt.hcl b/terragrunt/accounts/bors-staging/app/terragrunt.hcl
index 3ecbd0174..7b89ec2dd 100644
--- a/terragrunt/accounts/bors-staging/app/terragrunt.hcl
+++ b/terragrunt/accounts/bors-staging/app/terragrunt.hcl
@@ -9,4 +9,5 @@ include {
 
 inputs = {
   domain = "bors-staging.rust-lang.net"
+  gh_app_id = "343095"
 }
diff --git a/terragrunt/modules/bors/main.tf b/terragrunt/modules/bors/main.tf
index 32b944681..355f82062 100644
--- a/terragrunt/modules/bors/main.tf
+++ b/terragrunt/modules/bors/main.tf
@@ -272,7 +272,7 @@ resource "aws_ecs_task_definition" "bors" {
       environment = [
         {
           name  = "APP_ID"
-          value = "343095"
+          value = "${var.gh_app_id}"
         },
         {
           name  = "RUST_LOG"
@@ -494,3 +494,7 @@ resource "aws_vpc_security_group_egress_rule" "rds_egress_anywhere_v6" {
 variable "domain" {
   description = "domain to use"
 }
+
+variable "gh_app_id" {
+  description = "GitHub App ID"
+}