Skip to content

Commit d7305b9

Browse files
jkowalleckjkowalleck
committed
wip
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 3614848 commit d7305b9

File tree

5 files changed

+74
-25
lines changed

5 files changed

+74
-25
lines changed

‎schema/bom-1.7.proto‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2618,20 +2618,38 @@ enum PatentAssertionType {
26182618
PATENT_ASSERTION_TYPE_RESEARCH_OR_EVALUATION = 8;
26192619
}
26202620

2621-
// At least one of the "attributedTo" or "process" elements must be present. This is equivalent to the "anyOf" constraint in the JSON schema.
2621+
// Details a specific attribution of data within the BOM to a contributing entity or process.
26222622
message Citation {
2623+
message Pointers {
2624+
// Users of other serialisation formats (e.g. XML) shall use the JSON Pointer format to ensure consistent field referencing across representations.
2625+
// Must contain at least 1 item.
2626+
repeated string pointer = 1;
2627+
}
2628+
message Expressions {
2629+
// Specifies a path expression used to locate a value within a BOM. The expression syntax shall conform to the format of the BOM's serialisation.
2630+
// Use [JSONPath](https://datatracker.ietf.org/doc/html/rfc9535) for JSON, [XPath](https://www.w3.org/TR/xpath/) for XML, and default to JSONPath for Protocol Buffers unless otherwise specified.
2631+
// Implementers shall ensure the expression is valid within the context of the applicable serialisation format. Use either "pointer" or "expression" but not both in this object.
2632+
// Must contain at least 1 item.
2633+
repeated string expression = 1;
2634+
}
2635+
26232636
// Optional unique identifier for the citation
26242637
optional string bom_ref = 1;
2625-
// One or more JSON Pointers(https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM fields to which the attribution applies.
2626-
repeated string pointer = 2;
2627-
// Specifies a path expression used to locate a value within a BOM. The expression syntax shall conform to the format of the BOM's serialisation. Use [JSONPath](https://datatracker.ietf.org/doc/html/rfc9535) for JSON, [XPath](https://www.w3.org/TR/xpath/) for XML, and default to JSONPath for Protocol Buffers unless otherwise specified. Implementers shall ensure the expression is valid within the context of the applicable serialisation format. Use either "pointer" or "expression" but not both in this object.
2628-
repeated string expression = 3;
2638+
// Exactly one of the "pointers" or "expressions" elements must be present.
2639+
oneof target {
2640+
// One or more JSON Pointers(https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM fields to which the attribution applies.
2641+
Pointers pointers = 2;
2642+
// One or more path expressions used to locate values within a BOM.
2643+
Expressions expressions = 3;
2644+
}
26292645
// Timestamp when the attribution was made or the information was supplied.
26302646
google.protobuf.Timestamp timestamp = 4;
2631-
// The `bom-ref` of an object, such as a component, service, organisational entity, or person that supplied the cited information.
2647+
// The `bom-ref` of an object, such as a component, service, tool, organisational entity, or person that supplied the cited information.
2648+
// At least one of the "attributed_to" or "process" elements must be present.
26322649
optional string attributed_to = 5;
2633-
// An optional `bom-ref` to a process (such as a formula, workflow, task, or step) defined in the `formulation` section that executed or generated the attributed data. At least one of the "attributedTo" or "process" elements must be present.
2650+
// The `bom-ref` to a process (such as a formula, workflow, task, or step) defined in the `formulation` section that executed or generated the attributed data.
2651+
// At least one of the "attributed_to" or "process" elements must be present.
26342652
optional string process = 6;
2635-
// An optional description or comment about the context or quality of the data attribution. At least one of the "attributedTo" or "process" elements must be present.
2653+
// An optional description or comment about the context or quality of the data attribution.
26362654
optional string note = 7;
26372655
}

