From f744e2850ec8fbea7dc3b239cfdc1b66a4d7f107 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sat, 10 Jul 2021 22:14:02 -0400 Subject: [PATCH 1/5] Add terraform-docs version to entrypoint Co-authored-by: Nick M. <50747025+mcdonnnj@users.noreply.github.com> --- entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/entrypoint.sh b/entrypoint.sh index 53f8599..795781d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,3 +2,4 @@ echo "PACKER_VERSION=1.6.6" >> "$GITHUB_ENV" echo "TERRAFORM_VERSION=0.12.31" >> "$GITHUB_ENV" +echo "TERRAFORM_DOCS_VERSION=0.14.1" >> "$GITHUB_ENV" From 4e7f00a0c69447153850dc559e9d06cf09712b04 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sat, 10 Jul 2021 22:15:20 -0400 Subject: [PATCH 2/5] Add periods to descriptions --- README.md | 4 ++-- action.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fd96056..51440c7 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ None | Name | Description | |-------------------|-------------| -| PACKER_VERSION | The version of [Packer](https://packer.io) to use | -| TERRAFORM_VERSION | The version of [Terraform](https://terraform.io) to use | +| PACKER_VERSION | The version of [Packer](https://packer.io) to use. | +| TERRAFORM_VERSION | The version of [Terraform](https://terraform.io) to use. | ## Usage ## diff --git a/action.yml b/action.yml index f01af93..1d2b9b4 100644 --- a/action.yml +++ b/action.yml @@ -4,12 +4,12 @@ author: CISA Development Team branding: icon: globe color: purple -description: Setup a shared GitHub Actions workflow environment +description: Setup a shared GitHub Actions workflow environment. outputs: PACKER_VERSION: - description: The version of Packer to download and use + description: The version of Packer to download and use. TERRAFORM_VERSION: - description: The version of Terraform to download and use + description: The version of Terraform to download and use. runs: using: 'docker' image: 'Dockerfile' From 6b577ce586c6f32f887fc379117bab1984566547 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sat, 10 Jul 2021 22:15:26 -0400 Subject: [PATCH 3/5] Add terraform-docs output Co-authored-by: Nick M. <50747025+mcdonnnj@users.noreply.github.com> --- README.md | 1 + action.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/README.md b/README.md index 51440c7..ab03d8c 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ None |-------------------|-------------| | PACKER_VERSION | The version of [Packer](https://packer.io) to use. | | TERRAFORM_VERSION | The version of [Terraform](https://terraform.io) to use. | +| TERRAFORM_DOCS_VERSION | The version of [terraform-docs](https://github.com/terraform-docs/terraform-docs) to use. | ## Usage ## diff --git a/action.yml b/action.yml index 1d2b9b4..2a75028 100644 --- a/action.yml +++ b/action.yml @@ -10,6 +10,8 @@ outputs: description: The version of Packer to download and use. TERRAFORM_VERSION: description: The version of Terraform to download and use. + TERRAFORM_DOCS_VERSION: + description: The version of terraform-docs to download and use. runs: using: 'docker' image: 'Dockerfile' From d13060575284eca8cf04ff202ac4fe5fd03b7c98 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sat, 10 Jul 2021 22:30:14 -0400 Subject: [PATCH 4/5] Improve shell syntax to satisfy shell-lint --- entrypoint.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 795781d..c71c5c7 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,3 @@ #!/bin/sh -echo "PACKER_VERSION=1.6.6" >> "$GITHUB_ENV" -echo "TERRAFORM_VERSION=0.12.31" >> "$GITHUB_ENV" -echo "TERRAFORM_DOCS_VERSION=0.14.1" >> "$GITHUB_ENV" +{ echo "PACKER_VERSION=1.6.6"; echo "TERRAFORM_VERSION=0.12.31"; echo "TERRAFORM_DOCS_VERSION=0.14.1"; } >> "$GITHUB_ENV" From 1354d4f96ec03192d95c76de0e9e61528a9d2372 Mon Sep 17 00:00:00 2001 From: Shane Frasier Date: Sun, 11 Jul 2021 21:58:37 -0400 Subject: [PATCH 5/5] Correct terraform-docs version The terraform-docs version starts with a `v` character. Co-authored-by: Nick M. <50747025+mcdonnnj@users.noreply.github.com> --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index c71c5c7..ea98428 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/sh -{ echo "PACKER_VERSION=1.6.6"; echo "TERRAFORM_VERSION=0.12.31"; echo "TERRAFORM_DOCS_VERSION=0.14.1"; } >> "$GITHUB_ENV" +{ echo "PACKER_VERSION=1.6.6"; echo "TERRAFORM_VERSION=0.12.31"; echo "TERRAFORM_DOCS_VERSION=v0.14.1"; } >> "$GITHUB_ENV"