simplidied buildKindRegistry

On-behalf-of: @SAP [email protected]
Signed-off-by: Artem Shcherbatiuk <[email protected]>

Author: vertex451

gateway/resolver/resolver.go

@@ -29,7 +29,6 @@ type Provider interface {
 	CustomQueriesProvider
 	CommonResolver() graphql.FieldResolveFn
 	SanitizeGroupName(string) string
-	RuntimeClient() client.WithWatch
 	RelationResolver(fieldName string, gvk schema.GroupVersionKind) graphql.FieldResolveFn
 }
 
@@ -94,15 +93,6 @@ func (r *Service) ListItems(gvk schema.GroupVersionKind, scope v1.ResourceScope)
 		list.SetGroupVersionKind(schema.GroupVersionKind{Group: gvk.Group, Version: gvk.Version, Kind: gvk.Kind + "List"})
 
 		var opts []client.ListOption
-		if isResourceNamespaceScoped(scope) {
-			namespace, err := getStringArg(p.Args, NamespaceArg, false)
-			if err != nil {
-				return nil, err
-			}
-			if namespace != "" {
-				opts = append(opts, client.InNamespace(namespace))
-			}
-		}
 
 		if val, ok := p.Args[LabelSelectorArg].(string); ok && val != "" {
 			selector, err := labels.Parse(val)
@@ -113,6 +103,16 @@ func (r *Service) ListItems(gvk schema.GroupVersionKind, scope v1.ResourceScope)
 			opts = append(opts, client.MatchingLabelsSelector{Selector: selector})
 		}
 
+		if isResourceNamespaceScoped(scope) {
+			namespace, err := getStringArg(p.Args, NamespaceArg, false)
+			if err != nil {
+				return nil, err
+			}
+			if namespace != "" {
+				opts = append(opts, client.InNamespace(namespace))
+			}
+		}
+
 		if err = r.runtimeClient.List(ctx, list, opts...); err != nil {
 			log.Error().Err(err).Str("scope", string(scope)).Msg("Unable to list objects")
 			return nil, err
@@ -463,11 +463,6 @@ func compareNumbers[T int64 | float64](a, b T) int {
 	}
 }
 
-// RuntimeClient returns the runtime client for use in relationship resolution
-func (r *Service) RuntimeClient() client.WithWatch {
-	return r.runtimeClient
-}
-
 // RelationResolver creates a GraphQL resolver for relation fields
 func (r *Service) RelationResolver(fieldName string, gvk schema.GroupVersionKind) graphql.FieldResolveFn {
 	return r.relationResolver.CreateResolver(fieldName, gvk)

listener/pkg/apischema/builder.go

@@ -254,7 +254,40 @@ func (b *SchemaBuilder) buildKindRegistry() {
 		}
 
 		// Index by lowercase kind name for consistent lookup
-		b.kindRegistry[strings.ToLower(gvk.Kind)] = append(b.kindRegistry[strings.ToLower(gvk.Kind)], resourceInfo)
+		key := strings.ToLower(gvk.Kind)
+		b.kindRegistry[key] = append(b.kindRegistry[key], resourceInfo)
+	}
+
+	// Ensure deterministic order for picks: sort each slice by Group, Version, Kind, SchemaKey
+	for kindKey, infos := range b.kindRegistry {
+		slices.SortFunc(infos, func(a, b ResourceInfo) int {
+			if a.Group != b.Group {
+				if a.Group < b.Group {
+					return -1
+				}
+				return 1
+			}
+			if a.Version != b.Version {
+				if a.Version < b.Version {
+					return -1
+				}
+				return 1
+			}
+			if a.Kind != b.Kind {
+				if a.Kind < b.Kind {
+					return -1
+				}
+				return 1
+			}
+			if a.SchemaKey < b.SchemaKey {
+				return -1
+			}
+			if a.SchemaKey > b.SchemaKey {
+				return 1
+			}
+			return 0
+		})
+		b.kindRegistry[kindKey] = infos
 	}
 
 	b.log.Debug().Int("kindCount", len(b.kindRegistry)).Msg("built kind registry for relationships")
