Merge pull request #188 from tirthct/hyperfleet-1085

HYPERFLEET-1085 - feat: Add resource service

Author: kuudori

cmd/hyperfleet-api/main.go

@@ -20,6 +20,7 @@ import (
 	_ "github.com/openshift-hyperfleet/hyperfleet-api/plugins/clusters"
 	_ "github.com/openshift-hyperfleet/hyperfleet-api/plugins/generic"
 	_ "github.com/openshift-hyperfleet/hyperfleet-api/plugins/nodePools"
+	_ "github.com/openshift-hyperfleet/hyperfleet-api/plugins/resources"
 )
 
 // nolint

pkg/api/resource.go

@@ -31,26 +31,17 @@ type Resource struct {
 	Generation  int32          `json:"generation" gorm:"default:1;not null"`
 }
 
-type (
-	ResourceList  []*Resource
-	ResourceIndex map[string]*Resource
-)
-
-// TODO: Evaluate the need for this method as part of
-// https://redhat.atlassian.net/browse/HYPERFLEET-1085 and remove if not needed
-func (l ResourceList) Index() ResourceIndex {
-	index := ResourceIndex{}
-	for _, o := range l {
-		index[o.ID] = o
-	}
-	return index
+type ResourcePatchRequest struct {
+	Spec   *map[string]interface{} `json:"spec,omitempty"`
+	Labels *map[string]string      `json:"labels,omitempty"`
 }
 
+type ResourceList []*Resource
+
 func (r Resource) TableName() string {
 	return "resources"
 }
 
-// BeforeCreate TODO: Validate the necessity for this as part of https://redhat.atlassian.net/browse/HYPERFLEET-1085
 func (r *Resource) BeforeCreate(tx *gorm.DB) error {
 	if r.ID == "" {
 		id, err := NewID()

pkg/api/resource_test.go

@@ -26,37 +26,6 @@ func strPtr(s string) *string {
 	return &s
 }
 
-func TestResourceList_Index(t *testing.T) {
-	RegisterTestingT(t)
-
-	emptyList := ResourceList{}
-	emptyIndex := emptyList.Index()
-	Expect(len(emptyIndex)).To(Equal(0))
-
-	r1 := &Resource{}
-	r1.ID = "res-1"
-	r1.Name = "test-resource-1"
-
-	r2 := &Resource{}
-	r2.ID = "res-2"
-	r2.Name = "test-resource-2"
-
-	multiList := ResourceList{r1, r2}
-	multiIndex := multiList.Index()
-	Expect(len(multiIndex)).To(Equal(2))
-	Expect(multiIndex["res-1"]).To(Equal(r1))
-	Expect(multiIndex["res-2"]).To(Equal(r2))
-
-	r1Dup := &Resource{}
-	r1Dup.ID = "res-1"
-	r1Dup.Name = "duplicate"
-
-	dupList := ResourceList{r1, r1Dup}
-	dupIndex := dupList.Index()
-	Expect(len(dupIndex)).To(Equal(1))
-	Expect(dupIndex["res-1"].Name).To(Equal("duplicate"))
-}
-
 func TestResource_BeforeCreate_IDGeneration(t *testing.T) {
 	RegisterTestingT(t)
 	setupTestRegistry()

pkg/registry/descriptor.go

@@ -17,6 +17,4 @@ type EntityDescriptor struct {
 	SpecSchemaName         string               // OpenAPI component name for spec validation
 	OnParentDelete         OnParentDeletePolicy // only meaningful when ParentKind != ""
 	SearchDisallowedFields []string             // fields blocked from TSL search
-	NameMinLen             int                  // minimum name length
-	NameMaxLen             int                  // maximum name length
 }

pkg/registry/registry.go

@@ -56,7 +56,6 @@ func ChildrenOf(parentKind string) []EntityDescriptor {
 // Validate checks registry integrity. Panics on:
 //   - empty Kind or Plural on any descriptor
 //   - any ParentKind that references an unregistered kind
-//   - NameMinLen > NameMaxLen (when NameMaxLen is set)
 //   - duplicate Plural values across descriptors
 func Validate() {
 	plurals := make(map[string]string, len(descriptors))
@@ -78,13 +77,6 @@ func Validate() {
 			}
 		}
 
-		if d.NameMaxLen > 0 && d.NameMinLen > d.NameMaxLen {
-			panic(fmt.Sprintf(
-				"entity kind %q has NameMinLen (%d) > NameMaxLen (%d)",
-				d.Kind, d.NameMinLen, d.NameMaxLen,
-			))
-		}
-
 		if existing, ok := plurals[d.Plural]; ok {
 			panic(fmt.Sprintf(
 				"duplicate plural %q: registered by both %q and %q",

pkg/registry/registry_test.go

@@ -11,10 +11,8 @@ func TestRegister_Success(t *testing.T) {
 	Reset()
 
 	d := EntityDescriptor{
-		Kind:       "Channel",
-		Plural:     "channels",
-		NameMinLen: 3,
-		NameMaxLen: 53,
+		Kind:   "Channel",
+		Plural: "channels",
 	}
 
 	Register(d)
@@ -23,8 +21,6 @@ func TestRegister_Success(t *testing.T) {
 	Expect(ok).To(BeTrue())
 	Expect(got.Kind).To(Equal("Channel"))
 	Expect(got.Plural).To(Equal("channels"))
-	Expect(got.NameMinLen).To(Equal(3))
-	Expect(got.NameMaxLen).To(Equal(53))
 }
 
 func TestRegister_DuplicateKind_Panics(t *testing.T) {
@@ -140,17 +136,6 @@ func TestRegister_EmptyPlural_Panics(t *testing.T) {
 	}).To(PanicWith(ContainSubstring("has empty plural")))
 }
 
-func TestValidate_NameMinExceedsMax_Panics(t *testing.T) {
-	RegisterTestingT(t)
-	Reset()
-
-	Register(EntityDescriptor{Kind: "Channel", Plural: "channels", NameMinLen: 100, NameMaxLen: 3})
-
-	Expect(func() {
-		Validate()
-	}).To(PanicWith(ContainSubstring("NameMinLen (100) > NameMaxLen (3)")))
-}
-
 func TestValidate_Success(t *testing.T) {
 	RegisterTestingT(t)
 	Reset()
@@ -179,8 +164,6 @@ func TestDescriptorFields(t *testing.T) {
 	Register(EntityDescriptor{
 		Kind:                   "Version",
 		Plural:                 "versions",
-		NameMinLen:             3,
-		NameMaxLen:             53,
 		ParentKind:             "Channel",
 		OnParentDelete:         OnParentDeleteRestrict,
 		SpecSchemaName:         "VersionSpec",