From 170af3942ceeb4a309a654ce2b80c962ddd44b7d Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 7 Mar 2022 15:06:07 +0000
Subject: [PATCH] remove UKFederationMember label from fallback and wayf
 aggregates

---
 mdx/uk/README.md               | 2 --
 mdx/uk/beans.xml               | 7 -------
 mdx/uk/generate.xml            | 2 --
 mdx/uk/mdq-multisign.xml       | 3 ---
 mdx/uk/statistics-charting.xsl | 3 ---
 mdx/uk/strip_extensions.xsl    | 5 +----
 6 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/mdx/uk/README.md b/mdx/uk/README.md
index 815de940..ed2552bc 100644
--- a/mdx/uk/README.md
+++ b/mdx/uk/README.md
@@ -75,7 +75,5 @@ Status:
 
 Status:
 
-* The `production` aggregate does not include the `<UKFederationMember>` label (`ukf-meta#34`).
-
 * The `production` aggregate adds `<EncryptionMethod>` elements with AES128-CBC
   to SPs that have no block encryption methods listed
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 3fea6ec7..4ae862cf 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -475,13 +475,6 @@
         p:XSLResource="classpath:uk/strip_extensions.xsl"/>
 
 
-    <!--
-        uk_strip_UKFederationMember
-    -->
-    <bean id="uk_strip_UKFederationMember" parent="mda.ElementStrippingStage"
-        p:elementNamespace-ref="ukfedlabel_namespace"
-        p:elementName="UKFederationMember"/>
-
     <!--
         ***********************************************
         ***                                         ***
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index ddd7a665..4e4feae4 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -302,7 +302,6 @@
                 <bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
                     p:flowName="production"/>
 
-                <ref bean="uk_strip_UKFederationMember"/>
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
@@ -672,7 +671,6 @@
                 <bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
                     p:flowName="test"/>
 
-                <ref bean="uk_strip_UKFederationMember"/>
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml
index a32e00ef..7fd2b581 100644
--- a/mdx/uk/mdq-multisign.xml
+++ b/mdx/uk/mdq-multisign.xml
@@ -51,9 +51,6 @@
                     </property>
                 </bean>
 
-                <!-- Remove UKFederationLabel elements. -->
-                <ref bean="uk_strip_UKFederationMember"/>
-
                 <!--
                     Remove xsi elements and attributes.
 
diff --git a/mdx/uk/statistics-charting.xsl b/mdx/uk/statistics-charting.xsl
index 3036fce5..04ae4dc4 100644
--- a/mdx/uk/statistics-charting.xsl
+++ b/mdx/uk/statistics-charting.xsl
@@ -71,9 +71,6 @@
         <xsl:variable name="dualEntities" select="$entities[md:IDPSSODescriptor][md:SPSSODescriptor]"/>
         <xsl:variable name="dualEntityCount" select="count($dualEntities)"/>
 
-        <xsl:variable name="federationMemberEntityCount"
-            select="count($entities[md:Extensions/ukfedlabel:UKFederationMember])"/>
-
         <xsl:variable name="memberEntities"
             select="dyn:closure($members/members:Name, '$entities[md:Organization/md:OrganizationName = current()]')"/>
         <xsl:variable name="memberEntityCount"
diff --git a/mdx/uk/strip_extensions.xsl b/mdx/uk/strip_extensions.xsl
index 176baabb..2341cd84 100644
--- a/mdx/uk/strip_extensions.xsl
+++ b/mdx/uk/strip_extensions.xsl
@@ -20,15 +20,12 @@
     <!--
         Pass through certain ukfedlabel namespace elements.
     -->
-    <xsl:template match="ukfedlabel:UKFederationMember | ukfedlabel:AccountableUsers">
+    <xsl:template match="ukfedlabel:AccountableUsers">
         <xsl:copy>
             <!--
                 Copy nested text and comments, but not attributes.
 
                 AccountableUsers does not have any attributes.
-
-                UKFederationMember does not have any attributes intended for
-                publication.
             -->
             <xsl:apply-templates select="text()|comment()"/>
         </xsl:copy>