Add cluster/nodepool name & kind validation and remove useless endpoint compatibility

cmd/hyperfleet-api/server/routes.go

@@ -84,10 +84,6 @@ func (s *apiServer) routes() *mux.Router {
 	apiV1Router.HandleFunc("/openapi.html", openapiHandler.GetOpenAPIUI).Methods(http.MethodGet)
 	apiV1Router.HandleFunc("/openapi", openapiHandler.GetOpenAPI).Methods(http.MethodGet)
 
-	//  /api/hyperfleet/v1/compatibility
-	compatibilityHandler := handlers.NewCompatibilityHandler()
-	apiV1Router.HandleFunc("/compatibility", compatibilityHandler.Get).Methods(http.MethodGet)
-
 	registerApiMiddleware(apiV1Router)
 
 	// Auto-discovered routes (no manual editing needed)

openapi/openapi.yaml

@@ -4,6 +4,9 @@ info:
   version: 1.0.0
   contact:
     name: HyperFleet Team
+  license:
+    name: Apache 2.0
+    url: https://www.apache.org/licenses/LICENSE-2.0
   description: |-
     HyperFleet API provides simple CRUD operations for managing cluster resources and their status history.
 
@@ -29,6 +32,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ClusterList'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
         default:
           description: An unexpected error response.
           content:
@@ -52,6 +57,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Cluster'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
         default:
           description: An unexpected error response.
           content:
@@ -82,6 +89,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Cluster'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
         default:
           description: An unexpected error response.
           content:
@@ -112,6 +121,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/NodePoolList'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
         default:
           description: An unexpected error response.
           content:
@@ -136,6 +147,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/NodePoolCreateResponse'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
         default:
           description: An unexpected error response.
           content:
@@ -173,47 +186,15 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/NodePool'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
         default:
           description: An unexpected error response.
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
   /api/hyperfleet/v1/clusters/{cluster_id}/nodepools/{nodepool_id}/statuses:
-    get:
-      operationId: getNodePoolsStatuses
-      summary: List all adapter statuses for nodepools
-      description: Returns adapter status reports for this nodepool
-      parameters:
-        - name: cluster_id
-          in: path
-          required: true
-          description: Cluster ID
-          schema:
-            type: string
-        - name: nodepool_id
-          in: path
-          required: true
-          schema:
-            type: string
-        - $ref: '#/components/parameters/QueryParams.page'
-        - $ref: '#/components/parameters/QueryParams.pageSize'
-        - $ref: '#/components/parameters/QueryParams.orderBy'
-        - $ref: '#/components/parameters/QueryParams.order'
-        - $ref: '#/components/parameters/SearchParams'
-      responses:
-        '200':
-          description: The request has succeeded.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/AdapterStatusList'
-        default:
-          description: An unexpected error response.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Error'
     post:
       operationId: postNodePoolStatuses
       summary: Create or update adapter status
@@ -254,18 +235,22 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/AdapterStatusCreateRequest'
-  /api/hyperfleet/v1/clusters/{cluster_id}/statuses:
     get:
-      operationId: getClusterStatuses
-      summary: List all adapter statuses for cluster
-      description: Returns adapter status reports for this cluster
+      operationId: getNodePoolsStatuses
+      summary: List all adapter statuses for nodepools
+      description: Returns adapter status reports for this nodepool
       parameters:
         - name: cluster_id
           in: path
           required: true
           description: Cluster ID
           schema:
             type: string
+        - name: nodepool_id
+          in: path
+          required: true
+          schema:
+            type: string
         - $ref: '#/components/parameters/QueryParams.page'
         - $ref: '#/components/parameters/QueryParams.pageSize'
         - $ref: '#/components/parameters/QueryParams.orderBy'
@@ -278,8 +263,15 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdapterStatusList'
-        '404':
-          description: The server cannot find the requested resource.
+        '400':
+          description: The server could not understand the request due to invalid syntax.
+        default:
+          description: An unexpected error response.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+  /api/hyperfleet/v1/clusters/{cluster_id}/statuses:
     post:
       operationId: postClusterStatuses
       summary: Create or update adapter status
@@ -315,11 +307,17 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/AdapterStatusCreateRequest'
-  /api/hyperfleet/v1/compatibility:
     get:
-      operationId: getCompatibility
-      description: Returns the list of all nodepools
+      operationId: getClusterStatuses
+      summary: List all adapter statuses for cluster
+      description: Returns adapter status reports for this cluster
       parameters:
+        - name: cluster_id
+          in: path
+          required: true
+          description: Cluster ID
+          schema:
+            type: string
         - $ref: '#/components/parameters/QueryParams.page'
         - $ref: '#/components/parameters/QueryParams.pageSize'
         - $ref: '#/components/parameters/QueryParams.orderBy'
@@ -329,11 +327,13 @@ paths:
         '200':
           description: The request has succeeded.
           content:
-            text/plain:
+            application/json:
               schema:
-                type: string
-      security:
-        - BearerAuth: []
+                $ref: '#/components/schemas/AdapterStatusList'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
+        '404':
+          description: The server cannot find the requested resource.
   /api/hyperfleet/v1/nodepools:
     get:
       operationId: getNodePools
@@ -352,13 +352,20 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/NodePoolList'
+        '400':
+          description: The server could not understand the request due to invalid syntax.
         default:
           description: An unexpected error response.
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
 components:
+  securitySchemes:
+    BearerAuth:
+      type: http
+      scheme: bearer
+
   parameters:
     QueryParams.order:
       name: order
@@ -702,7 +709,7 @@ components:
           default: Cluster
         name:
           type: string
-          minLength: 1
+          minLength: 3
           maxLength: 63
           pattern: ^[a-z0-9-]+$
           description: Cluster name (unique)
@@ -1194,11 +1201,7 @@ components:
         - Ready
         - Failed
       description: Phase of a resource (Cluster or NodePool)
-  securitySchemes:
-    BearerAuth:
-      type: http
-      scheme: bearer
 servers:
-  - url: http://localhost:8000
-    description: Development
+  - url: https://api.hyperfleet.redhat.com
+    description: Production
     variables: {}

pkg/api/cluster_types.go

@@ -49,9 +49,6 @@ func (c *Cluster) BeforeCreate(tx *gorm.DB) error {
 	c.ID = NewID()
 	c.CreatedTime = now
 	c.UpdatedTime = now
-	if c.Kind == "" {
-		c.Kind = "Cluster"
-	}
 	if c.Generation == 0 {
 		c.Generation = 1
 	}

pkg/api/cluster_types_test.go

@@ -67,13 +67,14 @@ func TestCluster_BeforeCreate_IDGeneration(t *testing.T) {
 	Expect(len(cluster.ID)).To(BeNumerically(">", 0))
 }
 
-// TestCluster_BeforeCreate_KindDefault tests Kind default value
-func TestCluster_BeforeCreate_KindDefault(t *testing.T) {
+// TestCluster_BeforeCreate_KindPreservation tests Kind is preserved (not auto-set)
+func TestCluster_BeforeCreate_KindPreservation(t *testing.T) {
 	RegisterTestingT(t)
 
-	// Test default Kind
+	// Kind must be set before BeforeCreate (by handler validation)
 	cluster := &Cluster{
 		Name: "test-cluster",
+		Kind: "Cluster",
 	}
 
 	err := cluster.BeforeCreate(nil)
@@ -189,14 +190,15 @@ func TestCluster_BeforeCreate_Complete(t *testing.T) {
 
 	cluster := &Cluster{
 		Name: "test-cluster",
+		Kind: "Cluster", // Kind must be set before BeforeCreate
 	}
 
 	err := cluster.BeforeCreate(nil)
 	Expect(err).To(BeNil())
 
 	// Verify all defaults
 	Expect(cluster.ID).ToNot(BeEmpty())
-	Expect(cluster.Kind).To(Equal("Cluster"))
+	Expect(cluster.Kind).To(Equal("Cluster")) // Kind is preserved, not auto-set
 	Expect(cluster.Generation).To(Equal(int32(1)))
 	Expect(cluster.StatusPhase).To(Equal("NotReady"))
 	Expect(cluster.Href).To(Equal("/api/hyperfleet/v1/clusters/" + cluster.ID))

pkg/api/node_pool_types.go

@@ -55,9 +55,6 @@ func (np *NodePool) BeforeCreate(tx *gorm.DB) error {
 	np.ID = NewID()
 	np.CreatedTime = now
 	np.UpdatedTime = now
-	if np.Kind == "" {
-		np.Kind = "NodePool"
-	}
 	if np.OwnerKind == "" {
 		np.OwnerKind = "Cluster"
 	}

pkg/api/node_pool_types_test.go

@@ -68,14 +68,15 @@ func TestNodePool_BeforeCreate_IDGeneration(t *testing.T) {
 	Expect(len(nodepool.ID)).To(BeNumerically(">", 0))
 }
 
-// TestNodePool_BeforeCreate_KindDefault tests Kind default value
-func TestNodePool_BeforeCreate_KindDefault(t *testing.T) {
+// TestNodePool_BeforeCreate_KindPreservation tests Kind is preserved (not auto-set)
+func TestNodePool_BeforeCreate_KindPreservation(t *testing.T) {
 	RegisterTestingT(t)
 
-	// Test default Kind
+	// Kind must be set before BeforeCreate (by handler validation)
 	nodepool := &NodePool{
 		Name:    "test-nodepool",
 		OwnerID: "cluster-123",
+		Kind:    "NodePool",
 	}
 
 	err := nodepool.BeforeCreate(nil)
@@ -230,14 +231,15 @@ func TestNodePool_BeforeCreate_Complete(t *testing.T) {
 	nodepool := &NodePool{
 		Name:    "test-nodepool",
 		OwnerID: "cluster-complete",
+		Kind:    "NodePool", // Kind must be set before BeforeCreate
 	}
 
 	err := nodepool.BeforeCreate(nil)
 	Expect(err).To(BeNil())
 
 	// Verify all defaults
 	Expect(nodepool.ID).ToNot(BeEmpty())
-	Expect(nodepool.Kind).To(Equal("NodePool"))
+	Expect(nodepool.Kind).To(Equal("NodePool")) // Kind is preserved, not auto-set
 	Expect(nodepool.OwnerKind).To(Equal("Cluster"))
 	Expect(nodepool.StatusPhase).To(Equal("NotReady"))
 	Expect(nodepool.Href).To(Equal("/api/hyperfleet/v1/clusters/cluster-complete/nodepools/" + nodepool.ID))

pkg/api/openapi_embed.go

@@ -12,4 +12,3 @@ var openapiFS embed.FS
 func GetOpenAPISpec() ([]byte, error) {
 	return fs.ReadFile(openapiFS, "openapi/api/openapi.yaml")
 }
-

pkg/api/presenters/adapter_status_test.go

@@ -194,7 +194,7 @@ func TestConvertAdapterStatus_ConditionStatusConversion(t *testing.T) {
 	RegisterTestingT(t)
 
 	testCases := []struct {
-		openapiStatus openapi.ConditionStatus
+		openapiStatus  openapi.ConditionStatus
 		expectedDomain api.ConditionStatus
 	}{
 		{openapi.TRUE, api.ConditionTrue},
@@ -361,7 +361,7 @@ func TestPresentAdapterStatus_ConditionStatusConversion(t *testing.T) {
 	RegisterTestingT(t)
 
 	testCases := []struct {
-		domainStatus   api.ConditionStatus
+		domainStatus    api.ConditionStatus
 		expectedOpenAPI openapi.ConditionStatus
 	}{
 		{api.ConditionTrue, openapi.TRUE},

pkg/auth/auth_middleware.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net/http"
 
-
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/errors"
 )
 

pkg/dao/mocks/generic.go

@@ -9,12 +9,12 @@ import (
 var _ dao.GenericDao = &genericDaoMock{}
 
 type genericDaoMock struct {
-	preload  string
-	orderBy  string
-	joins    string
-	group    string
-	wheres   []dao.Where
-	model    interface{}
+	preload string
+	orderBy string
+	joins   string
+	group   string
+	wheres  []dao.Where
+	model   interface{}
 }
 
 func NewGenericDao() *genericDaoMock {

pkg/handlers/cluster.go

@@ -33,6 +33,8 @@ func (h clusterHandler) Create(w http.ResponseWriter, r *http.Request) {
 		&req,
 		[]validate{
 			validateEmpty(&req, "Id", "id"),
+			validateName(&req, "Name", "name", 3, 63),
+			validateKind(&req, "Kind", "kind", "Cluster"),
 		},
 		func() (interface{}, *errors.ServiceError) {
 			ctx := r.Context()