From cc2e96a5585a0eec597a15493ee6b4b9cda90d19 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 2 Jul 2025 14:58:34 -0700
Subject: [PATCH] update openapi specs

---
 pkg/registry/apis/query/connections.go        |  2 +
 .../advisor.grafana.app-v0alpha1.json         | 20 -------
 .../folder.grafana.app-v1beta1.json           | 25 --------
 .../iam.grafana.app-v0alpha1.json             | 60 -------------------
 .../investigations.grafana.app-v0alpha1.json  | 20 -------
 ...cations.alerting.grafana.app-v0alpha1.json | 40 -------------
 .../playlist.grafana.app-v0alpha1.json        | 10 ----
 .../provisioning.grafana.app-v0alpha1.json    | 40 -------------
 8 files changed, 2 insertions(+), 215 deletions(-)

diff --git a/pkg/registry/apis/query/connections.go b/pkg/registry/apis/query/connections.go
index 0bf8533613f..89886d9b407 100644
--- a/pkg/registry/apis/query/connections.go
+++ b/pkg/registry/apis/query/connections.go
@@ -25,6 +25,8 @@ var (
 	_ rest.Storage              = (*connectionAccess)(nil)
 )
 
+// Get all datasource connections -- this will be backed by search or duplicated resource in unified storage
+// TODO: name vs uid?  name accross all groups not unique!  must be different... use labels?
 type DataSourceConnectionProvider interface {
 	// Get gets a specific datasource (that the user in context can see)
 	GetConnection(ctx context.Context, namespace string, name string) (*queryV0.DataSourceConnection, error)
diff --git a/pkg/tests/apis/openapi_snapshots/advisor.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/advisor.grafana.app-v0alpha1.json
index 1fb2aa6d751..7ef15e8f82b 100644
--- a/pkg/tests/apis/openapi_snapshots/advisor.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/advisor.grafana.app-v0alpha1.json
@@ -1740,11 +1740,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "advisor.grafana.app",
-            "kind": "Check",
-            "version": "__internal"
-          },
           {
             "group": "advisor.grafana.app",
             "kind": "Check",
@@ -1807,11 +1802,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "advisor.grafana.app",
-            "kind": "CheckList",
-            "version": "__internal"
-          },
           {
             "group": "advisor.grafana.app",
             "kind": "CheckList",
@@ -1957,11 +1947,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "advisor.grafana.app",
-            "kind": "CheckType",
-            "version": "__internal"
-          },
           {
             "group": "advisor.grafana.app",
             "kind": "CheckType",
@@ -2005,11 +1990,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "advisor.grafana.app",
-            "kind": "CheckTypeList",
-            "version": "__internal"
-          },
           {
             "group": "advisor.grafana.app",
             "kind": "CheckTypeList",
diff --git a/pkg/tests/apis/openapi_snapshots/folder.grafana.app-v1beta1.json b/pkg/tests/apis/openapi_snapshots/folder.grafana.app-v1beta1.json
index fe18767f3f3..653549d0bdb 100644
--- a/pkg/tests/apis/openapi_snapshots/folder.grafana.app-v1beta1.json
+++ b/pkg/tests/apis/openapi_snapshots/folder.grafana.app-v1beta1.json
@@ -1043,11 +1043,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "folder.grafana.app",
-            "kind": "DescendantCounts",
-            "version": "__internal"
-          },
           {
             "group": "folder.grafana.app",
             "kind": "DescendantCounts",
@@ -1098,11 +1093,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "folder.grafana.app",
-            "kind": "Folder",
-            "version": "__internal"
-          },
           {
             "group": "folder.grafana.app",
             "kind": "Folder",
@@ -1146,11 +1136,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "folder.grafana.app",
-            "kind": "FolderAccessInfo",
-            "version": "__internal"
-          },
           {
             "group": "folder.grafana.app",
             "kind": "FolderAccessInfo",
@@ -1230,11 +1215,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "folder.grafana.app",
-            "kind": "FolderInfoList",
-            "version": "__internal"
-          },
           {
             "group": "folder.grafana.app",
             "kind": "FolderInfoList",
@@ -1278,11 +1258,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "folder.grafana.app",
-            "kind": "FolderList",
-            "version": "__internal"
-          },
           {
             "group": "folder.grafana.app",
             "kind": "FolderList",
diff --git a/pkg/tests/apis/openapi_snapshots/iam.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/iam.grafana.app-v0alpha1.json
index ae580b54a56..3d70923422a 100644
--- a/pkg/tests/apis/openapi_snapshots/iam.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/iam.grafana.app-v0alpha1.json
@@ -1824,11 +1824,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "SSOSetting",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "SSOSetting",
@@ -1871,11 +1866,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "SSOSettingList",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "SSOSettingList",
@@ -1934,11 +1924,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "ServiceAccount",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "ServiceAccount",
@@ -1981,11 +1966,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "ServiceAccountList",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "ServiceAccountList",
@@ -2075,11 +2055,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "Team",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "Team",
@@ -2116,11 +2091,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "TeamBinding",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "TeamBinding",
@@ -2163,11 +2133,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "TeamBindingList",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "TeamBindingList",
@@ -2234,11 +2199,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "TeamList",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "TeamList",
@@ -2324,11 +2284,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "TeamMemberList",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "TeamMemberList",
@@ -2410,11 +2365,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "User",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "User",
@@ -2457,11 +2407,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "UserList",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "UserList",
@@ -2548,11 +2493,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "iam.grafana.app",
-            "kind": "UserTeamList",
-            "version": "__internal"
-          },
           {
             "group": "iam.grafana.app",
             "kind": "UserTeamList",
diff --git a/pkg/tests/apis/openapi_snapshots/investigations.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/investigations.grafana.app-v0alpha1.json
index c768321d510..017323b2a1e 100644
--- a/pkg/tests/apis/openapi_snapshots/investigations.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/investigations.grafana.app-v0alpha1.json
@@ -1741,11 +1741,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "investigations.grafana.app",
-            "kind": "Investigation",
-            "version": "__internal"
-          },
           {
             "group": "investigations.grafana.app",
             "kind": "Investigation",
@@ -1892,11 +1887,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "investigations.grafana.app",
-            "kind": "InvestigationIndex",
-            "version": "__internal"
-          },
           {
             "group": "investigations.grafana.app",
             "kind": "InvestigationIndex",
@@ -2031,11 +2021,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "investigations.grafana.app",
-            "kind": "InvestigationIndexList",
-            "version": "__internal"
-          },
           {
             "group": "investigations.grafana.app",
             "kind": "InvestigationIndexList",
@@ -2218,11 +2203,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "investigations.grafana.app",
-            "kind": "InvestigationList",
-            "version": "__internal"
-          },
           {
             "group": "investigations.grafana.app",
             "kind": "InvestigationList",
diff --git a/pkg/tests/apis/openapi_snapshots/notifications.alerting.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/notifications.alerting.grafana.app-v0alpha1.json
index c2668e45ba6..569369c3733 100644
--- a/pkg/tests/apis/openapi_snapshots/notifications.alerting.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/notifications.alerting.grafana.app-v0alpha1.json
@@ -3401,11 +3401,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "Receiver",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "Receiver",
@@ -3481,11 +3476,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "ReceiverList",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "ReceiverList",
@@ -3614,11 +3604,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "RoutingTree",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "RoutingTree",
@@ -3662,11 +3647,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "RoutingTreeList",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "RoutingTreeList",
@@ -3916,11 +3896,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "TemplateGroup",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "TemplateGroup",
@@ -3964,11 +3939,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "TemplateGroupList",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "TemplateGroupList",
@@ -4090,11 +4060,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "TimeInterval",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "TimeInterval",
@@ -4185,11 +4150,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "notifications.alerting.grafana.app",
-            "kind": "TimeIntervalList",
-            "version": "__internal"
-          },
           {
             "group": "notifications.alerting.grafana.app",
             "kind": "TimeIntervalList",
diff --git a/pkg/tests/apis/openapi_snapshots/playlist.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/playlist.grafana.app-v0alpha1.json
index 2926b4997ef..a5fe373b77a 100644
--- a/pkg/tests/apis/openapi_snapshots/playlist.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/playlist.grafana.app-v0alpha1.json
@@ -911,11 +911,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "playlist.grafana.app",
-            "kind": "Playlist",
-            "version": "__internal"
-          },
           {
             "group": "playlist.grafana.app",
             "kind": "Playlist",
@@ -978,11 +973,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "playlist.grafana.app",
-            "kind": "PlaylistList",
-            "version": "__internal"
-          },
           {
             "group": "playlist.grafana.app",
             "kind": "PlaylistList",
diff --git a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
index f55b3f751ca..8079e4bf0b4 100644
--- a/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
+++ b/pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json
@@ -2776,11 +2776,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "Job",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "Job",
@@ -2823,11 +2818,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "JobList",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "JobList",
@@ -3085,11 +3075,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "Repository",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "Repository",
@@ -3133,11 +3118,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "RepositoryList",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "RepositoryList",
@@ -3426,11 +3406,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "ResourceList",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "ResourceList",
@@ -3737,11 +3712,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "ResourceWrapper",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "ResourceWrapper",
@@ -3887,11 +3857,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "TestResults",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "TestResults",
@@ -3929,11 +3894,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "provisioning.grafana.app",
-            "kind": "WebhookResponse",
-            "version": "__internal"
-          },
           {
             "group": "provisioning.grafana.app",
             "kind": "WebhookResponse",