Fluentd module path (#1489)

* add a way to configure the test path for the fluentd image Signed-off-by: James Petersen <[email protected]> * move the splunk config into its own module Signed-off-by: James Petersen <[email protected]> * terraform fmt told me to do it Signed-off-by: James Petersen <[email protected]> * switch to working_dir Signed-off-by: James Petersen <[email protected]> * terraform fmt told me to do it Signed-off-by: James Petersen <[email protected]> --------- Signed-off-by: James Petersen <[email protected]>
chainguard-images · Sep 29, 2023 · 8470c06 · 8470c06
1 parent ff871f7
commit 8470c06
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/images/fluentd/tests/01-test.sh b/images/fluentd/tests/01-test.sh
@@ -15,10 +15,11 @@ fi
 # operate on the container further.
 #
 start_fluentd_detached() {
+  SCRIPT_PATH="$(dirname -- "${BASH_SOURCE[0]}")"
   docker run \
     --detach --rm \
     --publish 127.0.0.1:${FREE_PORT}:24224 \
-    --volume "$(pwd)/images/fluentd/tests/configs/basic_docker.conf:/etc/fluent/fluent.conf" \
+    --volume "$(pwd)/configs/basic_docker.conf:/etc/fluent/fluent.conf" \
     "${IMAGE_NAME}"
   sleep 2
 }

diff --git a/images/fluentd/tests/main.tf b/images/fluentd/tests/main.tf
@@ -9,6 +9,7 @@ variable "digest" {
 }
 
 data "oci_exec_test" "test" {
-  digest = var.digest
-  script = "${path.module}/01-test.sh"
+  digest      = var.digest
+  script      = "./01-test.sh"
+  working_dir = path.module
 }
diff --git a/images/fluentd/tests/splunk/01-test.sh b/images/fluentd/tests/splunk/01-test.sh
@@ -18,7 +18,7 @@ start_fluentd_detached() {
   docker run \
     --detach --rm \
     --publish 127.0.0.1:${FREE_PORT}:24224 \
-    --volume "$(pwd)/images/fluentd/tests/configs/basic_splunk.conf:/etc/fluent/fluent.conf" \
+    --volume "$(pwd)/configs/basic_splunk.conf:/etc/fluent/fluent.conf" \
     "${IMAGE_NAME}"
   sleep 15
 }

diff --git a/...s/fluentd/tests/configs/basic_splunk.conf → ...td/tests/splunk/configs/basic_splunk.conf b/...s/fluentd/tests/configs/basic_splunk.conf → ...td/tests/splunk/configs/basic_splunk.conf
diff --git a/images/fluentd/tests/splunk/main.tf b/images/fluentd/tests/splunk/main.tf
@@ -9,6 +9,7 @@ variable "digest" {
 }
 
 data "oci_exec_test" "test" {
-  digest = var.digest
-  script = "${path.module}/01-test.sh"
+  digest      = var.digest
+  script      = "./01-test.sh"
+  working_dir = path.module
 }