labels wip

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

Author: vertex451

gateway/resolver/resolver.go

@@ -25,6 +25,100 @@ import (
 	"github.com/openmfp/golang-commons/logger"
 )
 
+// convertLabels converts between map[string]string and []Label format
+// toArray=true: converts maps to arrays (for GraphQL output)
+// toArray=false: converts arrays to maps (for Kubernetes input)
+func convertLabels(obj any, toArray bool) any {
+	switch v := obj.(type) {
+	case map[string]interface{}:
+		return convertObject(v, toArray)
+	case []interface{}:
+		result := make([]any, len(v))
+		for i, item := range v {
+			result[i] = convertLabels(item, toArray)
+		}
+		return result
+	default:
+		return obj
+	}
+}
+
+// convertObject handles object conversion with direction control
+func convertObject(objMap map[string]interface{}, toArray bool) map[string]interface{} {
+	result := make(map[string]interface{})
+	for key, value := range objMap {
+		if key == "metadata" {
+			result[key] = convertMetadata(value, toArray)
+		} else {
+			result[key] = convertLabels(value, toArray)
+		}
+	}
+	return result
+}
+
+// convertMetadata handles metadata field conversion
+func convertMetadata(metadataValue any, toArray bool) any {
+	metadata, ok := metadataValue.(map[string]interface{})
+	if !ok {
+		return convertLabels(metadataValue, toArray)
+	}
+
+	result := make(map[string]interface{})
+	for key, value := range metadata {
+		if isLabelField(key) && value != nil {
+			result[key] = convertLabelField(value, toArray)
+		} else {
+			result[key] = convertLabels(value, toArray)
+		}
+	}
+	return result
+}
+
+// convertLabelField converts between label map and array formats
+func convertLabelField(value any, toArray bool) any {
+	if toArray {
+		// Convert map to array for GraphQL output
+		labelMap, ok := value.(map[string]interface{})
+		if !ok {
+			return convertLabels(value, toArray)
+		}
+
+		var labelArray []map[string]interface{}
+		for k, v := range labelMap {
+			if strValue, ok := v.(string); ok {
+				labelArray = append(labelArray, map[string]interface{}{
+					"key":   k,
+					"value": strValue,
+				})
+			}
+		}
+		return labelArray
+	} else {
+		// Convert array to map for Kubernetes input
+		labelArray, ok := value.([]interface{})
+		if !ok {
+			return convertLabels(value, toArray)
+		}
+
+		labelMap := make(map[string]string)
+		for _, item := range labelArray {
+			if labelObj, ok := item.(map[string]interface{}); ok {
+				if key, keyOk := labelObj["key"].(string); keyOk {
+					if val, valOk := labelObj["value"].(string); valOk {
+						labelMap[key] = val
+					}
+				}
+			}
+		}
+		return labelMap
+	}
+}
+
+// isLabelField checks if a field is labels or annotations
+func isLabelField(fieldName string) bool {
+	return fieldName == "labels" || fieldName == "annotations"
+}
+
 type Provider interface {
 	CrudProvider
 	CustomQueriesProvider
@@ -129,7 +223,9 @@ func (r *Service) ListItems(gvk schema.GroupVersionKind, scope v1.ResourceScope)
 
 		items := make([]map[string]any, len(list.Items))
 		for i, item := range list.Items {
-			items[i] = item.Object
+			// Convert maps back to label arrays for GraphQL response
+			convertedItem := convertLabels(item.Object, true).(map[string]interface{})
+			items[i] = convertedItem
 		}
 
 		return items, nil
@@ -185,7 +281,9 @@ func (r *Service) GetItem(gvk schema.GroupVersionKind, scope v1.ResourceScope) g
 			return nil, err
 		}
 
-		return obj.Object, nil
+		// Convert maps back to label arrays for GraphQL response
+		convertedResponse := convertLabels(obj.Object, true)
+		return convertedResponse, nil
 	}
 }
 
@@ -220,8 +318,11 @@ func (r *Service) CreateItem(gvk schema.GroupVersionKind, scope v1.ResourceScope
 
 		objectInput := p.Args["object"].(map[string]interface{})
 
+		// Convert label arrays back to maps for Kubernetes compatibility
+		convertedInput := convertLabels(objectInput, false).(map[string]interface{})
+
 		obj := &unstructured.Unstructured{
-			Object: objectInput,
+			Object: convertedInput,
 		}
 		obj.SetGroupVersionKind(gvk)
 
@@ -251,7 +352,9 @@ func (r *Service) CreateItem(gvk schema.GroupVersionKind, scope v1.ResourceScope
 			return nil, err
 		}
 
-		return obj.Object, nil
+		// Convert maps back to label arrays for GraphQL response
+		convertedResponse := convertLabels(obj.Object, true)
+		return convertedResponse, nil
 	}
 }
 
