Add SingularNameProvider for Storage (#277)

Signed-off-by: Rokibul Hasan <[email protected]>
kubeops · Jan 4, 2024 · a9c8898 · a9c8898
1 parent f18d13f
commit a9c8898
Show file tree

Hide file tree

Showing 28 changed files with 166 additions and 1 deletion.
diff --git a/pkg/registry/auditor/siteinfo/storage.go b/pkg/registry/auditor/siteinfo/storage.go
@@ -18,6 +18,7 @@ package SiteInfo
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -45,6 +46,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(cfg *restclient.Config, c client.Client) (*Storage, error) {
@@ -77,6 +79,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(auditorv1alpha1.ResourceKindSiteInfo)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &auditorv1alpha1.SiteInfo{}
 }

diff --git a/pkg/registry/core/genericresource/storage.go b/pkg/registry/core/genericresource/storage.go
@@ -19,6 +19,7 @@ package genericresource
 import (
 	"context"
 	"sort"
+	"strings"
 
 	"kubeops.dev/ui-server/pkg/shared"
 
@@ -54,6 +55,7 @@ var (
 	_ rest.Storage                  = &Storage{}
 	_ rest.Getter                   = &Storage{}
 	_ rest.Lister                   = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client, clusterID string, a authorizer.Authorizer) *Storage {
@@ -76,6 +78,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return true
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rscoreapi.ResourceKindGenericResource)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rscoreapi.GenericResource{}
 }

diff --git a/pkg/registry/core/podview/storage.go b/pkg/registry/core/podview/storage.go
@@ -19,6 +19,7 @@ package podview
 import (
 	"context"
 	"errors"
+	"strings"
 
 	core "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -52,6 +53,7 @@ var (
 	_ rest.Storage                  = &Storage{}
 	_ rest.Lister                   = &Storage{}
 	_ rest.Getter                   = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client, a authorizer.Authorizer, builder *promclient.ClientBuilder) *Storage {
@@ -79,6 +81,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return true
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rscoreapi.ResourceKindPodView)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rscoreapi.PodView{}
 }

diff --git a/pkg/registry/core/project/storage.go b/pkg/registry/core/project/storage.go
@@ -54,6 +54,7 @@ var (
 	_ rest.Storage                  = &Storage{}
 	_ rest.Lister                   = &Storage{}
 	_ rest.Getter                   = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 
 	gr = schema.GroupResource{
 		Group:    rscoreapi.SchemeGroupVersion.Group,
@@ -77,6 +78,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rscoreapi.ResourceKindProject)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rscoreapi.Project{}
 }

diff --git a/pkg/registry/core/resourceservice/storage.go b/pkg/registry/core/resourceservice/storage.go
@@ -66,6 +66,7 @@ var (
 	_ rest.Storage                  = &Storage{}
 	_ rest.Getter                   = &Storage{}
 	_ rest.Lister                   = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client, clusterID string, a authorizer.Authorizer) *Storage {
@@ -88,6 +89,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return true
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rscoreapi.ResourceKindGenericResourceService)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rscoreapi.GenericResourceService{}
 }

diff --git a/pkg/registry/core/resourcesummary/storage.go b/pkg/registry/core/resourcesummary/storage.go
@@ -19,6 +19,7 @@ package ResourceSummary
 import (
 	"context"
 	"sort"
+	"strings"
 	"time"
 
 	"kubeops.dev/ui-server/pkg/shared"
@@ -55,6 +56,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Lister                   = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client, clusterID string, a authorizer.Authorizer) *Storage {
@@ -77,6 +79,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return true
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rscoreapi.ResourceKindResourceSummary)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rscoreapi.ResourceSummary{}
 }

diff --git a/pkg/registry/cost/reports/storage.go b/pkg/registry/cost/reports/storage.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strings"
 
 	costapi "kubeops.dev/ui-server/apis/cost/v1alpha1"
 
@@ -51,6 +52,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client) *Storage {
@@ -67,6 +69,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(costapi.ResourceKindCostReport)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &costapi.CostReport{}
 }

