From 6f5549b12225c0de66130b4d7acfe8bcf225235d Mon Sep 17 00:00:00 2001 From: Keyvan Date: Fri, 10 Jan 2025 19:44:55 +0100 Subject: [PATCH 1/2] fix: trivy ci fail --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ed5693c..786c4a9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,6 +41,7 @@ repos: - id: terraform_tflint - id: terraform_trivy args: + - --hook-config=--parallelism-limit=1 - --args=--severity MEDIUM,HIGH,CRITICAL - --args=--skip-dirs="*/.terraform" - --args=--tf-exclude-downloaded-modules From 9a25a8b003f5623c54ddeef1e74d3ec7d55b653f Mon Sep 17 00:00:00 2001 From: Keyvan Date: Fri, 10 Jan 2025 20:53:11 +0100 Subject: [PATCH 2/2] feat: update terraform modules when running hooks --- .pre-commit-config.yaml | 10 ++++++++++ cluster/.terraform.lock.hcl | 34 +++++++++++++++++----------------- cluster/README.md | 2 +- config/.terraform.lock.hcl | 32 ++++++++++++++++---------------- config/README.md | 2 +- 5 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 786c4a9..f9845c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -55,12 +55,22 @@ repos: - id: actionlint-system - repo: local hooks: + - id: update-terraform-modules-cluster + name: Update terraform modules for the Terraform cluster/ + language: system + entry: terraform -chdir=cluster init -upgrade + pass_filenames: false - id: terraform-docs-cluster name: Generate docs for the Terraform cluster/ language: system entry: terraform-docs markdown table cluster/ pass_filenames: false files: 'cluster/' + - id: update-terraform-modules-config + name: Update terraform modules for the Terraform config/ + language: system + entry: terraform -chdir=config init -upgrade + pass_filenames: false - id: terraform-docs-config name: Generate docs for the Terraform config/ language: system diff --git a/cluster/.terraform.lock.hcl b/cluster/.terraform.lock.hcl index 9042ee3..1afb0e2 100644 --- a/cluster/.terraform.lock.hcl +++ b/cluster/.terraform.lock.hcl @@ -19,25 +19,25 @@ provider "registry.terraform.io/gavinbunney/kubectl" { } provider "registry.terraform.io/hashicorp/aws" { - version = "5.82.2" - constraints = ">= 3.72.0, >= 4.0.0, >= 4.47.0, >= 4.57.0, >= 5.0.0, >= 5.46.0, < 6.0.0" + version = "5.83.1" + constraints = ">= 4.0.0, >= 4.33.0, >= 4.57.0, >= 5.0.0, >= 5.46.0, < 6.0.0" hashes = [ - "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", - "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", - "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", - "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", - "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", - "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", + "h1:vInFMDq9oMs53/i+7IU8hZgmTLhFfng8L8kbuALZxSI=", + "zh:0313253c78f195973752c4d1f62bfdd345a9c99c1bc7a612a8c1f1e27d51e49e", + "zh:108523f3e9ebc93f7d900c51681f6edbd3f3a56b8a62b0afc31d8214892f91e0", + "zh:175b9bf2a00bea6ac1c73796ad77b0e00dcbbde166235017c49377d7763861d8", + "zh:1c8bf55b8548bbad683cd6d7bdb03e8840a00b2422dc1529ffb9892820657130", + "zh:22338f09bae62d5ff646de00182417f992548da534fee7d98c5d0136d4bd5d7a", + "zh:92de1107ec43de60612be5f6255616f16a9cf82d88df1af1c0471b81f3a82c16", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", - "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", - "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", - "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", - "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", - "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", - "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", - "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", - "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", + "zh:9c7bfb7afea330e6d90e1466125a8cba3db1ed4043c5da52f737459c89290a6e", + "zh:ba59b374d477e5610674b70f5abfe0408e8f809390347372751384151440d3d0", + "zh:bd1c433966002f586d63cb1e3e16326991f238bc6beeb2352be36ec651917b0b", + "zh:ca2b4d1d02651c15261fffa4b142e45def9a22c6069353f0f663fd2046e268f8", + "zh:d8ed98c748f7a3f1a72277cfee9afe346aca39ab319d17402277852551d8f14a", + "zh:ed3d8bc89de5f35f3c5f4802ff7c749fda2e2be267f9af4a850694f099960a72", + "zh:f698732a4391c3f4d7079b4aaa52389da2a460cac5eed438ed688f147d603689", + "zh:f9f51b17f2978394954e9f6ab9ef293b8e11f1443117294ccf87f7f8212b3439", ] } diff --git a/cluster/README.md b/cluster/README.md index dcf110f..9e65466 100644 --- a/cluster/README.md +++ b/cluster/README.md @@ -11,7 +11,7 @@ | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.82.2 | +| [aws](#provider\_aws) | 5.83.1 | | [kubectl](#provider\_kubectl) | 1.14.0 | | [kubernetes](#provider\_kubernetes) | 2.24.0 | diff --git a/config/.terraform.lock.hcl b/config/.terraform.lock.hcl index 85c706e..f8a9329 100644 --- a/config/.terraform.lock.hcl +++ b/config/.terraform.lock.hcl @@ -19,25 +19,25 @@ provider "registry.terraform.io/gavinbunney/kubectl" { } provider "registry.terraform.io/hashicorp/aws" { - version = "5.82.2" + version = "5.83.1" constraints = ">= 4.0.0, >= 4.57.0, >= 5.0.0, < 6.0.0" hashes = [ - "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", - "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", - "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", - "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", - "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", - "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", + "h1:vInFMDq9oMs53/i+7IU8hZgmTLhFfng8L8kbuALZxSI=", + "zh:0313253c78f195973752c4d1f62bfdd345a9c99c1bc7a612a8c1f1e27d51e49e", + "zh:108523f3e9ebc93f7d900c51681f6edbd3f3a56b8a62b0afc31d8214892f91e0", + "zh:175b9bf2a00bea6ac1c73796ad77b0e00dcbbde166235017c49377d7763861d8", + "zh:1c8bf55b8548bbad683cd6d7bdb03e8840a00b2422dc1529ffb9892820657130", + "zh:22338f09bae62d5ff646de00182417f992548da534fee7d98c5d0136d4bd5d7a", + "zh:92de1107ec43de60612be5f6255616f16a9cf82d88df1af1c0471b81f3a82c16", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", - "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", - "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", - "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", - "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", - "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", - "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", - "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", - "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", + "zh:9c7bfb7afea330e6d90e1466125a8cba3db1ed4043c5da52f737459c89290a6e", + "zh:ba59b374d477e5610674b70f5abfe0408e8f809390347372751384151440d3d0", + "zh:bd1c433966002f586d63cb1e3e16326991f238bc6beeb2352be36ec651917b0b", + "zh:ca2b4d1d02651c15261fffa4b142e45def9a22c6069353f0f663fd2046e268f8", + "zh:d8ed98c748f7a3f1a72277cfee9afe346aca39ab319d17402277852551d8f14a", + "zh:ed3d8bc89de5f35f3c5f4802ff7c749fda2e2be267f9af4a850694f099960a72", + "zh:f698732a4391c3f4d7079b4aaa52389da2a460cac5eed438ed688f147d603689", + "zh:f9f51b17f2978394954e9f6ab9ef293b8e11f1443117294ccf87f7f8212b3439", ] } diff --git a/config/README.md b/config/README.md index 552aebe..9d23f83 100644 --- a/config/README.md +++ b/config/README.md @@ -12,7 +12,7 @@ | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.82.2 | +| [aws](#provider\_aws) | 5.83.1 | | [helm](#provider\_helm) | 2.11.0 | | [kubectl](#provider\_kubectl) | 1.14.0 | | [kubernetes](#provider\_kubernetes) | 2.24.0 |