diff --git a/infra/terraform/test-org/github/protection.tf b/infra/terraform/test-org/github/protection.tf index 2ac7274ae4e..c2d6365e97d 100644 --- a/infra/terraform/test-org/github/protection.tf +++ b/infra/terraform/test-org/github/protection.tf @@ -65,9 +65,10 @@ module "branch_protection_gcp" { providers = { github = github.gcp } } +// terraform-example-foundation renovate is a special case module "renovate_json_tgm" { source = "../../modules/repo_file" - repo_list = module.repos_tgm.repos + repo_list = { for k, v in module.repos_tgm.repos : k => v if k != "terraform-example-foundation" } filename = ".github/renovate.json" content = file("${path.module}/resources/renovate-repo-config.json") providers = { github = github } diff --git a/infra/terraform/test-org/github/resources/renovate.json b/infra/terraform/test-org/github/resources/renovate.json index e3d163cf3c0..04a993b2713 100644 --- a/infra/terraform/test-org/github/resources/renovate.json +++ b/infra/terraform/test-org/github/resources/renovate.json @@ -11,16 +11,16 @@ "labels": ["dependencies"], "vulnerabilityAlerts": { "labels": ["type:security"], - "minimumReleaseAge": null + "minimumReleaseAge": "0 days" }, "constraints": {"go": "1.21"}, "packageRules": [ { - "matchFileNames": ["examples/**", "test/**", ".github/**", "infra/**"], + "matchFileNames": ["examples/**", "test/**", ".github/**", "infra/**", "Makefile"], "commitMessagePrefix": "chore(deps):" }, { - "matchFileNames": ["*", "modules/**"], + "matchFileNames": ["*", "modules/**", "!Makefile"], "commitMessagePrefix": "fix(deps):" }, { @@ -29,15 +29,17 @@ "commitMessagePrefix": "fix(deps)!:" }, { + "matchManagers": ["terraform"], "matchDepTypes": ["module"], "groupName": "terraform modules", "matchUpdateTypes": ["minor", "patch"] }, { - "matchDepTypes": ["require"], + "matchManagers": ["gomod"], "postUpdateOptions": ["gomodTidy"] }, { + "matchManagers": ["gomod"], "matchDatasources": ["golang-version"], "rangeStrategy": "replace", "allowedVersions": "1.21", @@ -45,10 +47,10 @@ }, { "matchManagers": ["regex", "gomod"], - "groupName": "go modules and/or dev-tools", - "additionalBranchPrefix": "{{parentDir}}-" + "groupName": "go modules and/or dev-tools" }, { + "matchManagers": ["terraform"], "matchDepNames": ["google", "google-beta"], "groupName": "Terraform Google Provider", "rangeStrategy": "widen",