ACM-10019 - 3.update searchSchema with managedHub (#219)

Signed-off-by: Sherin Varughese <shvarugh@redhat.com>

Author: SherinV

pkg/federated/federated_test.go

@@ -221,7 +221,7 @@ func TestGetFederatedResponseSuccess(t *testing.T) {
 	assert.Equal(t, 1, len(fedRequest.Response.Data.Search))
 	assert.Equal(t, 2, fedRequest.Response.Data.Search[0].Count)
 	assert.Equal(t, 2, len(fedRequest.Response.Data.SearchComplete))
-	assert.Equal(t, 3, len(fedRequest.Response.Data.SearchSchema.AllProperties))
+	assert.Equal(t, 4, len(fedRequest.Response.Data.SearchSchema.AllProperties)) //managedHub is added after merge
 
 }
 

pkg/federated/mergeResponses.go

@@ -11,6 +11,8 @@ func (d *Data) mergeSearchSchema(schemaProps []string) {
 	if d.SearchSchema == nil {
 		d.searchSchemaValues = make(map[string]interface{})
 		d.SearchSchema = &SearchSchema{AllProperties: make([]string, 0)}
+		// Add "managedHub" as a filter option in global Search - ACM-10019
+		schemaProps = append([]string{"managedHub"}, schemaProps[:]...)
 	}
 	for _, prop := range schemaProps {
 		if _, exists := d.searchSchemaValues[prop]; !exists {

pkg/federated/mergeResponses_test.go

@@ -4,6 +4,9 @@ package federated
 import (
 	"reflect"
 	"testing"
+
+	"github.com/stolostron/search-v2-api/pkg/resolver"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAppendRelatedResults(t *testing.T) {
@@ -30,3 +33,10 @@ func TestAppendRelatedResults(t *testing.T) {
 		t.Errorf("Unexpected result. Expected: %v, Got: %v", expected, result)
 	}
 }
+
+func Test_mergeSearchSchema(t *testing.T) {
+	d := &Data{}
+	d.mergeSearchSchema([]string{"kind", "cluster"})
+	shouldbeTrue := resolver.CheckIfInArray(d.SearchSchema.AllProperties, "managedHub")
+	assert.True(t, shouldbeTrue, true, "Expected managedHub to be present in the schema. Expected true, got %t", shouldbeTrue)
+}