From a51c69880edf43112d97b6e4466cabd83ff0c3fe Mon Sep 17 00:00:00 2001
From: yukin01 <38382781+yukin01@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:55:31 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20atlantis.json=20=E3=82=92?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=A8=E3=81=99?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 atlantis.json              |  9 +++++-
 terraformWithAtlantis.json | 63 --------------------------------------
 2 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 terraformWithAtlantis.json

diff --git a/atlantis.json b/atlantis.json
index 978476b..64485cd 100644
--- a/atlantis.json
+++ b/atlantis.json
@@ -4,5 +4,12 @@
     "github>globis-org/renovate-config:terraform"
   ],
   "prHourlyLimit": 1,
-  "rebaseWhen": "never"
+  "rebaseWhen": "never",
+  "packageRules": [
+    {
+      "matchManagers": ["terraform"],
+      "matchDepTypes": ["required_version"],
+      "allowedVersions": "<=1.8.1"
+    }
+  ]
 }
diff --git a/terraformWithAtlantis.json b/terraformWithAtlantis.json
deleted file mode 100644
index 3ac982c..0000000
--- a/terraformWithAtlantis.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "rebaseWhen": "never",
-  "prHourlyLimit": 1,
-  "packageRules": [
-    {
-      "matchManagers": [
-        "terraform"
-      ],
-      "matchPackagePatterns": [
-        "^app.terraform.io/gdp-sre",
-      ],
-      "enabled": false
-    },
-    {
-      "matchManagers": [
-        "terraform"
-      ],
-      "matchDepTypes": [
-        "helm_release"
-      ],
-      "enabled": false
-    },
-    {
-      "matchManagers": [
-        "terraform"
-      ],
-      "matchDepTypes": [
-        "required_version"
-      ],
-      "allowedVersions": "<=1.8.1"
-    },
-    {
-      "matchManagers": [
-        "terraform"
-      ],
-      "additionalBranchPrefix": "{{packageFileDir}}-",
-      "commitMessageSuffix": "({{packageFileDir}})",
-      "groupName": "terraform state",
-      "groupSlug": "tfstate",
-      "automerge": true,
-      "major": {
-        "automerge": false
-      }
-    },
-    {
-      "matchManagers": [
-        "terraform"
-      ],
-      "additionalBranchPrefix": "{{packageFileDir}}-",
-      "commitMessageSuffix": "({{packageFileDir}})",
-      "description": "terraform local modules",
-      "groupName": "terraform modules",
-      "groupSlug": "tfmodules",
-      "matchFileNames": ["**/modules/**"],
-      "automerge": true,
-      "major": {
-        "automerge": false
-      },
-      "rangeStrategy": "auto"
-    }
-  ]
-}

From 2ee5ce366fde7a28a978cce9ee93e772071c5339 Mon Sep 17 00:00:00 2001
From: yukin01 <38382781+yukin01@users.noreply.github.com>
Date: Fri, 26 Jul 2024 18:05:55 +0900
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20base=20->=20recommended=20?=
 =?UTF-8?q?=E3=81=AB=E3=83=AA=E3=83=8D=E3=83=BC=E3=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sre.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sre.json b/sre.json
index 7723276..5342101 100644
--- a/sre.json
+++ b/sre.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     "github>globis-org/renovate-config:pinGitHubActions"
   ],
   "timezone": "Asia/Tokyo",