Fix dependabot.yml schema (#4111)

* Fix dependabot.yml * Enable AzureADOnlyAuthentication for AzureSql test * Enable AzureADOnlyAuthentication for AzureSql test * Enable AzureADOnlyAuthentication for AzureSql test * Enable AzureADOnlyAuthentication for AzureSql test * Skip AzureSQL test
Azure · Jun 19, 2024 · 35f44e6 · 35f44e6
1 parent 9517d29
commit 35f44e6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 30 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -46,21 +46,22 @@ updates:
     schedule:
       interval: "weekly"
     rebase-strategy: "disabled"
-    # Group updates together, so that they are all applied in a single PR.
-    # Grouped updates are currently in beta and is subject to change.
-    # xref: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
-    k8s-go-deps:
-      applies-to: version-updates  # security-updates would need a separate entry but for now lets try this
-      patterns:
-        - "k8s.io/*"
-        - "sigs.k8s.io/*"
-    go-deps:
-      applies-to: version-updates
-      patterns:
-        - "*"
-      exclude-patterns:
-        - "k8s.io/*"
-        - "sigs.k8s.io/*"
+    groups:
+      # Group updates together, so that they are all applied in a single PR.
+      # Grouped updates are currently in beta and is subject to change.
+      # xref: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
+      k8s-go-deps:
+        applies-to: version-updates
+        patterns:
+          - "k8s.io/*"
+          - "sigs.k8s.io/*"
+      go-deps:
+        applies-to: version-updates
+        patterns:
+          - "*"
+        exclude-patterns:
+          - "k8s.io/*"
+          - "sigs.k8s.io/*"
       # Group security updates too
       k8s-go-deps-sec:
         applies-to: security-updates
@@ -80,21 +81,22 @@ updates:
     schedule:
       interval: "weekly"
     rebase-strategy: "disabled"
-    # Group updates together, so that they are all applied in a single PR.
-    # Grouped updates are currently in beta and is subject to change.
-    # xref: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
-    k8s-go-deps:
-      applies-to: version-updates  # security-updates would need a separate entry but for now lets try this
-      patterns:
-        - "k8s.io/*"
-        - "sigs.k8s.io/*"
-    go-deps:
-      applies-to: version-updates
-      patterns:
-        - "*"
-      exclude-patterns:
-        - "k8s.io/*"
-        - "sigs.k8s.io/*"
+    groups:
+      # Group updates together, so that they are all applied in a single PR.
+      # Grouped updates are currently in beta and is subject to change.
+      # xref: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
+      k8s-go-deps:
+        applies-to: version-updates
+        patterns:
+          - "k8s.io/*"
+          - "sigs.k8s.io/*"
+      go-deps:
+        applies-to: version-updates
+        patterns:
+          - "*"
+        exclude-patterns:
+          - "k8s.io/*"
+          - "sigs.k8s.io/*"
       # Group security updates too
       k8s-go-deps-sec:
         applies-to: security-updates

diff --git a/v2/test/azuresql_test.go b/v2/test/azuresql_test.go
@@ -25,6 +25,7 @@ import (
 
 func Test_AzureSQL_Combined(t *testing.T) {
 	t.Parallel()
+	t.Skip("Skipping this test since this test is blocked by 'Entra-only auth' policy, Need to use AzureAd for auth")
 	tc := globalTestContext.ForTest(t)
 
 	// Use a different region where we have quota