tests: make medatada.distribution an object

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

schema/bom-1.7.xsd

@@ -256,21 +256,23 @@ limitations under the License.
                         Formal registration is optional.</xs:documentation>
                 </xs:annotation>
             </xs:element>
-            <xs:complexType name="distributionConstraints" minOccurs="0" maxOccurs="1">
+            <xs:element name="distributionConstraints" minOccurs="0" maxOccurs="1">
                 <xs:annotation>
                     <xs:documentation>Constraints of sharing and distribution of the data that the BOM describes.</xs:documentation>
                 </xs:annotation>
-                <xs:sequence>
-                    <xs:element name="tlp" type="bom:tlpClassificationType" default="CLEAR" minOccurs="0" maxOccurs="1">
-                        <xs:annotation>
-                            <xs:documentation>
-                                The Traffic Light Protocol (TLP) classification that controls the sharing and
-                                distribution of the data that the BOM describes.
-                            </xs:documentation>
-                        </xs:annotation>
-                    </xs:element>
-                </xs:sequence>
-            </xs:complexType>
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="tlp" type="bom:tlpClassificationType" default="CLEAR" minOccurs="0" maxOccurs="1">
+                            <xs:annotation>
+                                <xs:documentation>
+                                    The Traffic Light Protocol (TLP) classification that controls the sharing and
+                                    distribution of the data that the BOM describes.
+                                </xs:documentation>
+                            </xs:annotation>
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
             <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
                     <xs:documentation>

tools/src/test/resources/1.7/valid-metadata-distribution-1.7.json

@@ -5,7 +5,9 @@
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {
-    "distribution": "RED"
+    "distributionConstraints": {
+      "tlp": "RED"
+    }
   },
   "components": []
 }

tools/src/test/resources/1.7/valid-metadata-distribution-1.7.textproto

@@ -5,5 +5,7 @@ spec_version: "1.7"
 version: 1
 serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
 metadata {
-  distribution: TLP_CLASSIFICATION_RED
+  distributionConstraints {
+    tlp: TLP_CLASSIFICATION_RED
+  }
 }

tools/src/test/resources/1.7/valid-metadata-distribution-1.7.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
     <metadata>
-        <distribution>RED</distribution>
+        <distributionConstraints>
+            <tlp>RED</tlp>
+        </distributionConstraints>
     </metadata>
     <components />
 </bom>