Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Apply flow constraints in the main tooling flows
See ukf/ukf-meta#67.
iay committed Feb 20, 2020
1 parent 2927258 commit dfe97c9
Showing 4 changed files with 55 additions and 1 deletion.
6 changes: 6 additions & 0 deletions mdx/uk/beans.xml
@@ -355,6 +355,8 @@

<ref bean="populateItemIds"/>
<ref bean="uk_populateIds"/>
<bean id="uk_populateFlowConstraints"
parent="ukf.EntityDescriptorFlowConstraintPopulationStage"/>
<ref bean="uk_default_regauth"/>
<ref bean="populateRegistrationAuthorities"/>

@@ -531,6 +533,10 @@
<bean id="uk_statisticsPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="statistics"/>

<ref bean="assemble"/>
<ref bean="uk_generateStatistics"/>
<ref bean="uk_serializeStatistics"/>
2 changes: 2 additions & 0 deletions mdx/uk/check_uk_extensions.xsl
@@ -73,6 +73,8 @@
<xsl:template match="md:EntityDescriptor/md:Extensions/mdrpi:RegistrationInfo"/>
<xsl:template match="md:EntityDescriptor/md:Extensions/shibmd:Scope"/>
<xsl:template match="md:EntityDescriptor/md:Extensions/ukfedlabel:AccountableUsers"/>
<xsl:template match="md:EntityDescriptor/md:Extensions/ukfedlabel:DisableFlow"/>
<xsl:template match="md:EntityDescriptor/md:Extensions/ukfedlabel:EnableFlow"/>
<xsl:template match="md:EntityDescriptor/md:Extensions/ukfedlabel:ExportOptIn"/>
<xsl:template match="md:EntityDescriptor/md:Extensions/ukfedlabel:ExportOptOut"/>
<xsl:template match="md:EntityDescriptor/md:Extensions/ukfedlabel:Software"/>
28 changes: 28 additions & 0 deletions mdx/uk/generate.xml
@@ -298,6 +298,10 @@
<bean id="uk_productionPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="production"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
@@ -353,6 +357,10 @@
<bean id="uk_wayfPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="wayf"/>

<!--
Remove SIRTFI metadata.
-->
@@ -476,6 +484,10 @@
<bean id="CDSAllPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="cdsall"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
@@ -543,6 +555,10 @@
<bean id="uk_fallbackPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="fallback"/>

<bean id="removeFallbackBlocklist" parent="mda.EntityFilterStage"
p:whitelistingEntities="false"
p:designatedEntities-ref="fallbackEntityBlocklist"/>
@@ -603,6 +619,10 @@
<bean id="uk_testPipeline" parent="mda.CompositeStage">
<property name="composedStages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="test"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
@@ -663,6 +683,10 @@
<bean id="uk_exportPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="export"/>

<!--
Additional rules excluding entities from the aggregate.
@@ -763,6 +787,10 @@
<bean id="uk_exportPreviewPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="export-preview"/>

<!--
Additional rules excluding entities from the aggregate.
20 changes: 19 additions & 1 deletion mdx/uk/verbs.xml
@@ -39,6 +39,19 @@
<property name="stages">
<list>
<ref bean="uk_registeredEntities"/>

<!--
The rest of the pipeline is a duplicate of the
uk_statisticsPipeline bean definition. It would
be better to use that, but Pipeline isn't a thing
that can appear within another Pipeline at
present (MDA 0.9.x).
-->

<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="statistics"/>

<ref bean="assemble"/>
<ref bean="uk_generateStatistics"/>
<ref bean="uk_serializeStatistics"/>
@@ -49,12 +62,17 @@
<!--
statistics.charting
Stand-along statistics generation for charting.
Stand-alone statistics generation for charting.
-->
<bean id="statistics.charting" parent="mda.SimplePipeline">
<property name="stages">
<list>
<ref bean="uk_registeredEntities"/>

<!-- Apply flow constraints for this flow. -->
<bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
p:flowName="statistics"/>

<ref bean="assemble"/>
<bean parent="mda.XSLTransformationStage"
p:XSLResource="classpath:uk/statistics-charting.xsl">

0 comments on commit dfe97c9

Please sign in to comment.