From 97049ff833f6143c82bd43ca081ece5541cdd2dd Mon Sep 17 00:00:00 2001
From: Alex Stuart <alex.stuart@jisc.ac.uk>
Date: Fri, 17 Sep 2021 12:36:52 +0100
Subject: [PATCH] Impose stable ordering on eduGAIN verify target

See ukf/ukf-meta#323 for details
---
 mdx/int_edugain/verbs.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 066fed2..de8ca00 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -98,6 +98,21 @@
                     p:whitelistingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
+                <!--
+                    Sort the remaining entities by entity ID, so that any errors
+                    are reported in a stable order, even if some registrars
+                    have unstable output.
+
+                    Ideally this should be handled by an explicit ordering stage.
+                    Lacking one, we use the fact that we can use the ordering
+                    strategy ability of the EntitiesDescriptor assembler to
+                    order entities, and then disassemble again. Ordering is based
+                    on the ItemID populated into the item metadata.
+                -->
+                <ref bean="populateItemIds"/>
+                <ref bean="uk_assemble"/>
+                <ref bean="disassemble"/>
+
                 <ref bean="standardImportActions"/>
                 <ref bean="edugainPolicy"/>
                 <ref bean="warningAndErrorAnnouncer"/>