From 90877c749a29c55bd4f4d09ecdf7c49216558a72 Mon Sep 17 00:00:00 2001 From: Ben de Haan <53901866+bendehaan@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:06:32 +0100 Subject: [PATCH] fix: update renovate config --- .github/dependabot.yml | 48 ------- .pre-commit-config.yaml | 13 ++ aws/.terraform-docs.yml | 54 +++++++ aws/README.md | 35 +---- aws/shared-state/README.md | 41 ------ azure/.terraform-docs.yml | 54 +++++++ azure/README.md | 25 +--- azure/shared-state/README.md | 45 ------ gcp/.terraform-docs.yml | 54 +++++++ gcp/README.md | 27 +--- gcp/shared-state/README.md | 43 ------ helm/wrongsecrets-ctf-party/README.md | 2 +- renovate.json | 198 ++++++++++---------------- 13 files changed, 266 insertions(+), 373 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 aws/.terraform-docs.yml delete mode 100644 aws/shared-state/README.md create mode 100644 azure/.terraform-docs.yml delete mode 100644 azure/shared-state/README.md create mode 100644 gcp/.terraform-docs.yml delete mode 100644 gcp/shared-state/README.md diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 3ab93ab10..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,48 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - - package-ecosystem: "npm" # See documentation for possible values - directory: "/wrongsecrets-balancer/" # Location of package manifests - open-pull-requests-limit: 15 - schedule: - interval: "monthly" - - package-ecosystem: "npm" # See documentation for possible values - directory: "/wrongsecrets-balancer/ui" # Location of package manifests - open-pull-requests-limit: 16 - schedule: - interval: "monthly" - # check our npm for dev - - package-ecosystem: "npm" - directory: "/" - open-pull-requests-limit: 15 - schedule: - interval: "monthly" - - package-ecosystem: "npm" # See documentation for possible values - directory: "/cleaner" # Location of package manifests - open-pull-requests-limit: 15 - schedule: - interval: "monthly" - - package-ecosystem: "docker" - directory: "/wrongsecrets-balancer" - schedule: - interval: "monthly" - - package-ecosystem: "terraform" - directory: "/aws" - schedule: - interval: "monthly" - - package-ecosystem: "terraform" - directory: "/azure" - schedule: - interval: "monthly" - - package-ecosystem: "terraform" - directory: "/gcp" - schedule: - interval: "monthly" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ab7f6811a..5eb497857 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,17 @@ +ci: + autofix_commit_msg: | + [pre-commit.ci] auto fixes from pre-commit.com hooks + autofix_prs: false # managed in the action step + autoupdate_branch: "" + autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate" + autoupdate_schedule: weekly + skip: [] + submodules: false repos: + - repo: https://github.com/renovatebot/pre-commit-hooks + rev: 39.17.1 + hooks: + - id: renovate-config-validator - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.6.0 hooks: diff --git a/aws/.terraform-docs.yml b/aws/.terraform-docs.yml new file mode 100644 index 000000000..93e4fcb54 --- /dev/null +++ b/aws/.terraform-docs.yml @@ -0,0 +1,54 @@ +formatter: "" # this is required + +version: "" + +header-from: main.tf +footer-from: "" + +recursive: + enabled: true + path: shared-state + include-main: true + +sections: + hide: + - requirements + - providers + - modules + show: [] + + hide-all: false # deprecated in v0.13.0, removed in v0.15.0 + show-all: true # deprecated in v0.13.0, removed in v0.15.0 + +content: "" + +output: + file: README.md + mode: inject + template: |- + + {{ .Content }} + + +output-values: + enabled: false + from: "" + +sort: + enabled: true + by: name + +settings: + anchor: true + color: true + default: true + description: false + escape: true + hide-empty: false + html: true + indent: 2 + lockfile: true + read-comments: true + required: true + sensitive: true + type: true diff --git a/aws/README.md b/aws/README.md index 3313a9197..f84821c1e 100644 --- a/aws/README.md +++ b/aws/README.md @@ -138,36 +138,11 @@ Note that you might have to do some manual cleanups after that. The documentation below is auto-generated to give insight on what's created via Terraform. -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | ~> 1.1 | -| [aws](#requirement\_aws) | ~> 5.0 | -| [http](#requirement\_http) | ~> 3.1 | -| [random](#requirement\_random) | ~> 3.0 | - -## Providers - -| Name | Version | -|------|---------| -| [aws](#provider\_aws) | 5.70.0 | -| [http](#provider\_http) | 3.4.5 | -| [random](#provider\_random) | 3.6.3 | - -## Modules - -| Name | Source | Version | -|------|--------|---------| -| [acm\_balancer](#module\_acm\_balancer) | terraform-aws-modules/acm/aws | n/a | -| [acm\_ctfd](#module\_acm\_ctfd) | terraform-aws-modules/acm/aws | n/a | -| [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 | -| [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 | -| [eks](#module\_eks) | terraform-aws-modules/eks/aws | 20.24.2 | -| [external\_dns\_irsa\_role](#module\_external\_dns\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 | -| [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.46 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.13.0 | +README.md updated successfully +shared-state/.terraform/README.md updated successfully + + ## Resources | Name | Type | @@ -240,4 +215,4 @@ The documentation below is auto-generated to give insight on what's created via | [load\_balancer\_controller\_role\_arn](#output\_load\_balancer\_controller\_role\_arn) | Load balancer controller role arn | | [secrets\_manager\_secret\_name](#output\_secrets\_manager\_secret\_name) | The name of the secrets manager secret | | [state\_bucket\_name](#output\_state\_bucket\_name) | Terraform s3 state bucket name | - + diff --git a/aws/shared-state/README.md b/aws/shared-state/README.md deleted file mode 100644 index 5894a5ebb..000000000 --- a/aws/shared-state/README.md +++ /dev/null @@ -1,41 +0,0 @@ -# Terraform documentation -The documentation below is auto-generated to give insight on what's created via Terraform. - - -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | ~> 1.1 | -| [aws](#requirement\_aws) | ~> 5.0 | - -## Providers - -| Name | Version | -|------|---------| -| [aws](#provider\_aws) | 5.70.0 | - -## Modules - -No modules. - -## Resources - -| Name | Type | -|------|------| -| [aws_s3_bucket.state](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource | -| [aws_s3_bucket_server_side_encryption_configuration.encryption](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_server_side_encryption_configuration) | resource | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [region](#input\_region) | The AWS region to use | `string` | `"eu-west-1"` | no | - -## Outputs - -| Name | Description | -|------|-------------| -| [s3\_bucket\_arn](#output\_s3\_bucket\_arn) | Name of the terraform state bucket | -| [s3\_bucket\_name](#output\_s3\_bucket\_name) | Name of the terraform state bucket | - diff --git a/azure/.terraform-docs.yml b/azure/.terraform-docs.yml new file mode 100644 index 000000000..93e4fcb54 --- /dev/null +++ b/azure/.terraform-docs.yml @@ -0,0 +1,54 @@ +formatter: "" # this is required + +version: "" + +header-from: main.tf +footer-from: "" + +recursive: + enabled: true + path: shared-state + include-main: true + +sections: + hide: + - requirements + - providers + - modules + show: [] + + hide-all: false # deprecated in v0.13.0, removed in v0.15.0 + show-all: true # deprecated in v0.13.0, removed in v0.15.0 + +content: "" + +output: + file: README.md + mode: inject + template: |- + + {{ .Content }} + + +output-values: + enabled: false + from: "" + +sort: + enabled: true + by: name + +settings: + anchor: true + color: true + default: true + description: false + escape: true + hide-empty: false + html: true + indent: 2 + lockfile: true + read-comments: true + required: true + sensitive: true + type: true diff --git a/azure/README.md b/azure/README.md index ed6efdd87..aa9fdc7c1 100644 --- a/azure/README.md +++ b/azure/README.md @@ -146,27 +146,10 @@ Note that you might have to do some manual cleanups after that. The documentation below is auto-generated to give insight on what's created via Terraform. -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | ~> 1.1 | -| [azurerm](#requirement\_azurerm) | ~> 4.3.0 | -| [http](#requirement\_http) | ~> 3.4.0 | -| [random](#requirement\_random) | ~> 3.6.0 | - -## Providers - -| Name | Version | -|------|---------| -| [azurerm](#provider\_azurerm) | 4.3.0 | -| [http](#provider\_http) | 3.4.5 | -| [random](#provider\_random) | 3.6.3 | - -## Modules - -No modules. +README.md updated successfully + + ## Resources | Name | Type | @@ -213,4 +196,4 @@ No modules. | [tenant\_id](#output\_tenant\_id) | Azure tenant ID | | [vault\_name](#output\_vault\_name) | Vault name | | [vault\_uri](#output\_vault\_uri) | Vault URI | - + diff --git a/azure/shared-state/README.md b/azure/shared-state/README.md deleted file mode 100644 index edca17180..000000000 --- a/azure/shared-state/README.md +++ /dev/null @@ -1,45 +0,0 @@ -# Terraform documentation -The documentation below is auto-generated to give insight on what's created via Terraform. - - -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | ~> 1.1 | -| [azurerm](#requirement\_azurerm) | ~> 3.0 | -| [random](#requirement\_random) | ~> 3.0 | - -## Providers - -| Name | Version | -|------|---------| -| [azurerm](#provider\_azurerm) | 3.69.0 | -| [random](#provider\_random) | 3.5.1 | - -## Modules - -No modules. - -## Resources - -| Name | Type | -|------|------| -| [azurerm_resource_group.default](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource | -| [azurerm_storage_account.account](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/storage_account) | resource | -| [azurerm_storage_container.blob](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/storage_container) | resource | -| [random_integer.suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) | resource | -| [random_string.suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [region](#input\_region) | The Azure region to use | `string` | `"East US"` | no | - -## Outputs - -| Name | Description | -|------|-------------| -| [storage\_account\_name](#output\_storage\_account\_name) | The generated storage account name | - diff --git a/gcp/.terraform-docs.yml b/gcp/.terraform-docs.yml new file mode 100644 index 000000000..93e4fcb54 --- /dev/null +++ b/gcp/.terraform-docs.yml @@ -0,0 +1,54 @@ +formatter: "" # this is required + +version: "" + +header-from: main.tf +footer-from: "" + +recursive: + enabled: true + path: shared-state + include-main: true + +sections: + hide: + - requirements + - providers + - modules + show: [] + + hide-all: false # deprecated in v0.13.0, removed in v0.15.0 + show-all: true # deprecated in v0.13.0, removed in v0.15.0 + +content: "" + +output: + file: README.md + mode: inject + template: |- + + {{ .Content }} + + +output-values: + enabled: false + from: "" + +sort: + enabled: true + by: name + +settings: + anchor: true + color: true + default: true + description: false + escape: true + hide-empty: false + html: true + indent: 2 + lockfile: true + read-comments: true + required: true + sensitive: true + type: true diff --git a/gcp/README.md b/gcp/README.md index 96f4e973d..feb71ccc3 100644 --- a/gcp/README.md +++ b/gcp/README.md @@ -137,29 +137,10 @@ Note that you might have to do some manual cleanups after that. The documentation below is auto-generated to give insight on what's created via Terraform. -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | ~> 1.1 | -| [google](#requirement\_google) | ~> 6.5.0 | -| [google-beta](#requirement\_google-beta) | ~> 6.5.0 | -| [http](#requirement\_http) | ~> 3.4.0 | -| [random](#requirement\_random) | ~> 3.5.1 | - -## Providers - -| Name | Version | -|------|---------| -| [google](#provider\_google) | 6.5.0 | -| [google-beta](#provider\_google-beta) | 6.5.0 | -| [http](#provider\_http) | 3.4.5 | -| [random](#provider\_random) | 3.5.1 | - -## Modules - -No modules. +README.md updated successfully + + ## Resources | Name | Type | @@ -203,4 +184,4 @@ No modules. | [kubernetes\_cluster\_name](#output\_kubernetes\_cluster\_name) | GKE Cluster Name | | [project\_id](#output\_project\_id) | GCloud Project ID | | [region](#output\_region) | GCloud Region | - + diff --git a/gcp/shared-state/README.md b/gcp/shared-state/README.md deleted file mode 100644 index 0501a6c69..000000000 --- a/gcp/shared-state/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# Terraform documentation -The documentation below is auto-generated to give insight on what's created via Terraform. - - -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | ~> 1.1 | -| [google](#requirement\_google) | ~> 4.1 | -| [random](#requirement\_random) | ~> 3.0 | - -## Providers - -| Name | Version | -|------|---------| -| [google](#provider\_google) | 4.83.0 | -| [random](#provider\_random) | 3.5.1 | - -## Modules - -No modules. - -## Resources - -| Name | Type | -|------|------| -| [google_storage_bucket.state_bucket](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/storage_bucket) | resource | -| [random_id.suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id) | resource | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [project\_id](#input\_project\_id) | The GCP project id to use | `string` | `"owasp-wrongsecrets"` | no | -| [region](#input\_region) | The GCP region to use | `string` | `"europe-west4"` | no | - -## Outputs - -| Name | Description | -|------|-------------| -| [bucket](#output\_bucket) | Terraform backend storage bucket | - diff --git a/helm/wrongsecrets-ctf-party/README.md b/helm/wrongsecrets-ctf-party/README.md index 43b770008..aeccf2654 100644 --- a/helm/wrongsecrets-ctf-party/README.md +++ b/helm/wrongsecrets-ctf-party/README.md @@ -216,4 +216,4 @@ Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets | wrongsecretsCleanup.tolerations | list | `[]` | Optional Configure kubernetes toleration for the wrongsecretsCleanup Job (see: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/renovate.json b/renovate.json index 86c870091..4abd51397 100644 --- a/renovate.json +++ b/renovate.json @@ -1,123 +1,79 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "reviewers": [ - "commjoen", - "bendehaan" - ], - "schedule": [ - "* * 1,15 * *" - ], - "extends": [ - "config:recommended", - ":enablePreCommit" - ], - "labels": [ - "renovate", - "dependencies" - ], - "customManagers": [ - { - "customType": "regex", - "fileMatch": ".github/workflows/pre-commit.yml", - "depNameTemplate": "terraform-docs/terraform-docs", - "matchStrings": [ - "TF_DOCS_VERSION=\"(?.*?)\"" - ], - "datasourceTemplate": "github-releases" - }, - { - "customType": "regex", - "fileMatch": ".github/workflows/pre-commit.yml", - "depNameTemplate": "aquasecurity/tfsec", - "matchStrings": [ - "TFSEC_VERSION=\"(?.*?)\"" - ], - "datasourceTemplate": "github-releases" - }, - { - "customType": "regex", - "fileMatch": ".github/workflows/pre-commit.yml", - "depNameTemplate": "terraform-linters/tflint", - "matchStrings": [ - "TFLINT_VERSION=\"(?.*?)\"" - ], - "datasourceTemplate": "github-releases" - }, - { - "customType": "regex", - "fileMatch": ".github/scripts/docker-create.sh", - "depNameTemplate": "OWASP/wrongsecrets-binaries", - "matchStrings": [ - "BINARY_VERSION=\"(?.*?)\"" - ], - "datasourceTemplate": "github-releases" - }, - { - "customType": "regex", - "fileMatch": "aws/k8s-aws-alb-script.sh", - "depNameTemplate": "kubernetes-sigs/aws-alb-ingress-controller", - "matchStrings": [ - "LBC_VERSION=\"(?.*?)\"" - ], - "datasourceTemplate": "github-releases" - } - ], - "packageRules": [ - { - "groupName": "eslint", - "enabled": true, - "matchPackageNames": [ - "/^eslint/" - ] - }, - { - "groupName": "go", - "matchDatasources": [ - "go" - ], - "enabled": true - }, - { - "groupName": "pre-commit", - "matchFileNames": [ - ".pre-commit-config.yaml" - ], - "enabled": true - }, - { - "groupName": "terraform-aws", - "matchDatasources": [ - "terraform-provider", - "terraform-module" - ], - "enabled": true, - "matchPackageNames": [ - "/aws/", - "/terraform-aws-modules/.*/" - ] - }, - { - "groupName": "terraform-azure", - "matchDatasources": [ - "terraform-provider", - "terraform-module" - ], - "enabled": true, - "matchPackageNames": [ - "/azurerm/" - ] - }, - { - "groupName": "terraform-gcp", - "matchDatasources": [ - "terraform-provider", - "terraform-module" - ], - "enabled": true, - "matchPackageNames": [ - "/google/", - "/google-beta/" - ] - } - ] + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "reviewers": ["commjoen", "bendehaan"], + "schedule": ["* * 1,15 * *"], + "extends": ["config:recommended", ":enablePreCommit"], + "labels": ["renovate", "dependencies"], + "customManagers": [ + { + "customType": "regex", + "fileMatch": ".github/workflows/pre-commit.yml", + "depNameTemplate": "terraform-docs/terraform-docs", + "matchStrings": ["TF_DOCS_VERSION=\"(?.*?)\""], + "datasourceTemplate": "github-releases" + }, + { + "customType": "regex", + "fileMatch": ".github/workflows/pre-commit.yml", + "depNameTemplate": "aquasecurity/tfsec", + "matchStrings": ["TFSEC_VERSION=\"(?.*?)\""], + "datasourceTemplate": "github-releases" + }, + { + "customType": "regex", + "fileMatch": ".github/workflows/pre-commit.yml", + "depNameTemplate": "terraform-linters/tflint", + "matchStrings": ["TFLINT_VERSION=\"(?.*?)\""], + "datasourceTemplate": "github-releases" + }, + { + "customType": "regex", + "fileMatch": ".github/workflows/pre-commit.yml", + "depNameTemplate": "norwoodj/helm-docs", + "matchStrings": ["HELM_DOCS_VERSION=\"(?.*?)\""], + "datasourceTemplate": "github-releases" + }, + { + "customType": "regex", + "fileMatch": "aws/k8s-aws-alb-script.sh", + "depNameTemplate": "kubernetes-sigs/aws-alb-ingress-controller", + "matchStrings": ["LBC_VERSION=\"(?.*?)\""], + "datasourceTemplate": "github-releases" + } + ], + "packageRules": [ + { + "groupName": "eslint", + "enabled": true, + "matchPackageNames": ["/^eslint/"] + }, + { + "groupName": "go", + "matchDatasources": ["go"], + "enabled": true + }, + { + "groupName": "pre-commit", + "matchFileNames": [".pre-commit-config.yaml"], + "enabled": true + }, + { + "groupName": "terraform-aws", + "matchDatasources": ["terraform-provider", "terraform-module"], + "enabled": true, + "matchPackageNames": ["/aws/", "/terraform-aws-modules/.*/"] + }, + { + "groupName": "terraform-azure", + "matchDatasources": ["terraform-provider", "terraform-module"], + "enabled": true, + "matchPackageNames": ["/azurerm/"] + }, + { + "groupName": "terraform-gcp", + "matchDatasources": ["terraform-provider", "terraform-module"], + "enabled": true, + "matchPackageNames": ["/google/", "/google-beta/"] + } + ] }