From 0fd0313f3db49628b0fc37d4e1b17bba8b1bd506 Mon Sep 17 00:00:00 2001 From: Steven B Date: Tue, 16 Mar 2021 16:06:13 -0400 Subject: [PATCH] Fix #27 #28 (#31) * ignore more things * fix #27 * go deeper to fix #27 * try that to fix #28 * use tail to just get one url, fix #28 * Apply automatic changes * upgrade hooks to latest bc yolo Co-authored-by: Linter Bot --- .gitignore | 6 ++++++ .pre-commit-config.yaml | 9 ++------- .tflint.hcl | 1 - README.md | 11 ++++++++++- bin/install-ubuntu.sh | 3 ++- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1fef4ab..371d818 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,9 @@ # .tfvars files *.tfvars + +# macs +.DS_Store + +# temp folders +tmp diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2d1aac7..48fb67f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,17 +1,12 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.31.0 + rev: v1.48.0 hooks: - id: terraform_docs always_run: true args: - --args=--sort-by-required - id: terraform_fmt - - id: terraform_tflint - alias: terraform_tflint_deep - name: terraform_tflint_deep - args: - - --args=--deep - id: terraform_tflint alias: terraform_tflint_nocreds name: terraform_tflint_nocreds @@ -41,7 +36,7 @@ repos: files: \.tf(vars)?$ exclude: examples - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.0.0 + rev: v3.4.0 hooks: - id: check-case-conflict - id: check-json diff --git a/.tflint.hcl b/.tflint.hcl index 5cba22a..464e852 100644 --- a/.tflint.hcl +++ b/.tflint.hcl @@ -1,6 +1,5 @@ config { module = true - deep_check = false } rule "terraform_deprecated_interpolation" { diff --git a/README.md b/README.md index a0f6e3d..76fe91b 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,16 @@ A bit about this module No provider. +## Modules + +| Name | Source | Version | +|------|--------|---------| +| tags | rhythmictech/tags/terraform | ~> 1.1.0 | + +## Resources + +No resources. + ## Inputs | Name | Description | Type | Default | Required | @@ -42,7 +52,6 @@ No provider. | Name | Description | |------|-------------| | tags\_module | Tags Module in it's entirety | - ## Getting Started diff --git a/bin/install-ubuntu.sh b/bin/install-ubuntu.sh index 1541b75..fd33143 100755 --- a/bin/install-ubuntu.sh +++ b/bin/install-ubuntu.sh @@ -3,7 +3,8 @@ echo 'installing dependencies' sudo apt install python3-pip gawk &&\ pip3 install pre-commit -curl -L "$(curl -sL https://api.github.com/repos/segmentio/terraform-docs/releases/latest | grep -o -E "https://.+?-linux-amd64")" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/ +tfdocs_latest_dl_url=$(curl -sL https://api.github.com/repos/terraform-docs/terraform-docs/releases/latest | grep -o -E "https://.+?-linux-amd64" | tail -n1) +curl -L "$tfdocs_latest_dl_url" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/ curl -L "$(curl -sL 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/ env GO111MODULE=on go get -u github.com/liamg/tfsec/cmd/tfsec git clone https://github.com/tfutils/tfenv.git ~/.tfenv || true