Skip to content

Commit

Permalink
Merge pull request #25 from remerge/CORE-533
Browse files Browse the repository at this point in the history
Update template and dependencies
  • Loading branch information
hollow authored Feb 20, 2024
2 parents 9d3c2dc + ae09b4e commit b332988
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Changes here will be overwritten by Copier
_commit: v2.8.0
_commit: v2.8.4-23-g0425355
_src_path: gh:remerge/template
project_id: terraform-modules
project_license: apache-2.0
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
# https://github.com/actions/checkout/releases
uses: actions/checkout@v4

- name: Load envrc
# https://github.com/HatsuneMiku3939/direnv-action/releases
uses: HatsuneMiku3939/direnv-action@v1

- name: Setup Terraform
# https://github.com/hashicorp/setup-terraform/releases
uses: hashicorp/setup-terraform@v3
with:
cli_config_credentials_token: "${{ secrets.TF_CLOUD_API_TOKEN }}"
Expand All @@ -43,7 +46,8 @@ jobs:
mkdir -p ~/.terraform.d/plugin-cache
- name: Cache Terraform plugins
uses: actions/cache@v3
# https://github.com/actions/cache/releases
uses: actions/cache@v4
with:
path: ~/.terraform.d/plugin-cache
key: "${{ runner.os }}-terraform-${{ hashFiles('**/.terraform.lock.hcl') }}"
Expand All @@ -55,4 +59,5 @@ jobs:
run: make install

- name: Run pre-commit checks
uses: pre-commit/action@v3.0.0
# https://github.com/pre-commit/action/releases
uses: pre-commit/action@v3.0.1
10 changes: 6 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ repos:

# https://github.com/igorshubovych/markdownlint-cli/tags
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: "v0.37.0"
rev: "v0.39.0"
hooks:
- id: markdownlint-fix
name: markdownlint

# https://github.com/adrienverge/yamllint/tags
- repo: https://github.com/adrienverge/yamllint
rev: "v1.33.0"
rev: "v1.35.1"
hooks:
- id: yamllint
entry: yamllint --strict
Expand All @@ -74,16 +74,18 @@ repos:

# https://github.com/antonbabenko/pre-commit-terraform/tags
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: "v1.83.6"
rev: "v1.87.1"
hooks:
- id: terraform_fmt
name: terraform-fmt
- id: terraform_validate
name: terraform-validate
args:
- --hook-config=--parallelism-limit=1

# https://github.com/bridgecrewio/checkov/tags
- repo: https://github.com/bridgecrewio/checkov
rev: "3.1.30"
rev: "3.2.22"
hooks:
- id: checkov
name: checkov
Expand Down
2 changes: 1 addition & 1 deletion google/kubernetes/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "cluster" {
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
version = "v29.0.0"
version = "v30.0.0"

project_id = var.project
name = var.name
Expand Down

0 comments on commit b332988

Please sign in to comment.