‎schema/bom-1.7.schema.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6125,43 +6125,43 @@
61256125
"$ref": "#/definitions/refType",
61266126
"title": "BOM Reference"
61276127
},
6128-
"attributedTo": {
6129-
"$ref": "#/definitions/refLinkType",
6130-
"title": "Attributed To",
6131-
"description": "The `bom-ref` of an object, such as a component, service, organisational entity, or person that supplied the cited information."
6132-
},
61336128
"pointers": {
61346129
"type": "array",
61356130
"items": {
61366131
"type": "string",
61376132
"title": "Field Reference",
6138-
"description": "A [JSON Pointer](https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM field to which the attribution applies. Users of other serialisation formats (e.g. XML) shall use the JSON Pointer format to ensure consistent field referencing across representations."
6133+
"description": "A [JSON Pointer](https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM field to which the attribution applies.\nUsers of other serialisation formats (e.g. XML) shall use the JSON Pointer format to ensure consistent field referencing across representations."
61396134
},
61406135
"minItems": 1,
61416136
"title": "Field References",
6142-
"description": "One or more [JSON Pointers](https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM fields to which the attribution applies."
6137+
"description": "One or more [JSON Pointers](https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM fields to which the attribution applies.\nExactly one of the \"pointers\" or \"expressions\" elements must be present."
61436138
},
61446139
"expressions": {
61456140
"type": "array",
61466141
"items": {
61476142
"type": "string",
61486143
"title": "Path Expression",
6149-
"description": "Specifies a path expression used to locate a value within a BOM. The expression syntax shall conform to the format of the BOM's serialisation. Use [JSONPath](https://datatracker.ietf.org/doc/html/rfc9535) for JSON, [XPath](https://www.w3.org/TR/xpath/) for XML, and default to JSONPath for Protocol Buffers unless otherwise specified. Implementers shall ensure the expression is valid within the context of the applicable serialisation format."
6144+
"description": "Specifies a path expression used to locate a value within a BOM. The expression syntax shall conform to the format of the BOM's serialisation.\nUse [JSONPath](https://datatracker.ietf.org/doc/html/rfc9535) for JSON, [XPath](https://www.w3.org/TR/xpath/) for XML, and default to JSONPath for Protocol Buffers unless otherwise specified.\nImplementers shall ensure the expression is valid within the context of the applicable serialisation format."
61506145
},
61516146
"minItems": 1,
61526147
"title": "Path Expressions",
6153-
"description": "One or more path expressions used to locate values within a BOM."
6148+
"description": "One or more path expressions used to locate values within a BOM.\nExactly one of the \"pointers\" or \"expressions\" elements must be present."
61546149
},
61556150
"timestamp": {
61566151
"type": "string",
61576152
"format": "date-time",
61586153
"title": "Timestamp",
61596154
"description": "The date and time when the attribution was made or the information was supplied."
61606155
},
6156+
"attributedTo": {
6157+
"$ref": "#/definitions/refLinkType",
6158+
"title": "Attributed To",
6159+
"description": "The `bom-ref` of an object, such as a component, service, tool, organisational entity, or person that supplied the cited information.\nAt least one of the \"attributedTo\" or \"process\" elements must be present."
6160+
},
61616161
"process": {
61626162
"$ref": "#/definitions/refLinkType",
61636163
"title": "Process Reference",
6164-
"description": "An optional `bom-ref` to a process (such as a formula, workflow, task, or step) defined in the `formulation` section that executed or generated the attributed data."
6164+
"description": "The `bom-ref` to a process (such as a formula, workflow, task, or step) defined in the `formulation` section that executed or generated the attributed data.\nAt least one of the \"attributedTo\" or \"process\" elements must be present."
61656165
},
61666166
"note": {
61676167
"type": "string",

‎schema/bom-1.7.xsd‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8883,10 +8883,15 @@ limitations under the License.
88838883
<xs:complexType name="citationType">
88848884
<xs:annotation>
88858885
<xs:documentation>
8886-
At least one of the "attributedTo" or "process" elements must be present. This is equivalent to the "anyOf" constraint in the JSON schema.
8886+
Details a specific attribution of data within the BOM to a contributing entity or process.
88878887
</xs:documentation>
88888888
</xs:annotation>
88898889
<xs:sequence>
8890+
<xs:annotation>
8891+
<xs:documentation>
8892+
Exactly one of the "pointers" or "expressions" elements must be present.
8893+
</xs:documentation>
8894+
</xs:annotation>
88908895
<xs:choice>
88918896
<xs:element name="pointers" minOccurs="1" maxOccurs="1">
88928897
<xs:annotation>
@@ -8899,7 +8904,8 @@ limitations under the License.
88998904
<xs:element name="pointer" type="xs:string" minOccurs="1" maxOccurs="unbounded">
89008905
<xs:annotation>
89018906
<xs:documentation>
8902-
A JSON Pointer(https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM field to which the attribution applies. Users of other serialisation formats (e.g. XML) shall use the JSON Pointer format to ensure consistent field referencing across representations.
8907+
A JSON Pointer(https://datatracker.ietf.org/doc/html/rfc6901) identifying the BOM field to which the attribution applies.
8908+
Users of other serialisation formats (e.g. XML) shall use the JSON Pointer format to ensure consistent field referencing across representations.
89038909
</xs:documentation>
89048910
</xs:annotation>
89058911
</xs:element>
@@ -8917,7 +8923,9 @@ limitations under the License.
89178923
<xs:element name="expression" type="xs:string" minOccurs="1" maxOccurs="unbounded">
89188924
<xs:annotation>
89198925
<xs:documentation>
8920-
Specifies a path expression used to locate a value within a BOM. The expression syntax shall conform to the format of the BOM's serialisation. Use [JSONPath](https://datatracker.ietf.org/doc/html/rfc9535) for JSON, [XPath](https://www.w3.org/TR/xpath/) for XML, and default to JSONPath for Protocol Buffers unless otherwise specified. Implementers shall ensure the expression is valid within the context of the applicable serialisation format.
8926+
Specifies a path expression used to locate a value within a BOM. The expression syntax shall conform to the format of the BOM's serialisation.
8927+
Use [JSONPath](https://datatracker.ietf.org/doc/html/rfc9535) for JSON, [XPath](https://www.w3.org/TR/xpath/) for XML, and default to JSONPath for Protocol Buffers unless otherwise specified.
8928+
Implementers shall ensure the expression is valid within the context of the applicable serialisation format.
89218929
</xs:documentation>
89228930
</xs:annotation>
89238931
</xs:element>
@@ -8935,7 +8943,7 @@ limitations under the License.
89358943
<xs:element name="attributedTo" type="bom:refLinkType" minOccurs="0" maxOccurs="1">
89368944
<xs:annotation>
89378945
<xs:documentation>
8938-
The `bom-ref` of an object, such as a component, service, organisational entity, or person that supplied the cited information.
8946+
The `bom-ref` of an object, such as a component, service, tool, organisational entity, or person that supplied the cited information.
89398947
At least one of the "attributedTo" or "process" elements must be present.
89408948
</xs:documentation>
89418949
</xs:annotation>

‎tools/src/test/resources/1.7/invalid-citations-1.7.textproto‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# proto-file: schema/bom-1.7.proto
2+
# proto-message: Bom
3+
4+
spec_version: "1.7"
5+
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
6+
version: 1
7+
8+
metadata {
9+
timestamp {
10+
seconds: 1754424907
11+
nanos: 0
12+
}
13+
}
14+
15+
components {
16+
type: CLASSIFICATION_LIBRARY
17+
bom_ref: "component-1"
18+
name: "example-lib"
19+
version: "1.2.3"
20+
21+
}
22+
23+
// continue here

‎tools/src/test/resources/1.7/valid-citations-1.7.textproto‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ components {
3232
citations [
3333
{
3434
bom_ref: "citation-1"
35-
pointer: "/components/0/name"
35+
pointers: { pointer: "/components/0/name" }
3636
timestamp: {
3737
seconds: 1746108000
3838
nanos: 0
@@ -42,7 +42,7 @@ citations [
4242
},
4343
{
4444
bom_ref: "citation-1"
45-
pointer: "/components/0/name"
45+
pointers: { pointer: "/components/0/name" }
4646
timestamp: {
4747
seconds: 1746108000
4848
nanos: 0
@@ -52,7 +52,7 @@ citations [
5252
},
5353
{
5454
bom_ref: "citation-3"
55-
expression: "$.components[*].licenses[*].license.id"
55+
expressions: { expression: "$.components[*].licenses[*].license.id" }
5656
timestamp: {
5757
seconds: 1746108000
5858
nanos: 0

0 commit comments

Comments
 (0)