Merge pull request #99 from cloudfoundry-community/bgandon/interpolate-text-file

Interpolate the content of `text file`

Author: bgandon

out

@@ -72,7 +72,7 @@ fi
 
 export TEXT_FILE_CONTENT=""
 [[ -n "${text_file}" && ! -f "${text_file}" ]] && text_file=""
-[[ -n "${text_file}" && -f "${text_file}" ]] && TEXT_FILE_CONTENT="$(cat "${text_file}")"
+[[ -n "${text_file}" && -f "${text_file}" ]] && TEXT_FILE_CONTENT="$(envsubst < "${text_file}")"
 
 ATTACHMENTS_FILE_CONTENT=""
 [[ -n "${attachments_file}" && -f "${attachments_file}" ]] && ATTACHMENTS_FILE_CONTENT="$(cat "${attachments_file}")"

test/all.sh

@@ -44,6 +44,7 @@ export BUILD_TEAM_NAME='main'
 webhook_url='https://some.url'
 base_text=":some_emoji:<https://my-ci.my-org.com/teams/main/pipelines/my-pipeline/jobs/my-job/builds/my-build|Alert!>"
 sample_text="This text came from sample.txt. It could have been generated by a previous Concourse task.\n\nMultiple lines are allowed.\n"
+env_vars_tail="BUILD_NAME=my-build\nVERSION=1.0.1\nQUALITY_GATE=B (ERROR)\nWITH_PIPE=<something>\nwith_GLOB=./path/to/*.jar\n"
 missing_text="_(no notification provided)_"
 
 username="concourse"
@@ -60,6 +61,9 @@ test combined_text_template_and_file | jq -e "
   ( .body | keys | contains([\"channel\",\"icon_emoji\",\"icon_url\",\"username\",\"link_names\",\"text\",\"attachments\"]) ) and
   ( .body | keys | length ==  7 )"
 
+test combined_text_template_and_file_with_vars | jq -e "
+  .body.text == \"${base_text}\n${sample_text}\n${env_vars_tail}\"
+  "
 
 test combined_text_template_and_file_empty | jq -e "
   .webhook_url == $(echo $webhook_url | jq -R .) and
@@ -110,6 +114,10 @@ test text_file | jq -e "
   ( .body | keys | contains([\"channel\",\"icon_emoji\",\"icon_url\",\"username\",\"link_names\",\"text\",\"attachments\"]) ) and
   ( .body | keys | length ==  7 )"
 
+test text_file_with_env_vars | jq -e "
+  .body.text == \"${sample_text}\n${env_vars_tail}\"
+  "
+
 test text_file_empty | jq -e "
   .webhook_url == $(echo $webhook_url | jq -R .) and
   .body.channel == null and
@@ -203,4 +211,4 @@ test env_file | jq -e "
   .body.attachments[1].text == \"<something> - ./path/to/*.jar\" and
   ( .body.attachments | length == 2 )"
 
-echo -e '\e[32;1m'"All tests passed!"'\e[0m' 
+echo -e '\e[32;1m'"All tests passed!"'\e[0m'

test/combined_text_template_and_file_with_vars.out

@@ -0,0 +1,12 @@
+{
+  "params": {
+    "text_file": "sample-with-vars.txt",
+    "text": ":some_emoji:<https://my-ci.my-org.com/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|Alert!>\n$TEXT_FILE_CONTENT\n",
+    "env_file": ".env",
+    "username": "concourse",
+    "debug": "true"
+  },
+  "source": {
+    "url": "https://some.url"
+  }
+}

test/sample-with-vars.txt

@@ -0,0 +1,9 @@
+This text came from sample.txt. It could have been generated by a previous Concourse task.
+
+Multiple lines are allowed.
+
+BUILD_NAME=${BUILD_NAME}
+VERSION=${VERSION}
+QUALITY_GATE=$QUALITY_GATE
+WITH_PIPE=${WITH_PIPE}
+with_GLOB=$with_GLOB

test/text_file_with_env_vars.out

@@ -0,0 +1,11 @@
+{
+  "params": {
+    "text_file": "sample-with-vars.txt",
+    "env_file": ".env",
+    "username": "concourse",
+    "debug": "true"
+  },
+  "source": {
+    "url": "https://some.url"
+  }
+}