RoleRelation

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

Author: vertex451

gateway/resolver/relationships.go

@@ -173,6 +173,49 @@ func (r *RelationshipResolver) CreateRelationsResolver(sourceGVK schema.GroupVer
 	}
 }
 
+// CreateSingleRelationResolver creates a GraphQL field resolver for a single relation field
+func (r *RelationshipResolver) CreateSingleRelationResolver(sourceGVK schema.GroupVersionKind, fieldName string) graphql.FieldResolveFn {
+	return func(p graphql.ResolveParams) (interface{}, error) {
+		_, span := otel.Tracer("").Start(p.Context, "ResolveSingleRelation",
+			trace.WithAttributes(
+				attribute.String("sourceKind", sourceGVK.Kind),
+				attribute.String("fieldName", fieldName),
+			))
+		defer span.End()
+
+		// Get the source object from the parent resolver
+		sourceObj, ok := p.Source.(map[string]interface{})
+		if !ok {
+			return nil, fmt.Errorf("expected source to be map[string]interface{}, got %T", p.Source)
+		}
+
+		// Extract the relationship reference from the source object
+		refValue, found, err := unstructured.NestedFieldNoCopy(sourceObj, fieldName)
+		if err != nil {
+			r.log.Debug().Err(err).Str("field", fieldName).Msg("Error accessing relationship field")
+			return nil, nil // Return nil for optional field
+		}
+		if !found {
+			return nil, nil // Field not present, return nil
+		}
+
+		refMap, ok := refValue.(map[string]interface{})
+		if !ok {
+			r.log.Debug().Str("field", fieldName).Msg("Relationship field is not a map")
+			return nil, nil
+		}
+
+		// Create enhanced reference
+		enhancedRef, err := r.createEnhancedRef(refMap, sourceObj, sourceGVK, fieldName)
+		if err != nil {
+			r.log.Debug().Err(err).Str("field", fieldName).Msg("Error creating enhanced reference")
+			return nil, nil
+		}
+
+		return enhancedRef, nil
+	}
+}
+
 // parseRelationshipRef parses a relationship reference from a map
 func (r *RelationshipResolver) parseRelationshipRef(refMap map[string]interface{}, sourceObj map[string]interface{}, sourceGVK schema.GroupVersionKind, fieldName string) (*RelationshipRef, error) {
 	ref := &RelationshipRef{}

gateway/schema/schema.go

@@ -390,40 +390,44 @@ func (g *Gateway) generateGraphQLFields(resourceScheme *spec.Schema, typePrefix
 		}
 	}
 
-	// Add relations field if we have relationship fields
+	// Add individual relationship fields if we have them
 	if len(relationshipFields) > 0 && currentGVK != nil {
 		g.log.Info().
 			Str("typePrefix", typePrefix).
 			Strs("relationshipFields", relationshipFields).
 			Str("currentGVK", fmt.Sprintf("%+v", currentGVK)).
-			Msg("Attempting to create relations field")
-
-		relationsType := g.createRelationsType(typePrefix, relationshipFields)
-		if relationsType != nil {
-			g.log.Info().
-				Str("typePrefix", typePrefix).
-				Msg("Successfully created relations type")
-
-			relationshipResolver := g.resolver.GetRelationshipResolver()
-			if relationshipResolver != nil {
-				fields["relations"] = &graphql.Field{
-					Type:    relationsType,
-					Resolve: relationshipResolver.CreateRelationsResolver(*currentGVK, relationshipFields),
+			Msg("Attempting to create individual relation fields")
+
+		relationshipResolver := g.resolver.GetRelationshipResolver()
+		if relationshipResolver != nil {
+			for _, fieldName := range relationshipFields {
+				targetKind := g.extractTargetKind(fieldName)
+				relationFieldName := strings.ToLower(string(targetKind[0])) + targetKind[1:] + "Relation"
+
+				relationFieldType := g.createEnhancedRefType(targetKind)
+				if relationFieldType != nil {
+					fields[relationFieldName] = &graphql.Field{
+						Type:    relationFieldType,
+						Resolve: relationshipResolver.CreateSingleRelationResolver(*currentGVK, fieldName),
+					}
+					g.log.Info().
+						Str("typePrefix", typePrefix).
+						Str("fieldName", fieldName).
+						Str("targetKind", targetKind).
+						Str("relationFieldName", relationFieldName).
+						Msg("Added individual relation field")
+				} else {
+					g.log.Info().
+						Str("typePrefix", typePrefix).
+						Str("fieldName", fieldName).
+						Str("targetKind", targetKind).
+						Msg("Failed to create relation field type")
 				}
-
-				g.log.Info().
-					Str("typePrefix", typePrefix).
-					Strs("relationshipFields", relationshipFields).
-					Msg("Added relations field to type")
-			} else {
-				g.log.Info().
-					Str("typePrefix", typePrefix).
-					Msg("No relationship resolver available")
 			}
 		} else {
 			g.log.Info().
 				Str("typePrefix", typePrefix).
-				Msg("Failed to create relations type")
+				Msg("No relationship resolver available")
 		}
 	} else {
 		if len(relationshipFields) == 0 {
@@ -735,40 +739,6 @@ func (g *Gateway) getOrCreateTargetResourceType(targetKind string, sourceGVK *sc
 	return nil, fmt.Errorf("could not find or create GraphQL type for target kind: %s", targetKind)
 }
 
-// createRelationsType creates a GraphQL type for the relations field
-func (g *Gateway) createRelationsType(typePrefix string, relationshipFields []string) graphql.Output {
-	relationFields := graphql.Fields{}
-
-	for _, fieldName := range relationshipFields {
-		targetKind := g.extractTargetKind(fieldName)
-		if targetKind == "" {
-			continue
-		}
-
-		// Create field without "Ref" suffix
-		relationName := strings.TrimSuffix(fieldName, "Ref")
-		relationFields[relationName] = &graphql.Field{
-			Type: g.createEnhancedRefType(targetKind),
-		}
-
-		g.log.Debug().
-			Str("fieldName", fieldName).
-			Str("relationName", relationName).
-			Str("targetKind", targetKind).
-			Msg("Added field to relations type")
-	}
-
-	if len(relationFields) == 0 {
-		return nil
-	}
-
-	relationsTypeName := typePrefix + "Relations"
-	return graphql.NewObject(graphql.ObjectConfig{
-		Name:   relationsTypeName,
-		Fields: relationFields,
-	})
-}
-
 // createEnhancedRefType creates a GraphQL type for enhanced references
 func (g *Gateway) createEnhancedRefType(targetKind string) graphql.Output {
 	typeName := targetKind + "Relation"