From 61b78a7b2e7e6cb5c544427a116a7b8a1724ec20 Mon Sep 17 00:00:00 2001
From: Graham Davison <gdavison@hashicorp.com>
Date: Fri, 7 Jul 2023 10:41:05 -0700
Subject: [PATCH 1/3] Reorders `directory` and `package-ecosystem` for
 readability when collapsed and adds spacing

---
 .github/dependabot.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 51eef7ffa24f..8b4ae8017cfd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,11 +1,12 @@
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - directory: "/"
+    package-ecosystem: "github-actions"
     schedule:
       interval: "daily"
-  - package-ecosystem: "gomod"
-    directory: "/"
+
+  - directory: "/"
+    package-ecosystem: "gomod"
     groups:
       aws-sdk-go:
         patterns:
@@ -25,28 +26,32 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 30
-  - package-ecosystem: "gomod"
-    directory: "/.ci/providerlint"
+
+  - directory: "/.ci/providerlint"
+    package-ecosystem: "gomod"
     ignore:
       - dependency-name: "golang.org/x/tools"
       - dependency-name: "google.golang.org/grpc"
     schedule:
       interval: "daily"
-  - package-ecosystem: "gomod"
-    directory: "/.ci/tools"
+
+  - directory: "/.ci/tools"
+    package-ecosystem: "gomod"
     ignore:
       - dependency-name: "golang.org/x/tools"
       - dependency-name: "google.golang.org/grpc"
     schedule:
       interval: "daily"
-  - package-ecosystem: "gomod"
-    directory: "/skaff"
+
+  - directory: "/skaff"
+    package-ecosystem: "gomod"
     ignore:
       - dependency-name: "golang.org/x/tools"
       - dependency-name: "google.golang.org/grpc"
     schedule:
       interval: "daily"
-  - package-ecosystem: "terraform"
-    directory: "/infrastructure/repository"
+
+  - directory: "/infrastructure/repository"
+    package-ecosystem: "terraform"
     schedule:
       interval: "daily"

From f295c6ca577f1576a848374617bb8acc9bf7b12e Mon Sep 17 00:00:00 2001
From: Graham Davison <gdavison@hashicorp.com>
Date: Fri, 7 Jul 2023 12:30:59 -0700
Subject: [PATCH 2/3] Includes all `aws-sdk-go-v2` modules in `aws-sdk-go`
 group, not just services

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8b4ae8017cfd..0f96b42ce3ca 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,7 +11,7 @@ updates:
       aws-sdk-go:
         patterns:
           - "github.com/aws/aws-sdk-go"
-          - "github.com/aws/aws-sdk-go-v2/service/*"
+          - "github.com/aws/aws-sdk-go-v2/*"
     ignore:
       # hcl/v2 should only be updated via terraform-plugin-sdk
       - dependency-name: "github.com/hashicorp/hcl/v2"

From 2778df02f05cdc2e3e500a85bdc6bb3f7a07fb10 Mon Sep 17 00:00:00 2001
From: Graham Davison <gdavison@hashicorp.com>
Date: Fri, 7 Jul 2023 12:31:32 -0700
Subject: [PATCH 3/3] Groups `aws-sdk-go-base` and `awsv1shim` modules together

---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0f96b42ce3ca..7ed9312698d2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,6 +12,10 @@ updates:
         patterns:
           - "github.com/aws/aws-sdk-go"
           - "github.com/aws/aws-sdk-go-v2/*"
+      aws-sdk-go-base:
+        patterns:
+          - "github.com/hashicorp/aws-sdk-go-base/v2"
+          - "github.com/hashicorp/aws-sdk-go-base/v2/*"
     ignore:
       # hcl/v2 should only be updated via terraform-plugin-sdk
       - dependency-name: "github.com/hashicorp/hcl/v2"