public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ShortURL: Graduate api v1alpha1 to v1beta1 (#113597)

Browse Source
This commit is contained in:
Ezequiel Victorero
2025-11-10 07:29:33 -03:00
committed by GitHub
parent 834ff1be3c
commit cd91f858e6
34 changed files with 158 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/apis/shorturl/shorturl_test.go
+7 -7
View File
@@ -12,7 +12,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
shorturlV1 "github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1alpha1"
shorturlV1 "github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1beta1"
"github.com/grafana/grafana/pkg/api/dtos"
grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
"github.com/grafana/grafana/pkg/services/apiserver/options"
@@ -230,7 +230,7 @@ func doDualWriteTests(t *testing.T, helper *apis.K8sTestHelper, mode grafanarest
obj := apis.DoRequest(helper, apis.RequestParams{
User: client.Args.User,
Method: http.MethodPost,
Path: "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
Path: "/apis/shorturl.grafana.app/v1beta1/namespaces/default/shorturls",
Body: []byte(`{ "metadata": { "generateName": "test-" }, "spec": { "path": "d/xCmMwXdVz/k8s-dual-write" } }`),
}, &unstructured.Unstructured{})
require.NotNil(t, obj.Result)
@@ -266,7 +266,7 @@ func doDualWriteTests(t *testing.T, helper *apis.K8sTestHelper, mode grafanarest
obj := apis.DoRequest(helper, apis.RequestParams{
User: client.Args.User,
Method: http.MethodPost,
Path: "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
Path: "/apis/shorturl.grafana.app/v1beta1/namespaces/default/shorturls",
Body: []byte(`{ "metadata": { "generateName": "redirect-" }, "spec": { "path": "d/test/redirect" } }`),
}, &unstructured.Unstructured{})
require.NotNil(t, obj.Result)
@@ -319,7 +319,7 @@ func doUnifiedOnlyTests(t *testing.T, helper *apis.K8sTestHelper) {
obj := apis.DoRequest(helper, apis.RequestParams{
User: client.Args.User,
Method: http.MethodPost,
Path: "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
Path: "/apis/shorturl.grafana.app/v1beta1/namespaces/default/shorturls",
Body: []byte(`{ "metadata": { "generateName": "unified-" }, "spec": { "path": "d/xCmMwXdVz/unified-only" } }`),
}, &unstructured.Unstructured{})
require.NotNil(t, obj.Result)
@@ -381,7 +381,7 @@ func doUnifiedOnlyTests(t *testing.T, helper *apis.K8sTestHelper) {
response := apis.DoRequest(helper, apis.RequestParams{
User: client.Args.User,
Method: http.MethodPost,
Path: "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
Path: "/apis/shorturl.grafana.app/v1beta1/namespaces/default/shorturls",
Body: []byte(invalidBody),
}, (*unstructured.Unstructured)(nil))
@@ -418,7 +418,7 @@ func doUnifiedOnlyTests(t *testing.T, helper *apis.K8sTestHelper) {
response := apis.DoRequest(helper, apis.RequestParams{
User: client.Args.User,
Method: http.MethodPost,
Path: "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
Path: "/apis/shorturl.grafana.app/v1beta1/namespaces/default/shorturls",
Body: []byte(validBody),
}, &unstructured.Unstructured{})
@@ -448,7 +448,7 @@ func doUnifiedOnlyTests(t *testing.T, helper *apis.K8sTestHelper) {
obj := apis.DoRequest[unstructured.Unstructured](helper, apis.RequestParams{
User: client.Args.User,
Method: http.MethodPost,
Path: "/apis/shorturl.grafana.app/v1alpha1/namespaces/default/shorturls",
Path: "/apis/shorturl.grafana.app/v1beta1/namespaces/default/shorturls",
Body: []byte(`{ "metadata": { "generateName": "redirect-unified-" }, "spec": { "path": "d/test/unified-redirect" } }`),
}, &unstructured.Unstructured{})
require.NotNil(t, obj.Result)