@@ -270,8 +373,10 @@ func (r *Service) UpdateItem(gvk schema.GroupVersionKind, scope v1.ResourceScope
 		}
 
 		objectInput := p.Args["object"].(map[string]interface{})
-		// Marshal the input object to JSON to create the patch data
-		patchData, err := json.Marshal(objectInput)
+		// Convert label arrays back to maps for Kubernetes compatibility
+		convertedInput := convertLabels(objectInput, false).(map[string]interface{})
+		// Marshal the converted input object to JSON to create the patch data
+		patchData, err := json.Marshal(convertedInput)
 		if err != nil {
 			return nil, fmt.Errorf("failed to marshal object input: %v", err)
 		}
@@ -312,7 +417,9 @@ func (r *Service) UpdateItem(gvk schema.GroupVersionKind, scope v1.ResourceScope
 			return nil, err
 		}
 
-		return existingObj.Object, nil
+		// Convert maps back to label arrays for GraphQL response
+		convertedResponse := convertLabels(existingObj.Object, true)
+		return convertedResponse, nil
 	}
 }
 

gateway/schema/scalars.go

@@ -72,3 +72,41 @@ var jsonStringScalar = graphql.NewScalar(graphql.ScalarConfig{
 		return nil
 	},
 })
+
+// Label represents a single key-value label pair
+type Label struct {
+	Key   string `json:"key"`
+	Value string `json:"value"`
+}
+
+// LabelType defines the GraphQL object type for a single label
+var LabelType = graphql.NewObject(graphql.ObjectConfig{
+	Name:        "Label",
+	Description: "A key-value label pair that supports keys with dots and special characters",
+	Fields: graphql.Fields{
+		"key": &graphql.Field{
+			Type:        graphql.NewNonNull(graphql.String),
+			Description: "The label key (can contain dots and special characters)",
+		},
+		"value": &graphql.Field{
+			Type:        graphql.NewNonNull(graphql.String),
+			Description: "The label value",
+		},
+	},
+})
+
+// LabelInputType defines the GraphQL input type for a single label
+var LabelInputType = graphql.NewInputObject(graphql.InputObjectConfig{
+	Name:        "LabelInput",
+	Description: "Input type for a key-value label pair",
+	Fields: graphql.InputObjectConfigFieldMap{
+		"key": &graphql.InputObjectFieldConfig{
+			Type:        graphql.NewNonNull(graphql.String),
+			Description: "The label key (can contain dots and special characters)",
+		},
+		"value": &graphql.InputObjectFieldConfig{
+			Type:        graphql.NewNonNull(graphql.String),
+			Description: "The label value",
+		},
+	},
+})

gateway/schema/schema.go

@@ -446,9 +446,25 @@ func (g *Gateway) handleObjectFieldSpecType(fieldSpec spec.Schema, typePrefix st
 
 		return newType, newInputType, nil
 	} else if fieldSpec.AdditionalProperties != nil && fieldSpec.AdditionalProperties.Schema != nil {
-		// Hagndle map types
+		// Handle map types
 		if len(fieldSpec.AdditionalProperties.Schema.Type) == 1 && fieldSpec.AdditionalProperties.Schema.Type[0] == "string" {
-			// This is a map[string]string
+			// Check if this is a labels or annotations field
+			currentFieldName := ""
+			if len(fieldPath) > 0 {
+				currentFieldName = fieldPath[len(fieldPath)-1]
+			}
+
+			// Check if we're in a metadata context or processing a known ObjectMeta type
+			isInMetadata := len(fieldPath) >= 2 && fieldPath[len(fieldPath)-2] == "metadata"
+			isObjectMetaType := strings.Contains(typePrefix, "ObjectMeta") || strings.Contains(typePrefix, "meta_v1")
+
+			if (isInMetadata || isObjectMetaType) && (currentFieldName == "labels" || currentFieldName == "annotations") {
+				// This is a labels or annotations field
+				// Use List(LabelType) for output (allows querying key/value fields)
+				// Use List(LabelInputType) for input (supports array syntax)
+				return graphql.NewList(LabelType), graphql.NewList(LabelInputType), nil
+			}
+			// This is a regular map[string]string
 			return stringMapScalar, stringMapScalar, nil
 		}
 	}