diff --git a/pkg/registry/identity/whoami/storage.go b/pkg/registry/identity/whoami/storage.go
@@ -18,6 +18,7 @@ package whoami
 
 import (
 	"context"
+	"strings"
 
 	identityv1alpha1 "kubeops.dev/ui-server/apis/identity/v1alpha1"
 
@@ -36,6 +37,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage() *Storage {
@@ -50,6 +52,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(identityv1alpha1.ResourceKindWhoAmI)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &identityv1alpha1.WhoAmI{}
 }

diff --git a/pkg/registry/meta/chartpresetquery/storage.go b/pkg/registry/meta/chartpresetquery/storage.go
@@ -18,6 +18,7 @@ package chartpresetquery
 
 import (
 	"context"
+	"strings"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +40,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client) *Storage {
@@ -55,6 +57,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rsapi.ResourceKindChartPresetQuery)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rsapi.ChartPresetQuery{}
 }

diff --git a/pkg/registry/meta/clusterstatus/storage.go b/pkg/registry/meta/clusterstatus/storage.go
@@ -18,6 +18,7 @@ package clusterstatus
 
 import (
 	"context"
+	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -37,6 +38,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client) *Storage {
@@ -57,6 +59,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rsapi.ResourceKindClusterStatus)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rsapi.ClusterStatus{}
 }

diff --git a/pkg/registry/meta/render/storage.go b/pkg/registry/meta/render/storage.go
@@ -18,6 +18,7 @@ package render
 
 import (
 	"context"
+	"strings"
 
 	"kubeops.dev/ui-server/pkg/graph"
 
@@ -47,6 +48,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client, oc openvizcs.Interface, a authorizer.Authorizer) *Storage {
@@ -65,6 +67,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rsapi.ResourceKindRender)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rsapi.Render{}
 }

diff --git a/pkg/registry/meta/renderdashboard/storage.go b/pkg/registry/meta/renderdashboard/storage.go
@@ -19,6 +19,7 @@ package renderdashboard
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"kubeops.dev/ui-server/pkg/graph"
 
@@ -46,6 +47,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client, oc openvizcs.Interface) *Storage {
@@ -63,6 +65,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rsapi.ResourceKindRenderDashboard)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rsapi.RenderDashboard{}
 }

diff --git a/pkg/registry/meta/rendermenu/storage.go b/pkg/registry/meta/rendermenu/storage.go
@@ -18,6 +18,7 @@ package rendermenu
 
 import (
 	"context"
+	"strings"
 
 	"kubeops.dev/ui-server/pkg/menu"
 
@@ -43,6 +44,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client, disco discovery.ServerResourcesInterface, ns string) *Storage {
@@ -61,6 +63,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rsapi.ResourceKindRenderMenu)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rsapi.RenderMenu{}
 }

diff --git a/pkg/registry/meta/renderrawgraph/storage.go b/pkg/registry/meta/renderrawgraph/storage.go
@@ -18,6 +18,7 @@ package renderrawgraph
 
 import (
 	"context"
+	"strings"
 
 	"kubeops.dev/ui-server/pkg/graph"
 
@@ -40,6 +41,7 @@ var (
 	_ rest.Scoper                   = &Storage{}
 	_ rest.Storage                  = &Storage{}
 	_ rest.Creater                  = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage(kc client.Client) *Storage {
@@ -56,6 +58,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rsapi.ResourceKindRenderRawGraph)
+}
+
 func (r *Storage) New() runtime.Object {
 	return &rsapi.RenderRawGraph{}
 }

diff --git a/pkg/registry/meta/resourceblockdefinition/storage.go b/pkg/registry/meta/resourceblockdefinition/storage.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	kerr "k8s.io/apimachinery/pkg/api/errors"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
@@ -43,6 +44,7 @@ var (
 	_ rest.Storage                  = &Storage{}
 	_ rest.Getter                   = &Storage{}
 	_ rest.Lister                   = &Storage{}
+	_ rest.SingularNameProvider     = &Storage{}
 )
 
 func NewStorage() *Storage {
@@ -62,6 +64,10 @@ func (r *Storage) NamespaceScoped() bool {
 	return false
 }
 
+func (r *Storage) GetSingularName() string {
+	return strings.ToLower(rsapi.ResourceKindResourceBlockDefinition)
+}
+
 // Getter
 func (r *Storage) New() runtime.Object {
 	return &rsapi.ResourceBlockDefinition{}