Revert: DataSource: Support config CRUD from apiservers (#106996) (#110342)

Revert "DataSource: Support config CRUD from apiservers (#106996)"

This reverts commit eda94a6434.

pkg/tests/apis/datasource/testdata_test.go

@@ -2,16 +2,13 @@ package dashboards
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tests/apis"
@@ -41,58 +38,97 @@ func TestIntegrationTestDatasource(t *testing.T) {
 		Type:  datasources.DS_TESTDATA,
 		UID:   "test",
 		OrgID: int64(1),
-
-		// These settings are not actually used, but testing that they get saved
-		Database: "testdb",
-		URL:      "http://fake.url",
-		Access:   datasources.DS_ACCESS_PROXY,
-		User:     "example",
-		ReadOnly: true,
-		JsonData: simplejson.NewFromAny(map[string]any{
-			"hello": "world",
-		}),
-		SecureJsonData: map[string]string{
-			"aaa": "AAA",
-			"bbb": "BBB",
-		},
 	})
 	require.Equal(t, "test", ds.UID)
 
-	t.Run("Admin configs", func(t *testing.T) {
-		client := helper.Org1.Admin.ResourceClient(t, schema.GroupVersionResource{
-			Group:    "testdata.datasource.grafana.app",
-			Version:  "v0alpha1",
-			Resource: "datasources",
-		}).Namespace("default")
-		ctx := context.Background()
+	t.Run("Check discovery client", func(t *testing.T) {
+		disco := helper.GetGroupVersionInfoJSON("testdata.datasource.grafana.app")
+		fmt.Printf("%s", disco)
 
-		list, err := client.List(ctx, metav1.ListOptions{})
-		require.NoError(t, err)
-		require.Len(t, list.Items, 1, "expected a single connection")
-		require.Equal(t, "test", list.Items[0].GetName(), "with the test uid")
-
-		spec, _, _ := unstructured.NestedMap(list.Items[0].Object, "spec")
-		jj, _ := json.MarshalIndent(spec, "", "  ")
-		fmt.Printf("%s\n", string(jj))
-		require.JSONEq(t, `{
-			"access": "proxy",
-			"database": "testdb",
-			"isDefault": true,
-			"jsonData": {
-				"hello": "world"
-			},
-			"readOnly": true,
-			"title": "test",
-			"url": "http://fake.url",
-			"user": "example"
-		}`, string(jj))
+		require.JSONEq(t, `[
+			{
+			  "freshness": "Current",
+			  "resources": [
+				{
+				  "resource": "connections",
+				  "responseKind": {
+					"group": "",
+					"kind": "DataSourceConnection",
+					"version": ""
+				  },
+				  "scope": "Namespaced",
+				  "shortNames": [
+					"grafana-testdata-datasource-connection"
+				  ],
+				  "singularResource": "connection",
+				  "subresources": [
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "HealthCheckResult",
+						"version": ""
+					  },
+					  "subresource": "health",
+					  "verbs": [
+						"get"
+					  ]
+					},
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "QueryDataResponse",
+						"version": ""
+					  },
+					  "subresource": "query",
+					  "verbs": [
+						"create"
+					  ]
+					},
+					{
+					  "responseKind": {
+						"group": "",
+						"kind": "Status",
+						"version": ""
+					  },
+					  "subresource": "resource",
+					  "verbs": [
+						"create",
+						"delete",
+						"get",
+						"patch",
+						"update"
+					  ]
+					}
+				  ],
+				  "verbs": [
+					"get",
+					"list"
+				  ]
+				},
+				{
+        			"resource": "queryconvert",
+        			"responseKind": {
+          				"group": "",
+          				"kind": "QueryDataRequest",
+          				"version": ""
+        			},
+        			"scope": "Namespaced",
+        			"singularResource": "queryconvert",
+        			"verbs": [
+          				"create"
+        			]
+   				}
+			  ],
+			  "version": "v0alpha1"
+			}
+		  ]`, disco)
 	})
 
 	t.Run("Call subresources", func(t *testing.T) {
 		client := helper.Org1.Admin.ResourceClient(t, schema.GroupVersionResource{
 			Group:    "testdata.datasource.grafana.app",
 			Version:  "v0alpha1",
-			Resource: "datasources",
+			Resource: "connections",
 		}).Namespace("default")
 		ctx := context.Background()
 
@@ -119,7 +155,7 @@ func TestIntegrationTestDatasource(t *testing.T) {
 		raw := apis.DoRequest[any](helper, apis.RequestParams{
 			User:   helper.Org1.Admin,
 			Method: "GET",
-			Path:   "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/default/datasources/test/resource",
+			Path:   "/apis/testdata.datasource.grafana.app/v0alpha1/namespaces/default/connections/test/resource",
 		}, nil)
 		require.Equal(t, `Hello world from test datasource!`, string(raw.Body))
 	})