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
apps/shorturl/pkg/app/app.go
+9 -9
View File
@@ -18,7 +18,7 @@ import (
"github.com/grafana/grafana-app-sdk/operator"
"github.com/grafana/grafana-app-sdk/resource"
"github.com/grafana/grafana-app-sdk/simple"
shorturlv1alpha1 "github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1alpha1"
shorturlv1beta1 "github.com/grafana/grafana/apps/shorturl/pkg/apis/shorturl/v1beta1"
"github.com/grafana/grafana/pkg/apimachinery/identity"
)
@@ -31,11 +31,11 @@ var (
func New(cfg app.Config) (app.App, error) {
cfg.KubeConfig.APIPath = "apis"
tmp, err := k8s.NewClientRegistry(cfg.KubeConfig, k8s.DefaultClientConfig()).
ClientFor(shorturlv1alpha1.ShortURLKind())
ClientFor(shorturlv1beta1.ShortURLKind())
if err != nil {
return nil, fmt.Errorf("unable to create client")
}
client := shorturlv1alpha1.NewShortURLClient(tmp)
client := shorturlv1beta1.NewShortURLClient(tmp)
simpleConfig := simple.AppConfig{
Name: "shorturl",
@@ -49,11 +49,11 @@ func New(cfg app.Config) (app.App, error) {
},
ManagedKinds: []simple.AppManagedKind{
{
Kind: shorturlv1alpha1.ShortURLKind(),
Kind: shorturlv1beta1.ShortURLKind(),
Validator: &simple.Validator{
ValidateFunc: func(ctx context.Context, req *app.AdmissionRequest) error {
// Cast the incoming object to ShortURL for validation
shortURL, ok := req.Object.(*shorturlv1alpha1.ShortURL)
shortURL, ok := req.Object.(*shorturlv1beta1.ShortURL)
if !ok {
return fmt.Errorf("expected ShortURL object, got %T", req.Object)
}
@@ -105,7 +105,7 @@ func New(cfg app.Config) (app.App, error) {
url = url + "/" + info.Spec.Path
if req.URL.Query().Get("redirect") == "false" { // helpful for testing
return json.NewEncoder(w).Encode(shorturlv1alpha1.GetGoto{
return json.NewEncoder(w).Encode(shorturlv1beta1.GetGoto{
Url: url,
})
}
@@ -133,10 +133,10 @@ func New(cfg app.Config) (app.App, error) {
func GetKinds() map[schema.GroupVersion][]resource.Kind {
gv := schema.GroupVersion{
Group: shorturlv1alpha1.ShortURLKind().Group(),
Version: shorturlv1alpha1.ShortURLKind().Version(),
Group: shorturlv1beta1.ShortURLKind().Group(),
Version: shorturlv1beta1.ShortURLKind().Version(),
}
return map[schema.GroupVersion][]resource.Kind{
gv: {shorturlv1alpha1.ShortURLKind()},
gv: {shorturlv1beta1.ShortURLKind()},
}
}