From 8d47cdd8ab429bf893192e0fec74885e9d7c04a4 Mon Sep 17 00:00:00 2001
From: Andrew Peabody <andrewpeabody@google.com>
Date: Wed, 4 Oct 2023 16:29:06 +0000
Subject: [PATCH] chore: centralize repo renovate config

---
 infra/terraform/test-org/github/protection.tf                | 4 ++--
 .../test-org/github/resources/renovate-repo-config.json      | 4 ++++
 infra/terraform/test-org/github/resources/renovate.json      | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 infra/terraform/test-org/github/resources/renovate-repo-config.json

diff --git a/infra/terraform/test-org/github/protection.tf b/infra/terraform/test-org/github/protection.tf
index 97c9e789cbe..ef4a110c562 100644
--- a/infra/terraform/test-org/github/protection.tf
+++ b/infra/terraform/test-org/github/protection.tf
@@ -63,7 +63,7 @@ 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 }
 }
 
@@ -71,7 +71,7 @@ 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
new file mode 100644
index 00000000000..715e64bdeec
--- /dev/null
+++ 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
index 96668148b9a..9a2cf894cd7 100644
--- 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": [