Refactor github app parameter

Author: npalm

examples/default/main.tf

@@ -20,11 +20,13 @@ module "runners" {
     Project = "ProjectX"
   }
 
-  github_app_client_id      = var.github_app_client_id
-  github_app_client_secret  = var.github_app_client_secret
-  github_app_id             = var.github_app_id
-  github_app_key_base64     = var.github_app_key_base64
-  github_app_webhook_secret = random_password.random.result
+  github_app = {
+    key_base64     = var.github_app_key_base64
+    id             = var.github_app_id
+    client_id      = var.github_app_client_id
+    client_secret  = var.github_app_client_secret
+    webhook_secret = random_password.random.result
+  }
 
   enable_organization_runners = false
 }

main.tf

@@ -30,7 +30,7 @@ module "webhook" {
   tags        = local.tags
 
   sqs_build_queue           = aws_sqs_queue.queued_builds
-  github_app_webhook_secret = var.github_app_webhook_secret
+  github_app_webhook_secret = var.github_app.webhook_secret
 }
 
 module "runners" {
@@ -47,10 +47,7 @@ module "runners" {
 
   sqs = aws_sqs_queue.queued_builds
 
-  github_app_client_id     = var.github_app_client_id
-  github_app_client_secret = var.github_app_client_secret
-  github_app_id            = var.github_app_id
-  github_app_key_base64    = var.github_app_key_base64
+  github_app = var.github_app
 
   enable_organization_runners = var.enable_organization_runners
 }

modules/runners/scale-runners-lambda.tf

@@ -10,10 +10,10 @@ resource "aws_lambda_function" "scale_runners_lambda" {
   environment {
     variables = {
       ENABLE_ORGANIZATION_RUNNERS = var.enable_organization_runners
-      GITHUB_APP_KEY_BASE64       = var.github_app_key_base64
-      GITHUB_APP_ID               = var.github_app_id
-      GITHUB_APP_CLIENT_ID        = var.github_app_client_id
-      GITHUB_APP_CLIENT_SECRET    = var.github_app_client_secret
+      GITHUB_APP_KEY_BASE64       = var.github_app.key_base64
+      GITHUB_APP_ID               = var.github_app.id
+      GITHUB_APP_CLIENT_ID        = var.github_app.client_id
+      GITHUB_APP_CLIENT_SECRET    = var.github_app.client_secret
       SUBNET_IDS                  = join(",", var.subnet_ids)
       LAUNCH_TEMPLATE_NAME        = aws_launch_template.runner.name
       LAUNCH_TEMPLATE_VERSION     = aws_launch_template.runner.latest_version

modules/runners/variables.tf

@@ -98,10 +98,13 @@ variable "enable_organization_runners" {
   type = bool
 }
 
-variable "github_app_key_base64" {}
-
-variable "github_app_id" {}
-
-variable "github_app_client_id" {}
+variable "github_app" {
+  description = "GitHub app parameters, see your github aapp. Ensure the key is base64 encoded."
+  type = object({
+    key_base64    = string
+    id            = string
+    client_id     = string
+    client_secret = string
+  })
+}
 
-variable "github_app_client_secret" {}

variables.tf

@@ -25,19 +25,19 @@ variable "environment" {
   type        = string
 }
 
-variable "github_app_webhook_secret" {
-  description = "Secret for the GitHub App webhook"
-  type        = string
-}
-
 variable "enable_organization_runners" {
   type = bool
 }
 
-variable "github_app_key_base64" {}
-
-variable "github_app_id" {}
+variable "github_app" {
+  description = "GitHub app parameters, see your github aapp. Ensure the key is base64 encoded."
+  type = object({
+    key_base64     = string
+    id             = string
+    client_id      = string
+    client_secret  = string
+    webhook_secret = string
+  })
+}
 
-variable "github_app_client_id" {}
 
-variable "github_app_client_secret" {}