feat: added support for a custom message to the terraform action outp…

…ut (#439) * feat: added support for a custom message to the terraform action output * fix typo * description and usage * fix variable assignment * fix variable assignment * test * re-ordering * re-ordering * clean up tests * cleanup
iStreamPlanet · Oct 15, 2024 · 3a6565d · 3a6565d
1 parent 804b11e
commit 3a6565d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 3 deletions.
diff --git a/terraform-actions/README.md b/terraform-actions/README.md
@@ -8,6 +8,10 @@ inputs:
   command:
     description: "The terraform command to run"
     required: true
+  header_message:
+    description: "Message to add before the terraform output that is posted to a PR. (Must be a single line string)"
+    required: false
+    default: ""
   working_directory:
     description: "The directory to run all the commands in"
     required: false
@@ -23,6 +27,7 @@ Example usage of `terraform plan`:
     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   with:
     command: plan
+    header_message: "*Note*: This is a message that appears before the terraform plan output"
     working_directory: terraform/
 ```
 

diff --git a/terraform-actions/action.yml b/terraform-actions/action.yml
@@ -4,6 +4,10 @@ inputs:
   command:
     description: "The terraform command to run"
     required: true
+  header_message:
+    description: "Message to add before the terraform output that is posted to a PR. (Must be a single line string)"
+    required: false
+    default: ""
   working_directory:
     description: "The directory to run all the commands in"
     required: false
@@ -22,4 +26,4 @@ runs:
       shell: bash
       id: main
       working-directory: ${{ inputs.working_directory }}
-      run: ${{ github.action_path }}/main.sh "${{ inputs.command }}" "${{ inputs.working_directory }}"
+      run: ${{ github.action_path }}/main.sh "${{ inputs.command }}" "${{ inputs.working_directory }}" "${{ inputs.header_message }}"
diff --git a/terraform-actions/fmt.sh b/terraform-actions/fmt.sh
@@ -20,6 +20,7 @@ function terraformFmt {
 
   if [ "$GITHUB_EVENT_NAME" == "pull_request" ] && [ "${commentStatus}" == "Failed" ]; then
     commentWrapper="#### \`terraform fmt\` ${commentStatus} for \`${workingDir}\`
+${header_message}
 <details><summary>Show Output</summary>
 
 \`\`\`diff

diff --git a/terraform-actions/init.sh b/terraform-actions/init.sh
@@ -20,6 +20,7 @@ function terraformInit {
 
   if [ "$GITHUB_EVENT_NAME" == "pull_request" ] && [ "${commentStatus}" == "Failed" ]; then
     commentWrapper="#### \`terraform init\` ${commentStatus} for \`${workingDir}\`
+${header_message}
 <details><summary>Show Output</summary>
 
 \`\`\`

diff --git a/terraform-actions/main.sh b/terraform-actions/main.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 
-if [ "$#" -ne 2 ]; then
-  echo 'Usage: ./main.sh $command $working_directory'
+if [ "$#" -ne 3 ]; then
+  echo 'Usage: ./main.sh $command $working_directory $header_message'
   exit 1
 fi
 
 # This will reduce certain non-actionable command output
 # See: https://learn.hashicorp.com/tutorials/terraform/automate-terraform#controlling-terraform-output-in-automation
 export TF_IN_AUTOMATION=true
 
+header_message="$3"
 workingDir="$2"
 function main {
   command="$1"

diff --git a/terraform-actions/plan.sh b/terraform-actions/plan.sh
@@ -47,6 +47,7 @@ function terraformPlan {
 
   if [ "$GITHUB_EVENT_NAME" == "pull_request" ] && ([ "${hasChanges}" == "true" ] || [ "${commentStatus}" == "Failed" ]); then
     commentWrapper="#### \`terraform plan\` ${commentStatus} for \`${workingDir}\`
+${header_message}
 <details><summary>Show Output</summary>
 
 \`\`\`diff

diff --git a/terraform-actions/validate.sh b/terraform-actions/validate.sh
@@ -20,6 +20,7 @@ function terraformValidate {
 
   if [ "$GITHUB_EVENT_NAME" == "pull_request" ] && [ "${commentStatus}" == "Failed" ]; then
     commentWrapper="#### \`terraform validate\` ${commentStatus} for \`${workingDir}\`
+${header_message}
 <details><summary>Show Output</summary>
 
 \`\`\`