Merge pull request #202 from ldornele/HYPERFLEET-1142

HYPERFLEET-1142 - fix: enable field filtering on single-resource GET

Author: openshift-merge-bot[bot]

pkg/api/presenters/cluster.go

@@ -10,6 +10,8 @@ import (
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/util"
 )
 
+const clusterKind = "Cluster"
+
 // ConvertCluster converts openapi.ClusterCreateRequest to api.Cluster (GORM model)
 func ConvertCluster(req *openapi.ClusterCreateRequest) (*api.Cluster, error) {
 	// Marshal Spec
@@ -29,7 +31,7 @@ func ConvertCluster(req *openapi.ClusterCreateRequest) (*api.Cluster, error) {
 	}
 
 	// Get Kind value, use default if not provided
-	kind := "Cluster"
+	kind := clusterKind
 	if req.Kind != nil {
 		kind = *req.Kind
 	}

pkg/api/presenters/cluster_test.go

@@ -13,7 +13,8 @@ import (
 )
 
 const (
-	testConditionReconciled = "Reconciled"
+	testConditionReconciled          = "Reconciled"
+	testMessageComponentsUnavailable = "Some components unavailable"
 )
 
 // Helper function to create test ClusterCreateRequest
@@ -254,7 +255,7 @@ func TestPresentCluster_StatusConditionsConversion(t *testing.T) {
 	reason1 := "Reconciled"
 	message1 := "All systems operational"
 	reason2 := "Degraded"
-	message2 := "Some components unavailable"
+	message2 := testMessageComponentsUnavailable
 
 	// Create multiple domain ResourceConditions
 	conditions := []api.ResourceCondition{
@@ -308,7 +309,7 @@ func TestPresentCluster_StatusConditionsConversion(t *testing.T) {
 	Expect(result.Status.Conditions[1].Type).To(Equal("Progressing"))
 	Expect(result.Status.Conditions[1].Status).To(Equal(openapi.ResourceConditionStatusFalse))
 	Expect(*result.Status.Conditions[1].Reason).To(Equal("Degraded"))
-	Expect(*result.Status.Conditions[1].Message).To(Equal("Some components unavailable"))
+	Expect(*result.Status.Conditions[1].Message).To(Equal(testMessageComponentsUnavailable))
 }
 
 // TestConvertAndPresentCluster_RoundTrip tests data integrity through convert and present

pkg/api/presenters/node_pool.go

@@ -8,6 +8,8 @@ import (
 	"github.com/openshift-hyperfleet/hyperfleet-api/pkg/api/openapi"
 )
 
+const nodePoolKind = "NodePool"
+
 // ConvertNodePool converts openapi.NodePoolCreateRequest to api.NodePool (GORM model)
 func ConvertNodePool(req *openapi.NodePoolCreateRequest, ownerID string) (*api.NodePool, error) {
 	// Marshal Spec
@@ -26,7 +28,7 @@ func ConvertNodePool(req *openapi.NodePoolCreateRequest, ownerID string) (*api.N
 		return nil, fmt.Errorf("failed to marshal nodepool labels: %w", err)
 	}
 
-	kind := "NodePool"
+	kind := nodePoolKind
 	if req.Kind != nil {
 		kind = *req.Kind
 	}