fix: extra-resources

Author: devthejo

pkg/grpc/handler.go

@@ -87,10 +87,11 @@ func parseInput(req *fnv1.RunFunctionRequest) (*types.XFuncJSInput, error) {
 
 // prepareResources prepares the resources from the request
 type resourceBundle struct {
-	oxr      *resource.Composite
-	dxr      *resource.Composite
-	observed map[resource.Name]resource.ObservedComposed
-	desired  map[resource.Name]*resource.DesiredComposed
+	oxr            *resource.Composite
+	dxr            *resource.Composite
+	observed       map[resource.Name]resource.ObservedComposed
+	desired        map[resource.Name]*resource.DesiredComposed
+	extraResources map[string][]resource.Extra
 }
 
 func prepareResources(req *fnv1.RunFunctionRequest) (*resourceBundle, error) {
@@ -123,16 +124,17 @@ func prepareResources(req *fnv1.RunFunctionRequest) (*resourceBundle, error) {
 	}
 
 	// Get extra resources
-	_, err = request.GetExtraResources(req)
+	extraResources, err := request.GetExtraResources(req)
 	if err != nil {
 		return nil, errors.Wrapf(err, "cannot get extra resources from %T", req)
 	}
 
 	return &resourceBundle{
-		oxr:      oxr,
-		dxr:      dxr,
-		observed: observed,
-		desired:  desired,
+		oxr:            oxr,
+		dxr:            dxr,
+		observed:       observed,
+		desired:        desired,
+		extraResources: extraResources,
 	}, nil
 }
 
@@ -153,6 +155,19 @@ func createEnhancedInput(xfuncjsInput *types.XFuncJSInput, resources *resourceBu
 		},
 	}
 
+	// Add extra resources if present
+	if len(resources.extraResources) > 0 {
+		extraResourcesMap := make(map[string]interface{})
+		for name, extras := range resources.extraResources {
+			extrasList := make([]interface{}, len(extras))
+			for i, extra := range extras {
+				extrasList[i] = extra.Resource.UnstructuredContent()
+			}
+			extraResourcesMap[name] = extrasList
+		}
+		enhancedInput["extraResources"] = extraResourcesMap
+	}
+
 	// Convert the enhanced input to JSON
 	enhancedInputJSON, err := json.Marshal(enhancedInput)
 	if err != nil {
@@ -233,6 +248,21 @@ func buildResponse(rsp *fnv1.RunFunctionResponse, jsResponse *JSResponse, resour
 		}
 	}
 
+	// Process extra resource requirements if present
+	if len(jsResponse.ExtraResourceRequirements) > 0 {
+		extraResources := make(map[string]*fnv1.ResourceSelector)
+		for name, requirement := range jsResponse.ExtraResourceRequirements {
+			extraResources[name] = requirement.ToResourceSelector()
+			log.Debug("Requesting ExtraResources", "name", name, "selector", extraResources[name])
+		}
+
+		// Set requirements in the response
+		if rsp.Requirements == nil {
+			rsp.Requirements = &fnv1.Requirements{}
+		}
+		rsp.Requirements.ExtraResources = extraResources
+	}
+
 	// Process context data if present
 	if err := processContext(rsp, jsResponse, log); err != nil {
 		return err

pkg/grpc/localresource.go

@@ -16,6 +16,43 @@ type JSResponse struct {
 	Events []CreateEvent `json:"events,omitempty"`
 	// Context is a map of context data to add to the response
 	Context map[string]interface{} `json:"context,omitempty"`
+	// ExtraResourceRequirements is a map of resource name to resource requirements
+	ExtraResourceRequirements map[string]ExtraResourceRequirement `json:"extraResourceRequirements,omitempty"`
+}
+
+// ExtraResourceRequirement defines a requirement for extra resources
+type ExtraResourceRequirement struct {
+	// APIVersion of the resource
+	APIVersion string `json:"apiVersion"`
+	// Kind of the resource
+	Kind string `json:"kind"`
+	// MatchLabels defines the labels to match the resource
+	MatchLabels map[string]string `json:"matchLabels,omitempty"`
+	// MatchName defines the name to match the resource
+	MatchName string `json:"matchName,omitempty"`
+}
+
+// ToResourceSelector converts the ExtraResourceRequirement to a fnv1.ResourceSelector
+func (e *ExtraResourceRequirement) ToResourceSelector() *fnv1.ResourceSelector {
+	out := &fnv1.ResourceSelector{
+		ApiVersion: e.APIVersion,
+		Kind:       e.Kind,
+	}
+
+	if e.MatchName == "" && len(e.MatchLabels) > 0 {
+		out.Match = &fnv1.ResourceSelector_MatchLabels{
+			MatchLabels: &fnv1.MatchLabels{Labels: e.MatchLabels},
+		}
+		return out
+	}
+
+	if e.MatchName != "" {
+		out.Match = &fnv1.ResourceSelector_MatchName{
+			MatchName: e.MatchName,
+		}
+	}
+
+	return out
 }
 
 // JSResource represents a resource in the JavaScript function response