@@ -266,51 +299,34 @@ func (b *SchemaBuilder) expandRelationships(schema *spec.Schema) {
 		return
 	}
 
-	// Create a copy of properties to avoid modifying while iterating
-	originalProps := make(map[string]spec.Schema)
-	for k, v := range schema.Properties {
-		originalProps[k] = v
-	}
+	for propName := range schema.Properties {
+		if !isRefProperty(propName) {
+			continue
+		}
 
-	for propName := range originalProps {
-		if strings.HasSuffix(propName, "Ref") && propName != "Ref" {
-			// Extract the base kind (e.g., "role" from "roleRef")
-			baseKind := strings.TrimSuffix(propName, "Ref")
-			b.log.Debug().Str("propName", propName).Str("baseKind", baseKind).Msg("Found Ref field")
-
-			// Find the first matching resource type for this kind
-			lookupKey := strings.ToLower(baseKind)
-			b.log.Debug().Str("lookupKey", lookupKey).Msg("Looking up in kind registry")
-			if resourceTypes, exists := b.kindRegistry[lookupKey]; exists && len(resourceTypes) > 0 {
-				b.log.Debug().Str("lookupKey", lookupKey).Int("resourceCount", len(resourceTypes)).Msg("Found matching resources")
-				// Use the first matching resource type
-				targetResource := resourceTypes[0]
-
-				// Generate field name (e.g., "role" for "roleRef")
-				fieldName := strings.ToLower(baseKind)
-
-				// Add the relationship field
-				if _, exists := schema.Properties[fieldName]; !exists {
-					// Create a reference to the target schema
-					refSchema := spec.Schema{
-						SchemaProps: spec.SchemaProps{
-							Ref: spec.MustCreateRef(fmt.Sprintf("#/definitions/%s.%s.%s",
-								targetResource.Group, targetResource.Version, targetResource.Kind)),
-						},
-					}
-					schema.Properties[fieldName] = refSchema
-
-					b.log.Info().
-						Str("sourceField", propName).
-						Str("targetField", fieldName).
-						Str("targetKind", targetResource.Kind).
-						Str("targetGroup", targetResource.Group).
-						Msg("Added relationship field")
-				}
-			} else {
-				b.log.Debug().Str("lookupKey", lookupKey).Msg("No matching resources found in kind registry")
-			}
+		baseKind := strings.TrimSuffix(propName, "Ref")
+		lookupKey := strings.ToLower(baseKind)
+
+		resourceTypes, exists := b.kindRegistry[lookupKey]
+		if !exists || len(resourceTypes) == 0 {
+			continue
+		}
+
+		fieldName := strings.ToLower(baseKind)
+		if _, exists := schema.Properties[fieldName]; exists {
+			continue
 		}
+
+		target := resourceTypes[0]
+		ref := spec.MustCreateRef(fmt.Sprintf("#/definitions/%s.%s.%s", target.Group, target.Version, target.Kind))
+		schema.Properties[fieldName] = spec.Schema{SchemaProps: spec.SchemaProps{Ref: ref}}
+
+		b.log.Info().
+			Str("sourceField", propName).
+			Str("targetField", fieldName).
+			Str("targetKind", target.Kind).
+			Str("targetGroup", target.Group).
+			Msg("Added relationship field")
 	}
 
 	// Recursively process nested objects and write back modifications
@@ -322,6 +338,16 @@ func (b *SchemaBuilder) expandRelationships(schema *spec.Schema) {
 	}
 }
 
+func isRefProperty(name string) bool {
+	if !strings.HasSuffix(name, "Ref") {
+		return false
+	}
+	if name == "Ref" {
+		return false
+	}
+	return true
+}
+
 func (b *SchemaBuilder) Complete() ([]byte, error) {
 	v3JSON, err := json.Marshal(&schemaResponse{
 		Components: schemasComponentsWrapper{