Another attempt to fix approval handling desired state

Signed-off-by: Yury Tsarev <yury@upbound.io>

Author: ytsarev

fn.go

@@ -152,13 +152,33 @@ func (f *Function) handleApprovedChanges(req *fnv1.RunFunctionRequest, in *v1bet
 		return err
 	}
 
-	// For approved changes, we need to ensure we properly handle both
-	// the composite resource and composed resources to avoid duplication
+	// For approved changes, we need to properly pass through the entire desired state
+	// from the previous function, including both the XR and composed resources
 
-	// Keep only the composed resources, not the main XR (which is handled via saveOldHash)
-	// This avoids duplication in the render output
-	if req.GetDesired().GetResources() != nil {
-		rsp.Desired.Resources = req.GetDesired().GetResources()
+	// Get the desired composite resource
+	dxr, err := request.GetDesiredCompositeResource(req)
+	if err != nil {
+		response.Fatal(rsp, errors.Wrap(err, "cannot get desired composite resource"))
+		return err
+	}
+
+	// Set the desired composite resource in the response
+	if err := response.SetDesiredCompositeResource(rsp, dxr); err != nil {
+		response.Fatal(rsp, errors.Wrapf(err, "cannot set desired composite resource in %T", rsp))
+		return err
+	}
+
+	// Get the desired composed resources using the SDK
+	desired, err := request.GetDesiredComposedResources(req)
+	if err != nil {
+		response.Fatal(rsp, errors.Wrapf(err, "cannot get desired resources from %T", req))
+		return err
+	}
+	
+	// Set the desired composed resources in the response
+	if err := response.SetDesiredComposedResources(rsp, desired); err != nil {
+		response.Fatal(rsp, errors.Wrapf(err, "cannot set desired composed resources in %T", rsp))
+		return err
 	}
 
 	// Set success condition