chore: centralize repo renovate config

GoogleCloudPlatform · Oct 4, 2023 · 8d47cdd · 8d47cdd
1 parent 2e0b1e7
commit 8d47cdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/infra/terraform/test-org/github/protection.tf b/infra/terraform/test-org/github/protection.tf
@@ -63,15 +63,15 @@ module "renovate_json_tgm" {
   source    = "../../modules/repo_file"
   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.json")
+  content   = file("${path.module}/resources/renovate-repo-config.json")
   providers = { github = github }
 }
 
 module "renovate_json_gcp" {
   source    = "../../modules/repo_file"
   repo_list = module.repos_gcp.repos
   filename  = ".github/renovate.json"
-  content   = file("${path.module}/resources/renovate.json")
+  content   = file("${path.module}/resources/renovate-repo-config.json")
   providers = { github = github.gcp }
 }
 

diff --git a/infra/terraform/test-org/github/resources/renovate-repo-config.json b/infra/terraform/test-org/github/resources/renovate-repo-config.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["github>GoogleCloudPlatform/cloud-foundation-toolkit//infra/terraform/test-org/github/resources/renovate"]
+}
diff --git a/infra/terraform/test-org/github/resources/renovate.json b/infra/terraform/test-org/github/resources/renovate.json
@@ -16,7 +16,7 @@
   "constraints": {"go": "1.20"},
   "packageRules": [
     {
-      "matchFileNames": ["examples/**", "test/**", ".github/**"],
+      "matchFileNames": ["examples/**", "test/**", ".github/**", "infra/**"],
       "commitMessagePrefix": "chore(deps):"
     },
     {
@@ -42,7 +42,8 @@
     },
     {
       "matchDepNames": ["google", "google-beta"],
-      "groupName": "Terraform Google Provider"
+      "groupName": "Terraform Google Provider",
+      "rangeStrategy": "widen"
     }
   ],
   "regexManagers": [