Fix the LifecycleConfiguration schema

Author: fvennetier

doc/rnc/lifecycle_configuration.rnc

@@ -24,16 +24,21 @@ Expiration =
   element ExpiredObjectDeleteMarker { xsd:boolean }
 
 Filter =
-  element Prefix { xsd:string }? &
-  element Tag {
-    element Key { xsd:string } &
-    element Value { xsd:string }
-  }*
+  element Prefix { xsd:string } |
+  element Tag { Tag } |
+  element And {
+      element Prefix { xsd:string }? &
+      element Tag { Tag }+
+  }
 
 NoncurrentVersionTransition =
   element NoncurrentDays { xsd:nonNegativeInteger } &
   element StorageClass { StorageClass }
 
+Tag =
+  element Key { xsd:string } &
+  element Value { xsd:string }
+
 Transition =
   Expiration &
   element StorageClass { StorageClass }

swift3/schema/lifecycle_configuration.rng

@@ -68,25 +68,28 @@
     </choice>
   </define>
   <define name="Filter">
-    <interleave>
-      <optional>
-        <element name="Prefix">
-          <data type="string"/>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <element name="Tag">
-          <interleave>
-            <element name="Key">
+    <choice>
+      <element name="Prefix">
+        <data type="string"/>
+      </element>
+      <element name="Tag">
+        <ref name="Tag"/>
+      </element>
+      <element name="And">
+        <interleave>
+          <optional>
+            <element name="Prefix">
               <data type="string"/>
             </element>
-            <element name="Value">
-              <data type="string"/>
+          </optional>
+          <oneOrMore>
+            <element name="Tag">
+              <ref name="Tag"/>
             </element>
-          </interleave>
-        </element>
-      </zeroOrMore>
-    </interleave>
+          </oneOrMore>
+        </interleave>
+      </element>
+    </choice>
   </define>
   <define name="NoncurrentVersionTransition">
     <interleave>
@@ -98,6 +101,16 @@
       </element>
     </interleave>
   </define>
+  <define name="Tag">
+    <interleave>
+      <element name="Key">
+        <data type="string"/>
+      </element>
+      <element name="Value">
+        <data type="string"/>
+      </element>
+    </interleave>
+  </define>
   <define name="Transition">
     <interleave>
       <ref name="Expiration"/>