From 2a58439ab561be08ad7a72a011cf580d60277608 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Fri, 30 Aug 2024 11:09:59 -0700
Subject: [PATCH] Simplify passing blocky config to nomad

---
 core/blocky/blocky.nomad |  9 +++------
 core/blocky/blocky.tf    | 13 ++-----------
 core/blocky/config.yml   |  1 -
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/core/blocky/blocky.nomad b/core/blocky/blocky.nomad
index 0e3dd8a..c7bbddd 100644
--- a/core/blocky/blocky.nomad
+++ b/core/blocky/blocky.nomad
@@ -1,8 +1,3 @@
-variable "config_data" {
-  type = string
-  description = "Plain text config file for blocky"
-}
-
 job "blocky" {
   datacenters = ["dc1"]
   type = "service"
@@ -104,7 +99,9 @@ job "blocky" {
       }
 
       template {
-        data = var.config_data
+        data = <<EOF
+${file("${module_path}/config.yml")}
+EOF
         destination = "$${NOMAD_TASK_DIR}/config.yml"
         splay = "1m"
 
diff --git a/core/blocky/blocky.tf b/core/blocky/blocky.tf
index 65062fc..b908410 100644
--- a/core/blocky/blocky.tf
+++ b/core/blocky/blocky.tf
@@ -1,16 +1,7 @@
-locals {
-  config_data = file("${path.module}/config.yml")
-}
-
 resource "nomad_job" "blocky" {
-  hcl2 {
-    vars = {
-      "config_data" = local.config_data,
-    }
-  }
-
   jobspec = templatefile("${path.module}/blocky.nomad", {
-    use_wesher = var.use_wesher,
+    use_wesher  = var.use_wesher,
+    module_path = path.module,
   })
 }
 
diff --git a/core/blocky/config.yml b/core/blocky/config.yml
index 457d3da..e8a19ea 100644
--- a/core/blocky/config.yml
+++ b/core/blocky/config.yml
@@ -132,7 +132,6 @@ redis:
     connectionCooldown: 3s
 {{ end -}}
 
-
 {{ range nomadService 1 (env "NOMAD_ALLOC_ID") "mysql-tls" -}}
 {{ with nomadVar "nomad/jobs/blocky" -}}
 queryLog: