From eb30f272e758b6d35fa598d6222172efcda11335 Mon Sep 17 00:00:00 2001 From: Muhammad Furqan Habibi Date: Fri, 11 Nov 2022 15:59:13 +0900 Subject: [PATCH 1/6] Update gha --- .github/workflows/lint.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 09d374f..7308872 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,18 +8,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Run pre-commit test + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: 3.x + - name: Install pre-commit dependency - terraform-docs run: | - sudo apt-get install python3-pip gawk - curl https://pre-commit.com/install-local.py | python3 - - # Terraform Docs - curl -Lo ./terraform-docs https://github.com/terraform-docs/terraform-docs/releases/download/v0.9.1/terraform-docs-v0.9.1-$(uname | tr '[:upper:]' '[:lower:]')-amd64 - chmod +x ./terraform-docs - sudo mv ./terraform-docs /usr/bin/terraform-docs - # Tflint - curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/bin/ - # Run pre-commit - /home/runner/bin/pre-commit --version - terraform-docs --version - /home/runner/bin/pre-commit run -a + TF_DOCS_VER="v0.9.1" + pushd /tmp + curl -Lo ./terraform-docs.tar.gz https://github.com/terraform-docs/terraform-docs/releases/download/${TF_DOCS_VER}/terraform-docs-${TF_DOCS_VER}-$(uname)-amd64.tar.gz && tar -xzf terraform-docs.tar.gz && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/ + popd + - name: Install pre-commit dependency - tflint + uses: terraform-linters/setup-tflint@v2 + - name: Run pre-commit test + uses: pre-commit/action@v3.0.0 + with: + extra_args: --color=always --show-diff-on-failure --all-files \ No newline at end of file From cd6f62592133c0ff4c78425af8cec8fd0cfe1d3f Mon Sep 17 00:00:00 2001 From: Muhammad Furqan Habibi Date: Fri, 11 Nov 2022 16:08:46 +0900 Subject: [PATCH 2/6] update tf-docs --- .github/workflows/lint.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7308872..f21d640 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,6 +1,10 @@ name: lint -on: [push, pull_request] +on: + pull_request: + push: + branches: + - main jobs: build: @@ -14,7 +18,7 @@ jobs: python-version: 3.x - name: Install pre-commit dependency - terraform-docs run: | - TF_DOCS_VER="v0.9.1" + TF_DOCS_VER="v0.14.1" pushd /tmp curl -Lo ./terraform-docs.tar.gz https://github.com/terraform-docs/terraform-docs/releases/download/${TF_DOCS_VER}/terraform-docs-${TF_DOCS_VER}-$(uname)-amd64.tar.gz && tar -xzf terraform-docs.tar.gz && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/ popd From 05dfb1b6f2dcd9ca074643883a3ced6cef20345e Mon Sep 17 00:00:00 2001 From: Muhammad Furqan Habibi Date: Fri, 11 Nov 2022 16:17:16 +0900 Subject: [PATCH 3/6] update pre-commit repo --- .github/workflows/lint.yml | 2 +- .pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f21d640..054d19f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,4 +27,4 @@ jobs: - name: Run pre-commit test uses: pre-commit/action@v3.0.0 with: - extra_args: --color=always --show-diff-on-failure --all-files \ No newline at end of file + extra_args: --all-files \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index aaf23da..0c5dfbe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: -- repo: git://github.com/antonbabenko/pre-commit-terraform +- repo: https://github.com/antonbabenko/pre-commit-terraform rev: v1.43.0 hooks: - id: terraform_fmt From cb932c0854b7fc9b634d1d44536b0e7c4f21ea1d Mon Sep 17 00:00:00 2001 From: Muhammad Furqan Habibi Date: Fri, 11 Nov 2022 16:21:50 +0900 Subject: [PATCH 4/6] revert tf-docs to 0.9.1 --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 054d19f..417a41c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,9 +18,9 @@ jobs: python-version: 3.x - name: Install pre-commit dependency - terraform-docs run: | - TF_DOCS_VER="v0.14.1" + TF_DOCS_VER="v0.9.1" pushd /tmp - curl -Lo ./terraform-docs.tar.gz https://github.com/terraform-docs/terraform-docs/releases/download/${TF_DOCS_VER}/terraform-docs-${TF_DOCS_VER}-$(uname)-amd64.tar.gz && tar -xzf terraform-docs.tar.gz && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/ + curl -Lo ./terraform-docs https://github.com/terraform-docs/terraform-docs/releases/download/v0.9.1/terraform-docs-v0.9.1-$(uname | tr '[:upper:]' '[:lower:]')-amd64 && chmod +x ./terraform-docs && sudo mv ./terraform-docs /usr/bin/ popd - name: Install pre-commit dependency - tflint uses: terraform-linters/setup-tflint@v2 From 10cf674517171f895ac0c68f44c53f2541bc8fed Mon Sep 17 00:00:00 2001 From: Muhammad Furqan Habibi Date: Fri, 11 Nov 2022 16:28:25 +0900 Subject: [PATCH 5/6] pin tflint version --- .github/workflows/lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 417a41c..91b021a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,6 +24,8 @@ jobs: popd - name: Install pre-commit dependency - tflint uses: terraform-linters/setup-tflint@v2 + with: + tflint_version: v0.34.0 - name: Run pre-commit test uses: pre-commit/action@v3.0.0 with: From 1780f0dbba2ac3787c421e134efac3ac3ed80c6a Mon Sep 17 00:00:00 2001 From: Muhammad Furqan Habibi Date: Fri, 11 Nov 2022 16:30:47 +0900 Subject: [PATCH 6/6] TF_DOCS_VER --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 91b021a..dec9fa4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: run: | TF_DOCS_VER="v0.9.1" pushd /tmp - curl -Lo ./terraform-docs https://github.com/terraform-docs/terraform-docs/releases/download/v0.9.1/terraform-docs-v0.9.1-$(uname | tr '[:upper:]' '[:lower:]')-amd64 && chmod +x ./terraform-docs && sudo mv ./terraform-docs /usr/bin/ + curl -Lo ./terraform-docs https://github.com/terraform-docs/terraform-docs/releases/download/${TF_DOCS_VER}/terraform-docs-${TF_DOCS_VER}-$(uname | tr '[:upper:]' '[:lower:]')-amd64 && chmod +x ./terraform-docs && sudo mv ./terraform-docs /usr/bin/ popd - name: Install pre-commit dependency - tflint uses: terraform-linters/setup-tflint@v2