Refactor distribution out of the runner

Author: npalm

main.tf

@@ -4,14 +4,41 @@ resource "random_string" "random" {
   upper   = false
 }
 
+module "dsitrubtion_cache" {
+  source = "./modules/action-runner-binary-cache"
+
+  aws_region  = var.aws_region
+  environment = var.environment
+  tags        = var.tags
+
+  distribution_bucket_name = random_string.random.result
+}
+
 module "runners" {
   source = "./modules/runners"
 
-  aws_region = var.aws_region
-  vpc_id     = var.vpc_id
+  aws_region  = var.aws_region
+  vpc_id      = var.vpc_id
+  environment = var.environment
+  tags        = var.tags
 
-  environment              = var.environment
-  tags                     = var.tags
-  distribution_bucket_name = random_string.random.result
+  s3_location_runner_distribution = module.dsitrubtion_cache.s3_location_runner_distribution
 }
 
+
+resource "aws_iam_policy" "dist_bucket" {
+  name        = "${var.environment}-gh-distribution-bucket"
+  path        = "/"
+  description = "Policy for the runner to download the github action runner."
+
+  policy = templatefile("${path.module}/policies/action-runner-s3-policy.json",
+    {
+      s3_arn = module.dsitrubtion_cache.distribution_bucket.arn
+    }
+  )
+}
+
+resource "aws_iam_role_policy_attachment" "dist_bucket" {
+  role       = module.runners.role.name
+  policy_arn = aws_iam_policy.dist_bucket.arn
+}

modules/runners/main.tf

@@ -1,6 +1,5 @@
 locals {
-  name_sg                         = var.overrides["name_sg"] == "" ? local.tags["Name"] : var.overrides["name_sg"]
-  s3_location_runner_distribution = "s3://${aws_s3_bucket.action_dist.id}/${var.action_runner_dist_bucket_location}"
+  name_sg = var.overrides["name_sg"] == "" ? local.tags["Name"] : var.overrides["name_sg"]
 
   tags = merge(
     {
@@ -69,7 +68,7 @@ resource "aws_launch_template" "runner" {
     environment                     = var.environment
     pre_install                     = var.userdata_pre_install
     post_install                    = var.userdata_post_install
-    s3_location_runner_distribution = local.s3_location_runner_distribution
+    s3_location_runner_distribution = var.s3_location_runner_distribution
   }))
 }
 

modules/runners/outputs.tf

@@ -1,7 +1,7 @@
-output "s3_location_runner_distribution" {
-  value = local.s3_location_runner_distribution
-}
-
 output "launch_template" {
   value = aws_launch_template.runner
 }
+
+output "role" {
+  value = aws_iam_role.runner
+}

modules/runners/policies.tf

@@ -29,23 +29,6 @@ resource "aws_iam_role_policy_attachment" "runner_session_manager_aws_managed" {
   policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
 }
 
-resource "aws_iam_policy" "dist_bucket" {
-  name        = "${var.environment}-gh-distribution-bucket"
-  path        = "/"
-  description = "Policy for the runner to download the github action runner."
-
-  policy = templatefile("${path.module}/policies/instance-runner-s3-policy.json",
-    {
-      s3_arn = aws_s3_bucket.action_dist.arn
-    }
-  )
-}
-
-resource "aws_iam_role_policy_attachment" "dist_bucket" {
-  role       = aws_iam_role.runner.name
-  policy_arn = aws_iam_policy.dist_bucket.arn
-}
-
 resource "aws_iam_policy" "ssm_parameters" {
   name        = "${var.environment}-runner-ssm-parameters"
   path        = "/"

modules/runners/runner-dist.tf

@@ -28,8 +28,8 @@ variable "environment" {
   type        = string
 }
 
-variable "distribution_bucket_name" {
-  description = "Bucket for storing the action runner distribution."
+variable "s3_location_runner_distribution" {
+  description = "S3 location of runner distribution."
   type        = string
 }
 
@@ -51,11 +51,6 @@ variable "instance_type" {
   default     = "m5.large"
 }
 
-variable "action_runner_dist_bucket_location" {
-  description = "Default location action runner distribution."
-  default     = "actions-runner-linux.tar.gz"
-}
-
 variable "ami_filter" {
   description = "List of maps used to create the AMI filter for the action runner AMI."
   type        = map(list(string))

modules/runners/variables.tf

@@ -3,6 +3,6 @@ output "runners" {
     launch_template_name       = module.runners.launch_template.name
     launch_template_id         = module.runners.launch_template.id
     launch_template_version    = module.runners.launch_template.latest_version
-    action_runner_distribution = module.runners.s3_location_runner_distribution
+    action_runner_distribution = module.dsitrubtion_cache.s3_location_runner_distribution
   }
 }