From cd88bac77d9aab4d9ea87ec9fc9477cdc07f5972 Mon Sep 17 00:00:00 2001
From: Ben Martin <ben@brmartin.co.uk>
Date: Sun, 4 Aug 2024 12:20:30 +0000
Subject: [PATCH] feat: Remove Nomad validation step in plan-and-apply workflow

---
 .gitea/workflows/plan-and-apply.yaml |  3 ---
 modules/coder/jobspec.json           | 24 ++++++++++++++----------
 modules/dummy/jobspec.json           | 12 +++++++-----
 modules/media-centre/jobspec.json    | 13 +++++++------
 modules/uptime/jobspec.json          | 12 +++++++-----
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/.gitea/workflows/plan-and-apply.yaml b/.gitea/workflows/plan-and-apply.yaml
index 72b4a98..ea39506 100644
--- a/.gitea/workflows/plan-and-apply.yaml
+++ b/.gitea/workflows/plan-and-apply.yaml
@@ -45,9 +45,6 @@ jobs:
         id: plan
         run: terraform plan -out=tfplan
         continue-on-error: true
-      - uses: hashicorp/setup-nomad@main
-      - name: Nomad Validate
-        run: terraform show -json tfplan | jq -r '.planned_values.root_module.child_modules[].resources[].values.jobspec' | nomad job validate -json -
       - uses: actions/github-script@v7
         if: github.event_name == 'pull_request'
         env:
diff --git a/modules/coder/jobspec.json b/modules/coder/jobspec.json
index 5865f10..1e5ee0a 100644
--- a/modules/coder/jobspec.json
+++ b/modules/coder/jobspec.json
@@ -22,11 +22,13 @@
             ],
             "logging": {
               "type": "elastic/elastic-logging-plugin:8.14.3",
-              "config": {
-                "hosts": "http://localhost:9200",
-                "user": "docker_writer",
-                "password": "oi*YWZSP_Ukd0y+pQ7EB"
-              }
+              "config": [
+                {
+                  "hosts": "http://localhost:9200",
+                  "user": "docker_writer",
+                  "password": "oi*YWZSP_Ukd0y+pQ7EB"
+                }
+              ]
             }
           },
           "Env": {
@@ -61,11 +63,13 @@
             ],
             "logging": {
               "type": "elastic/elastic-logging-plugin:8.14.3",
-              "config": {
-                "hosts": "http://localhost:9200",
-                "user": "docker_writer",
-                "password": "oi*YWZSP_Ukd0y+pQ7EB"
-              }
+              "config": [
+                {
+                  "hosts": "http://localhost:9200",
+                  "user": "docker_writer",
+                  "password": "oi*YWZSP_Ukd0y+pQ7EB"
+                }
+              ]
             }
           },
           "Env": {
diff --git a/modules/dummy/jobspec.json b/modules/dummy/jobspec.json
index b8e8013..527e161 100644
--- a/modules/dummy/jobspec.json
+++ b/modules/dummy/jobspec.json
@@ -24,11 +24,13 @@
             ],
             "logging": {
               "type": "elastic/elastic-logging-plugin:8.14.3",
-              "config": {
-                "hosts": "http://localhost:9200",
-                "user": "docker_writer",
-                "password": "oi*YWZSP_Ukd0y+pQ7EB"
-              }
+              "config": [
+                {
+                  "hosts": "http://localhost:9200",
+                  "user": "docker_writer",
+                  "password": "oi*YWZSP_Ukd0y+pQ7EB"
+                }
+              ]
             }
           },
           "Templates": [
diff --git a/modules/media-centre/jobspec.json b/modules/media-centre/jobspec.json
index f7094b5..925284c 100644
--- a/modules/media-centre/jobspec.json
+++ b/modules/media-centre/jobspec.json
@@ -39,11 +39,13 @@
             ],
             "logging": {
               "type": "elastic/elastic-logging-plugin:8.14.3",
-              "config": {
-                "hosts": "http://localhost:9200",
-                "user": "docker_writer",
-                "password": "oi*YWZSP_Ukd0y+pQ7EB"
-              }
+              "config": [
+                {
+                  "hosts": "http://localhost:9200",
+                  "user": "docker_writer",
+                  "password": "oi*YWZSP_Ukd0y+pQ7EB"
+                }
+              ]
             }
           },
           "Env": {
@@ -74,7 +76,6 @@
             "traefik.http.routers.jellyfin.entrypoints=websecure",
             "traefik.http.routers.jellyfin.rule=Host(`jellyfin.brmartin.co.uk`)"
           ]
-
         }
       ],
       "Networks": [
diff --git a/modules/uptime/jobspec.json b/modules/uptime/jobspec.json
index 4a22a0c..3012ced 100644
--- a/modules/uptime/jobspec.json
+++ b/modules/uptime/jobspec.json
@@ -30,11 +30,13 @@
             ],
             "logging": {
               "type": "elastic/elastic-logging-plugin:8.14.3",
-              "config": {
-                "hosts": "http://localhost:9200",
-                "user": "docker_writer",
-                "password": "oi*YWZSP_Ukd0y+pQ7EB"
-              }
+              "config": [
+                {
+                  "hosts": "http://localhost:9200",
+                  "user": "docker_writer",
+                  "password": "oi*YWZSP_Ukd0y+pQ7EB"
+                }
+              ]
             }
           },
           "Resources": {