[v1.6.0] Upgrade TF to 1.9.0 & Remove plan cleaning last lines

Author: juan-vg

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.6.0
+
+- Bump to Terraform v1.9.0 internally (fixes `curl` problem)
+- Removes the cleaning of plan's last lines
+
 ## v1.5.0
 
 - Bump to Terraform v1.0.6 internally (only affects `fmt`)

Dockerfile

@@ -1,7 +1,7 @@
-FROM hashicorp/terraform:1.0.6
+FROM hashicorp/terraform:1.9.0
 
-LABEL repository="https://github.com/robburger/terraform-pr-commenter" \
-      homepage="https://github.com/robburger/terraform-pr-commenter" \
+LABEL repository="https://github.com/juan-vg/terraform-pr-commenter" \
+      homepage="https://github.com/juan-vg/terraform-pr-commenter" \
       maintainer="Rob Burger" \
       com.github.actions.name="Terraform PR Commenter" \
       com.github.actions.description="Adds opinionated comments to a PR from Terraform fmt/init/plan output" \

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Rob Burger
+Copyright (c) 2020 Rob Burger & Juan-VG
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,6 +2,9 @@
 
 Adds opinionated comments to PR's based on Terraform `fmt`, `init`, `plan` and `validate` outputs.
 
+> This project was forked from <https://github.com/robburger/terraform-pr-commenter> project, originally created by [
+Rob Burger](https://github.com/robburger).
+
 ## Summary
 
 This Docker-based GitHub Action is designed to work in tandem with [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) with the **wrapper enabled**, taking the output from a `fmt`, `init`, `plan` or `validate`, formatting it and adding it to a pull request. Any previous comments from this Action are removed to keep the PR timeline clean.
@@ -15,7 +18,7 @@ Support (for now) is [limited to Linux](https://help.github.com/en/actions/creat
 This action can only be run after a Terraform `fmt`, `init`, `plan` or `validate` has completed, and the output has been captured. Terraform rarely writes to `stdout` and `stderr` in the same action, so we concatenate the `commenter_input`:
 
 ```yaml
-- uses: robburger/terraform-pr-commenter@v1
+- uses: juan-vg/terraform-pr-commenter@v1
   env:
     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   with:
@@ -55,7 +58,7 @@ jobs:
         uses: actions/checkout@v2
 ...
       - name: Post Plan
-        uses: robburger/terraform-pr-commenter@v1
+        uses: juan-vg/terraform-pr-commenter@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           EXPAND_SUMMARY_DETAILS: 'true' # Override global environment variable; expand details just for this step
@@ -103,7 +106,7 @@ jobs:
 
       - name: Post Format
         if: always() && github.ref != 'refs/heads/master' && (steps.fmt.outcome == 'success' || steps.fmt.outcome == 'failure')
-        uses: robburger/terraform-pr-commenter@v1
+        uses: juan-vg/terraform-pr-commenter@v1
         with:
           commenter_type: fmt
           commenter_input: ${{ format('{0}{1}', steps.fmt.outputs.stdout, steps.fmt.outputs.stderr) }}
@@ -115,7 +118,7 @@ jobs:
 
       - name: Post Init
         if: always() && github.ref != 'refs/heads/master' && (steps.init.outcome == 'success' || steps.init.outcome == 'failure')
-        uses: robburger/terraform-pr-commenter@v1
+        uses: juan-vg/terraform-pr-commenter@v1
         with:
           commenter_type: init
           commenter_input: ${{ format('{0}{1}', steps.init.outputs.stdout, steps.init.outputs.stderr) }}
@@ -127,7 +130,7 @@ jobs:
 
       - name: Post Validate
         if: always() && github.ref != 'refs/heads/master' && (steps.validate.outcome == 'success' || steps.validate.outcome == 'failure')
-        uses: robburger/terraform-pr-commenter@v1
+        uses: juan-vg/terraform-pr-commenter@v1
         with:
           commenter_type: validate
           commenter_input: ${{ format('{0}{1}', steps.validate.outputs.stdout, steps.validate.outputs.stderr) }}
@@ -139,7 +142,7 @@ jobs:
 
       - name: Post Plan
         if: always() && github.ref != 'refs/heads/master' && (steps.plan.outcome == 'success' || steps.plan.outcome == 'failure')
-        uses: robburger/terraform-pr-commenter@v1
+        uses: juan-vg/terraform-pr-commenter@v1
         with:
           commenter_type: plan
           commenter_input: ${{ format('{0}{1}', steps.plan.outputs.stdout, steps.plan.outputs.stderr) }}
@@ -182,7 +185,7 @@ jobs:
 
       - name: Post Init - ${{ matrix['workspace'] }}
         if: always() && github.ref != 'refs/heads/master' && (steps.init.outcome == 'success' || steps.init.outcome == 'failure')
-        uses: robburger/terraform-pr-commenter@v1
+        uses: juan-vg/terraform-pr-commenter@v1
           with:
             commenter_type: init
             commenter_input: ${{ format('{0}{1}', steps.init.outputs.stdout, steps.init.outputs.stderr) }}
@@ -194,7 +197,7 @@ jobs:
 
       - name: Post Plan - ${{ matrix['workspace'] }}
         if: always() && github.ref != 'refs/heads/master' && (steps.plan.outcome == 'success' || steps.plan.outcome == 'failure')
-        uses: robburger/terraform-pr-commenter@v1
+        uses: juan-vg/terraform-pr-commenter@v1
         with:
           commenter_type: plan
           commenter_input: ${{ format('{0}{1}', steps.plan.outputs.stdout, steps.plan.outputs.stderr) }}
@@ -230,7 +233,7 @@ In English: "Always run this step, but only on a pull request and only when the
 
 ## Troubleshooting & Contributing
 
-Feel free to head over to the [Issues](https://github.com/robburger/terraform-pr-commenter/issues) tab to see if the issue you're having has already been reported. If not, [open a new one](https://github.com/robburger/terraform-pr-commenter/issues/new) and be sure to include as much relevant information as possible, including code-samples, and a description of what you expect to be happening.
+Feel free to head over to the [Issues](https://github.com/juan-vg/terraform-pr-commenter/issues) tab to see if the issue you're having has already been reported. If not, [open a new one](https://github.com/juan-vg/terraform-pr-commenter/issues/new) and be sure to include as much relevant information as possible, including code-samples, and a description of what you expect to be happening.
 
 ## License
 

action.yml

@@ -1,6 +1,6 @@
-name: 'Terraform PR Commenter'
+name: 'Terraform PR Commenter by Juan-VG'
 description: 'Adds opinionated comments to a PR from Terraform fmt/init/plan output'
-author: 'Rob Burger'
+author: 'Juan-VG'
 branding:
   icon: 'git-pull-request'
   color: 'purple'

entrypoint.sh

@@ -184,7 +184,7 @@ if [[ $COMMAND == 'plan' ]]; then
   # Actions: Strip out the refresh section, ignore everything after the 72 dashes, format, colourise and build PR comment.
   if [[ $EXIT_CODE -eq 0 || $EXIT_CODE -eq 2 ]]; then
     CLEAN_PLAN=$(echo "$INPUT" | sed -r '/^(An execution plan has been generated and is shown below.|Terraform used the selected providers to generate the following execution|No changes. Infrastructure is up-to-date.|No changes. Your infrastructure matches the configuration.|Note: Objects have changed outside of Terraform)$/,$!d') # Strip refresh section
-    CLEAN_PLAN=$(echo "$CLEAN_PLAN" | sed -r '/Plan: /q') # Ignore everything after plan summary
+    #CLEAN_PLAN=$(echo "$CLEAN_PLAN" | sed -r '/Plan: /q') # Ignore everything after plan summary ## https://github.com/robburger/terraform-pr-commenter/pull/49/files
     CLEAN_PLAN=${CLEAN_PLAN::65300} # GitHub has a 65535-char comment limit - truncate plan, leaving space for comment wrapper
     CLEAN_PLAN=$(echo "$CLEAN_PLAN" | sed -r 's/^([[:blank:]]*)([-+~])/\2\1/g') # Move any diff characters to start of line
     if [[ $COLOURISE == 'true' ]]; then