From 7002eb61e70809494b628d92177633d79e82eefa Mon Sep 17 00:00:00 2001
From: Matt Gowie <matt@masterpoint.io>
Date: Sun, 22 Dec 2024 22:51:31 -0500
Subject: [PATCH] chore: allow renovate to automerge if not major version rev

---
 .github/renovate.json5                                     | 5 +++++
 README.md                                                  | 2 +-
 .../root-modules/rds-cluster-dev/versions.tf               | 7 ++++++-
 .../root-modules/rds-cluster-prod/versions.tf              | 7 ++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index a485de5..a53184a 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -8,6 +8,11 @@
   "baseBranches": ["main", "master"],
   "labels": ["auto-upgrade"],
   "dependencyDashboardAutoclose": true,
+  "packageRules": [{
+      // Allow auto merge if it's not a major version update
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "automerge": true
+  }],
   "terraform": {
     "ignorePaths": [
       "**/context.tf",
diff --git a/README.md b/README.md
index 610968d..c6e36d8 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ Check out an example configuration in the [examples/complete](./examples/complet
 
 <!-- NOTE to Masterpoint team: We might want to create a small wrapper to automatize this using Taskit. On hold for now. -->
 
-### What goes in a Stack config file? e.g. `stacks/dev.yaml`, `stacks/common.yaml`, `stack.yaml`, etc.
+### What goes in a Stack config file? e.g. `stacks/dev.yaml`, `stacks/common.yaml`, `stack.yaml`, etc
 
 Most settings that you would set on [the Spacelift Stack resource](https://search.opentofu.org/provider/spacelift-io/spacelift/latest/docs/resources/stack) are supported. Additionally, you can include certain Stack specific settings that will override this module's defaults like `default_tf_workspace_enabled`, `tfvars.enabled`, and similar. See the code for full details.
 
diff --git a/examples/single-instance/root-modules/rds-cluster-dev/versions.tf b/examples/single-instance/root-modules/rds-cluster-dev/versions.tf
index 6a1426f..b1b0cc3 100644
--- a/examples/single-instance/root-modules/rds-cluster-dev/versions.tf
+++ b/examples/single-instance/root-modules/rds-cluster-dev/versions.tf
@@ -1,5 +1,10 @@
 terraform {
   required_version = "~> 1.0.0"
 
-  required_providers {}
+  required_providers {
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 3.0"
+    }
+  }
 }
diff --git a/examples/single-instance/root-modules/rds-cluster-prod/versions.tf b/examples/single-instance/root-modules/rds-cluster-prod/versions.tf
index 6a1426f..b1b0cc3 100644
--- a/examples/single-instance/root-modules/rds-cluster-prod/versions.tf
+++ b/examples/single-instance/root-modules/rds-cluster-prod/versions.tf
@@ -1,5 +1,10 @@
 terraform {
   required_version = "~> 1.0.0"
 
-  required_providers {}
+  required_providers {
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 3.0"
+    }
+  }
 }