Dashboards: Add apiVersion to dashboard table (#100845)

pkg/tests/apis/dashboard/dashboards_test.go

@@ -9,12 +9,18 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/dynamic"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tests/apis"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
 	"github.com/grafana/grafana/pkg/tests/testsuite"
+
+	dashboardV0 "github.com/grafana/grafana/pkg/apis/dashboard/v0alpha1"
+	dashboardV1 "github.com/grafana/grafana/pkg/apis/dashboard/v1alpha1"
+	dashboardV2 "github.com/grafana/grafana/pkg/apis/dashboard/v2alpha1"
 )
 
 func TestMain(m *testing.M) {
@@ -40,6 +46,8 @@ func runDashboardTest(t *testing.T, helper *apis.K8sTestHelper, gvr schema.Group
 			},
 		}
 		obj.SetGenerateName("aa")
+		obj.SetAPIVersion(gvr.GroupVersion().String())
+		obj.SetKind("Dashboard")
 		obj, err = client.Resource.Create(ctx, obj, metav1.CreateOptions{})
 		require.NoError(t, err)
 		created := obj.GetName()
@@ -241,3 +249,93 @@ func TestIntegrationDashboardsAppV1Alpha1(t *testing.T) {
 		runDashboardTest(t, helper, gvr)
 	})
 }
+
+func TestIntegrationLegacySupport(t *testing.T) {
+	ctx := context.Background()
+	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
+		EnableFeatureToggles: []string{
+			// NOTE: when using this feature toggle, the read is always v0!
+			// featuremgmt.FlagKubernetesClientDashboardsFolders
+		},
+	})
+
+	clientV0 := helper.GetResourceClient(apis.ResourceClientArgs{
+		User: helper.Org1.Admin,
+		GVR:  dashboardV0.DashboardResourceInfo.GroupVersionResource(),
+	})
+	obj, err := clientV0.Resource.Create(ctx,
+		helper.LoadYAMLOrJSONFile("testdata/dashboard-test-v0.yaml"),
+		metav1.CreateOptions{},
+	)
+	require.NoError(t, err)
+	require.Equal(t, "test-v0", obj.GetName())
+
+	clientV1 := helper.GetResourceClient(apis.ResourceClientArgs{
+		User: helper.Org1.Admin,
+		GVR:  dashboardV1.DashboardResourceInfo.GroupVersionResource(),
+	})
+	obj, err = clientV1.Resource.Create(ctx,
+		helper.LoadYAMLOrJSONFile("testdata/dashboard-test-v1.yaml"),
+		metav1.CreateOptions{},
+	)
+	require.NoError(t, err)
+	require.Equal(t, "test-v1", obj.GetName())
+
+	clientV2 := helper.GetResourceClient(apis.ResourceClientArgs{
+		User: helper.Org1.Admin,
+		GVR:  dashboardV2.DashboardResourceInfo.GroupVersionResource(),
+	})
+	obj, err = clientV2.Resource.Create(ctx,
+		helper.LoadYAMLOrJSONFile("testdata/dashboard-test-v2.yaml"),
+		metav1.CreateOptions{},
+	)
+	require.NoError(t, err)
+	require.Equal(t, "test-v2", obj.GetName())
+
+	//---------------------------------------------------------
+	// Now check that we can get each dashboard with any API
+	//---------------------------------------------------------
+	names := []string{"test-v0", "test-v1", "test-v2"}
+	clients := []dynamic.ResourceInterface{
+		clientV0.Resource,
+		clientV1.Resource,
+		clientV2.Resource,
+	}
+	for _, name := range names {
+		for _, client := range clients {
+			obj, err := client.Get(ctx, name, metav1.GetOptions{})
+			require.NoError(t, err)
+			require.Equal(t, name, obj.GetName())
+
+			// Can get the same thing with the /dto endpoint
+			obj, err = client.Get(ctx, name, metav1.GetOptions{}, "dto")
+			require.NoError(t, err)
+			require.Equal(t, name, obj.GetName())
+		}
+	}
+
+	//---------------------------------------------------------
+	// Check that the legacy APIs return the correct apiVersion
+	//---------------------------------------------------------
+
+	rsp := apis.DoRequest(helper, apis.RequestParams{
+		User: helper.Org1.Admin,
+		Path: "/api/dashboards/uid/test-v0",
+	}, &dtos.DashboardFullWithMeta{})
+	require.Equal(t, 200, rsp.Response.StatusCode)
+	require.Equal(t, "v0alpha1", rsp.Result.Meta.APIVersion)
+
+	rsp = apis.DoRequest(helper, apis.RequestParams{
+		User: helper.Org1.Admin,
+		Path: "/api/dashboards/uid/test-v1",
+	}, &dtos.DashboardFullWithMeta{})
+	require.Equal(t, 200, rsp.Response.StatusCode)
+	require.Equal(t, "v1alpha1", rsp.Result.Meta.APIVersion)
+
+	// V2 should send a redirect
+	rsp = apis.DoRequest(helper, apis.RequestParams{
+		User: helper.Org1.Admin,
+		Path: "/api/dashboards/uid/test-v2",
+	}, &dtos.DashboardFullWithMeta{})
+	require.Equal(t, 302, rsp.Response.StatusCode) // redirect
+}

pkg/tests/apis/dashboard/testdata/dashboard-test-v0.yaml

@@ -1,6 +1,6 @@
 apiVersion: dashboard.grafana.app/v0alpha1
 kind: Dashboard
 metadata:
-  name: test
+  name: test-v0
 spec:
-  title: Test dashboard (apply from k8s; PATCH) X
+  title: Test dashboard. Created at v0

pkg/tests/apis/dashboard/testdata/dashboard-test-v1.yaml

@@ -0,0 +1,6 @@
+apiVersion: dashboard.grafana.app/v1alpha1
+kind: Dashboard
+metadata:
+  name: test-v1
+spec:
+  title: Test dashboard. Created at v1 XXX

pkg/tests/apis/dashboard/testdata/dashboard-test-v2.yaml

@@ -0,0 +1,6 @@
+apiVersion: dashboard.grafana.app/v2alpha1
+kind: Dashboard
+metadata:
+  name: test-v2
+spec:
+  title: Test dashboard. Created at v2