From b328e30c69016390a0898324cb5d8369b5c944aa Mon Sep 17 00:00:00 2001
From: krrrr38 <k.kaizu38@gmail.com>
Date: Sun, 18 Dec 2022 16:58:15 +0900
Subject: [PATCH] review feedback

- remove dependabot file
- revert testdrive/utils.go terraformVersion
- separate conftest upgrade process
---
 .github/dependabot.yml                   | 22 ---------------
 renovate.json5 => .github/renovate.json5 | 34 +++++++++++++++++++++++-
 testdrive/utils.go                       |  2 +-
 3 files changed, 34 insertions(+), 24 deletions(-)
 delete mode 100644 .github/dependabot.yml
 rename renovate.json5 => .github/renovate.json5 (59%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index f624e4dec6..0000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,22 +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/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
diff --git a/renovate.json5 b/.github/renovate.json5
similarity index 59%
rename from renovate.json5
rename to .github/renovate.json5
index d19cc89e57..960d591256 100644
--- a/renovate.json5
+++ b/.github/renovate.json5
@@ -1,11 +1,43 @@
 {
   extends: [
     "config:base",
-    ":disableRateLimiting",
+    "schedule:earlyMondays"
   ],
   automerge: false,
   platformAutomerge: false,
+  labels: ["dependencies"],
   postUpdateOptions: ["gomodTidy", "yarnDedupeHighest"],
+  prHourlyLimit: 0,
+  prConcurrentLimit: 5,
+  packageRules: [
+    // e2e test depends on testing/Dockefile testing-image which has conftest specific version.
+    // to upgrade conftest versions, we need following PRs.
+    // 1. update testing/Dockerfile conftest version
+    // 2. update testing-env tag
+    // 3. update e2e conftest version
+    // this settings allow to create only testing/Dockefile contest version update PR which uses branch prefix.
+    {
+      matchPaths: ["testing/**"],
+      matchPackagePatterns: ["conftest"],
+      additionalBranchPrefix: "{{baseDir}}-",
+      groupName: "conftest-testing",
+      prBodyNotes: [
+        ":warning: You need to upgrade testing-env conftest firstly, then upgrade other conftest versions for e2e :warning:",
+      ],
+    },
+    {
+      ignorePaths: ["testing/**"],
+      matchPackagePatterns: ["github-actions"],
+      groupName: "github-",
+    },
+    {
+      // we need to upgrade testing-env on ci quickly
+      matchPaths: [".github/**"],
+      matchPackageNames: ["ghcr.io/runatlantis/testing-env"],
+      groupName: "testing-env-ci-test",
+      schedules: ["every 1 hour after 00:00 and before 23:59 every day"],
+    },
+  ],
   // https://docs.renovatebot.com/modules/manager/regex/
   regexManagers: [
     {
diff --git a/testdrive/utils.go b/testdrive/utils.go
index 921f129b9b..2bcd210bfc 100644
--- a/testdrive/utils.go
+++ b/testdrive/utils.go
@@ -34,7 +34,7 @@ import (
 )
 
 const hashicorpReleasesURL = "https://releases.hashicorp.com"
-const terraformVersion = "1.3.6" // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
+const terraformVersion = "1.3.5" // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
 const ngrokDownloadURL = "https://bin.equinox.io/c/4VmDzA7iaHb"
 const ngrokAPIURL = "localhost:41414" // We hope this isn't used.
 const atlantisPort = 4141