From fa4a58ca97a973766c47bf1a295fc011d6a0980a Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <noreply@mrugesh.dev>
Date: Mon, 28 Aug 2023 14:19:20 +0530
Subject: [PATCH] refactor: runner configuration v4.2.x

---
 backend.tf   |  9 +++++++
 main.tf      | 74 ++++++++++++++++++++++++++++++++++------------------
 outputs.tf   |  3 +++
 variables.tf |  7 +----
 vpc.tf       | 16 ------------
 5 files changed, 62 insertions(+), 47 deletions(-)
 create mode 100644 backend.tf
 delete mode 100644 vpc.tf

diff --git a/backend.tf b/backend.tf
new file mode 100644
index 0000000..2f6d655
--- /dev/null
+++ b/backend.tf
@@ -0,0 +1,9 @@
+terraform {
+  cloud {
+    organization = "freecodecamp"
+
+    workspaces {
+      name = "tfws-ops-github-runners"
+    }
+  }
+}
diff --git a/main.tf b/main.tf
index 981b9f1..6f9ab7d 100644
--- a/main.tf
+++ b/main.tf
@@ -1,10 +1,43 @@
-
 resource "random_id" "random" {
   byte_length = 20
 }
 
 data "aws_caller_identity" "current" {}
 
+resource "aws_resourcegroups_group" "resourcegroups_group" {
+  name = "${var.prefix}-group"
+  resource_query {
+    query = <<JSON
+    {
+      "ResourceTypeFilters" : ["AWS::AllSupported"],
+      "TagFilters" : [
+        {
+          "Key" : "GitHubRunner",
+          "Values" : ["${var.prefix}"]
+        }
+      ]
+    }
+    JSON
+  }
+}
+
+module "vpc" {
+  source  = "terraform-aws-modules/vpc/aws"
+  version = "5.1.1"
+
+  name = "${var.prefix}-vpc"
+  cidr = "10.0.0.0/16"
+
+  azs             = ["${var.aws_region}a", "${var.aws_region}b"]
+  private_subnets = ["10.0.1.0/24", "10.0.2.0/24"]
+  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24"]
+
+  enable_dns_hostnames    = true
+  enable_nat_gateway      = true
+  map_public_ip_on_launch = false
+  single_nat_gateway      = true
+}
+
 module "runners" {
   source                          = "philips-labs/github-runner/aws"
   version                         = "4.2.0"
@@ -13,10 +46,10 @@ module "runners" {
   vpc_id                          = module.vpc.vpc_id
   subnet_ids                      = module.vpc.private_subnets
 
-  prefix = var.environment
+  prefix = var.prefix
+
   tags = {
-    Project     = "GitHubRunner"
-    Environment = var.environment
+    GitHubRunner = var.prefix
   }
 
   github_app = {
@@ -32,8 +65,9 @@ module "runners" {
   runners_lambda_zip                = "lambdas/runners.zip"
 
   enable_organization_runners = false
-  runner_extra_labels         = "ubuntu,on-aws"
+  runner_extra_labels         = "on-aws"
 
+  # Run the GitHub actions agent as user.
   runner_run_as = "ubuntu"
 
   # enable access to the runners via SSM
@@ -49,16 +83,17 @@ module "runners" {
   #   idleCount = 2
   # }]
 
-  instance_types = ["m5.large", "c5.large"]
+  instance_types     = ["c5.xlarge"]
+  runner_name_prefix = "${var.prefix}-"
 
   # Use the latest Ubuntu 20.04 AMI from our account
   # built using the packer template in the packer folder
-  ami_filter = {
-    name  = ["github-runner-ubuntu-focal-amd64-*"]
-    state = ["available"]
-  }
-  ami_owners      = [data.aws_caller_identity.current.account_id]
-  enable_userdata = false
+  # ami_filter = {
+  #   name  = ["github-runner-ubuntu-focal-amd64-*"]
+  #   state = ["available"]
+  # }
+  # ami_owners      = [data.aws_caller_identity.current.account_id]
+  # enable_userdata = false
 
   block_device_mappings = [{
     # Set the block device name for Ubuntu root device
@@ -95,7 +130,7 @@ module "runners" {
   ]
 
   # disable binary syncer since github agent is already installed in the AMI.
-  enable_runner_binaries_syncer = false
+  enable_runner_binaries_syncer = true
 
   # override delay of events in seconds
   delay_webhook_event   = 5
@@ -104,23 +139,12 @@ module "runners" {
   # set up a fifo queue to remain order
   enable_fifo_build_queue = true
 
-  # override scaling down
-  # scale_down_schedule_expression = "cron(* * * * ? *)"
-
   # enable ephemeral runners
   enable_ephemeral_runners = true
 
   # More on AWS Cron Expressions: https://stackoverflow.com/a/39508593/1932901
   # Will scale down to minimum runners if there are no builds in the queue in the last 1 hours
   scale_down_schedule_expression = "cron(0 0/1 * * ? *)"
-}
-
-terraform {
-  cloud {
-    organization = "freecodecamp"
 
-    workspaces {
-      name = "tfws-ops-github-runners"
-    }
-  }
+  log_level = "debug"
 }
diff --git a/outputs.tf b/outputs.tf
index 1f3a027..d07131f 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -13,3 +13,6 @@ output "webhook_secret" {
   value     = random_id.random.hex
 }
 
+output "vpc" {
+  value = module.vpc
+}
diff --git a/variables.tf b/variables.tf
index 7072255..6c69111 100644
--- a/variables.tf
+++ b/variables.tf
@@ -18,11 +18,6 @@ variable "aws_region" {
 }
 
 variable "prefix" {
-  default     = "github-runner"
+  default     = "gh-nws-ci"
   description = "Prefix used for resource naming."
 }
-
-variable "environment" {
-  default     = "ubuntu"
-  description = "Environment name to use for tagging resources"
-}
diff --git a/vpc.tf b/vpc.tf
deleted file mode 100644
index e8dcff9..0000000
--- a/vpc.tf
+++ /dev/null
@@ -1,16 +0,0 @@
-module "vpc" {
-  source  = "terraform-aws-modules/vpc/aws"
-  version = "5.1.1"
-
-  name = "${var.prefix}-vpc"
-  cidr = "10.0.0.0/16"
-
-  azs             = ["${var.aws_region}a", "${var.aws_region}b"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24"]
-  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24"]
-
-  enable_dns_hostnames    = true
-  enable_nat_gateway      = true
-  map_public_ip_on_launch = false
-  single_nat_gateway      = true
-}