From 2dbb489b4fce5acad5a35cc451ef26a9881c06b6 Mon Sep 17 00:00:00 2001
From: Juanadelacuesta <8647634+Juanadelacuesta@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:09:43 -0500
Subject: [PATCH] func: make paths relative to the module inside the e2e
 terraform folder

---
 e2e/terraform/consul.hclic                     |  1 -
 e2e/terraform/nomad-acls.tf                    |  6 +++---
 e2e/terraform/nomad.hclic                      |  1 -
 e2e/terraform/outputs.tf                       | 11 +++++------
 e2e/terraform/provision-nomad/install-linux.tf |  2 +-
 e2e/terraform/provision-nomad/main.tf          |  5 ++---
 6 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 e2e/terraform/consul.hclic
 delete mode 100644 e2e/terraform/nomad.hclic

diff --git a/e2e/terraform/consul.hclic b/e2e/terraform/consul.hclic
deleted file mode 100644
index 1f0b9e0dde4..00000000000
--- a/e2e/terraform/consul.hclic
+++ /dev/null
@@ -1 +0,0 @@
-02MV4UU43BK5HGYYTOJZWFQMTMNNEWU33JLJKEU3COKRLG2TKUNN2FSV2WNNHGSMBULFKGW6CMKRLG2WSUMN2FS6SJPFHGUVTLLJLVE3KOGJGTKSLJO5UVSM2WPJSEOOLULJMEUZTBK5IWST3JJJVVSV2VO5HUIUTIJVJTANKOPJDG2TCXJJWVUVCJORGXURTIJ5BTA6SONVMTEWL2IU2U26SZGFGWUY3JJRBUU4DCNZHDAWKXPBZVSWCSOBRDENLGMFLVC2KPNFEXCSLJO5UWCWCOPJSFOVTGMRDWY5C2KNETMSLKJF3U22SRORGVIQLUJVKFMVKNKRETMTKULE3E26SNOVHUI23ZJV5FKMCNNJATIV3JJFZUS3SOGBMVQSRQLAZVE4DCK5KWST3JJF4U2RCJGBGFIRLXJRKEKMKWIRAXOT3KIF3U62SBO5LWSSLTJFWVMNDDI5WHSWKYKJYGEMRVMZSEO3DULJJUSNSJNJEXOTLKKV2E2VCFORGVIUSVJVCECNSNIRATMTKEIJQUS2LXNFSEOVTZMJLWY5KZLBJHAYRSGVTGIR3MORNFGSJWJFVES52NNJKXITKUIV2E2VCSKVGUIQJWJVCECNSNIRBGCSLJO5UWGSCKOZNEQVTKMRBUSNSJNVHHMYTOJYYWEQ2JONEW2WTTLFLWI6SJNJYDOZSYGA6S4U3EJV2U2Y2TGBHUG5DHIJDECZRXNVDVCNDGME3W4Z2VNQ2UKVL2JJETG3LMIFMUSQLXIJDS63KPMRMVSR2RGRDFQ3CPGZCGQMSFJNXXE3LBKRTEY2L2JJAXI2BQGNLEMUSZOR4UENJRMRAWWY3BGRSFMMBTGM4FA53NKZWGC5SKKA2HASTYJFETSRBWKVDEYVLBKZIGU22XJJ2GGRBWOBQWYNTPJ5TEO3SLGJ5FAS2KKJWUOSCWGNSVU53RIZSSW3ZXNMXXGK2BKRHGQUC2M5JS6S2WLFTS6SZLNRDVA52MG5VEE6CJG5DU6YLLGZKWC2LBJBXWK2ZQKJKG6NZSIRIT2PI
\ No newline at end of file
diff --git a/e2e/terraform/nomad-acls.tf b/e2e/terraform/nomad-acls.tf
index fbe3d7651b9..6b0382414ca 100644
--- a/e2e/terraform/nomad-acls.tf
+++ b/e2e/terraform/nomad-acls.tf
@@ -23,7 +23,7 @@ resource "null_resource" "bootstrap_nomad_acls" {
 
 data "local_sensitive_file" "nomad_token" {
   depends_on = [null_resource.bootstrap_nomad_acls]
-  filename   = "${path.root}/keys/nomad_root_token"
+  filename   = "${path.module}/keys/nomad_root_token"
 }
 
 # push the token out to the servers for humans to use.
@@ -36,8 +36,8 @@ locals {
 cat <<ENV | sudo tee -a /root/.bashrc
 export NOMAD_ADDR=https://localhost:4646
 export NOMAD_SKIP_VERIFY=true
-export NOMAD_CLIENT_CERT=/etc/nomad.d/tls/agent.crt
-export NOMAD_CLIENT_KEY=/etc/nomad.d/tls/agent.key
+export NOMAD_CLIENT_CERT="${path.module}/etc/nomad.d/tls/agent.crt"
+export NOMAD_CLIENT_KEY="${path.module}/etc/nomad.d/tls/agent.key"
 export NOMAD_TOKEN=${data.local_sensitive_file.nomad_token.content}
 export CONSUL_HTTP_ADDR=https://localhost:8501
 export CONSUL_HTTP_TOKEN="${random_uuid.consul_initial_management_token.result}"
diff --git a/e2e/terraform/nomad.hclic b/e2e/terraform/nomad.hclic
deleted file mode 100644
index f376b37816f..00000000000
--- a/e2e/terraform/nomad.hclic
+++ /dev/null
@@ -1 +0,0 @@
-02MV4UU43BK5HGYYTOJZWFQMTMNNEWU33JJZ5FC6KNNJDGSWSUKF2E2R2SNRGWSMDXJZVGWNCMK5GXST2UM52FUV2KNFNGUTL2LF5FE2K2NVFGWSLJO5UVSM2WPJSEOOLULJMEUZTBK5IWST3JJJVVSV2VO5HUIUTIJVJTANKOPJDG2TCXJJWVUVCJORGXURTIJ5BTA6SONVMTEWL2IU2U26SZGFGWUY3JJRBUU4DCNZHDAWKXPBZVSWCSOBRDENLGMFLVC2KPNFEXCSLJO5UWCWCOPJSFOVTGMRDWY5C2KNETMSLKJF3U22SRORGUIY3UJVKGYVKNKRITMTSUJE3E2RCFOVHFISLZJVVGO52OKRGTAV3JJFZUS3SOGBMVQSRQLAZVE4DCK5KWST3JJF4U2RCJGBGFIQJTJRKEKNKWIRAXOT3KIF3U62SBO5LWSSLTJFWVMNDDI5WHSWKYKJYGEMRVMZSEO3DULJJUSNSJNJEXOTL2IF2E2RDDORGUIRSVJVCECNSNIRATMTKEIJQUS2LXNFSEOVTZMJLWY5KZLBJHAYRSGVTGIR3MORNFGSJWJFVES52NPJAXITKEMN2E2RCGKVGUIQJWJVCECNSNIRBGCSLJO5UWGSCKOZNEQVTKMRBUSNSJNU2XMYSXIZVUS2LXNFNG26DILIZU22KPNZZWSYSXHFVWIV3YNRRXSSJWK54UU5DEK54DAYKXJZZWIWCOGBNFQSLULFLTK22MK5LG2WTNNRVGCV2WOVMTG23JJRBUU3TCGNNGYY3NGVUGE3KONRGFQQTWMJDWY2TFKNFGIZSYGA6S433EPBJUEWTKOJSDCTKZJFZUIQTSM5LHUL3JO4VVORLPOBIDIKZWJBGE6RTEIUYDGQ3ILIYESMDGNVNFQNTLMIYGYRSKJJRDM4CKPFDECMT2GNNHSWDOG5HSW2TPKZVGS4SOI5YEE4BRMRAWWY3BGRSFMMBTGM4FA53NKZWGC5SKKA2HASTYJFETSRBWKVDEYVLBKZIGU22XJJ2GGRBWOBQWYNTPJ5TEO3SLGJ5FAS2KKJWUOSCWGNSVU53RIZSSW3ZXNMXXGK2BKRHGQUC2M5JS6S2WLFTS6SZLNRDVA52MG5VEE6CJG5DU6YLLGZKWC2LBJBXWK2ZQKJKG6NZSIRIT2PI
\ No newline at end of file
diff --git a/e2e/terraform/outputs.tf b/e2e/terraform/outputs.tf
index 43d760c0393..0441906b132 100644
--- a/e2e/terraform/outputs.tf
+++ b/e2e/terraform/outputs.tf
@@ -49,14 +49,13 @@ output "environment" {
   sensitive   = true
   value       = <<EOM
 export NOMAD_ADDR=https://${aws_instance.server[0].public_ip}:4646
-export NOMAD_CACERT=${abspath(path.root)}/keys/tls_ca.crt
-export NOMAD_CLIENT_CERT=${abspath(path.root)}/keys/tls_api_client.crt
-export NOMAD_CLIENT_KEY=${abspath(path.root)}/keys/tls_api_client.key
+export NOMAD_CACERT=${abspath(path.module)}/keys/tls_ca.crt
+export NOMAD_CLIENT_CERT=${abspath(path.module)}/keys/tls_api_client.crt
+export NOMAD_CLIENT_KEY=${abspath(path.module)}/keys/tls_api_client.key
 export NOMAD_TOKEN=${data.local_sensitive_file.nomad_token.content}
 export NOMAD_E2E=1
 export CONSUL_HTTP_ADDR=https://${aws_instance.consul_server.public_ip}:8501
 export CONSUL_HTTP_TOKEN=${local_sensitive_file.consul_initial_management_token.content}
-export CONSUL_CACERT=${abspath(path.root)}/keys/tls_ca.crt
-
+export CONSUL_CACERT=${abspath(path.module)}/keys/tls_ca.crt
 EOM
-}
+}
\ No newline at end of file
diff --git a/e2e/terraform/provision-nomad/install-linux.tf b/e2e/terraform/provision-nomad/install-linux.tf
index 1c25683d188..fd85b8bb367 100644
--- a/e2e/terraform/provision-nomad/install-linux.tf
+++ b/e2e/terraform/provision-nomad/install-linux.tf
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BUSL-1.1
 
 resource "local_sensitive_file" "nomad_systemd_unit_file" {
-  content         = templatefile("etc/nomad.d/nomad-${var.role}.service", {})
+  content         = templatefile("${path.module}/etc/nomad.d/nomad-${var.role}.service", {})
   filename        = "${local.upload_dir}/nomad.d/nomad.service"
   file_permission = "0600"
 }
diff --git a/e2e/terraform/provision-nomad/main.tf b/e2e/terraform/provision-nomad/main.tf
index 87a09f26394..a64d6d028a1 100644
--- a/e2e/terraform/provision-nomad/main.tf
+++ b/e2e/terraform/provision-nomad/main.tf
@@ -4,8 +4,7 @@
 locals {
   upload_dir = "uploads/${var.instance.public_ip}"
 
-  indexed_config_path = fileexists("etc/nomad.d/${var.role}-${var.platform}-${var.index}.hcl") ? "etc/nomad.d/${var.role}-${var.platform}-${var.index}.hcl" : "etc/nomad.d/index.hcl"
-
+  indexed_config_path = fileexists("${path.module}/etc/nomad.d/${var.role}-${var.platform}-${var.index}.hcl") ? "${path.module}/etc/nomad.d/${var.role}-${var.platform}-${var.index}.hcl" : "${path.module}/etc/nomad.d/index.hcl"
 }
 
 # if nomad_license is unset, it'll be a harmless empty license file
@@ -26,7 +25,7 @@ resource "local_sensitive_file" "nomad_base_config" {
 }
 
 resource "local_sensitive_file" "nomad_role_config" {
-  content = templatefile("etc/nomad.d/${var.role}-${var.platform}.hcl", {
+  content = templatefile("${path.module}/etc/nomad.d/${var.role}-${var.platform}.hcl", {
     aws_region     = var.aws_region
     aws_kms_key_id = var.aws_kms_key_id
   })