Skip to content

Commit 56d0bc2

Browse files
JimFuller-RedHatJimFuller-RedHat
committed
remove old relationships
1 parent 19cca70 commit 56d0bc2

File tree

9 files changed

+78
-101
lines changed

9 files changed

+78
-101
lines changed

‎entity/src/relationship.rs

+14-42
Original file line numberDiff line numberDiff line change
@@ -20,64 +20,36 @@ use std::fmt;
2020
// When adding a new variant, also add this to the "relationship" table.
2121
pub enum Relationship {
2222
#[sea_orm(num_value = 0)]
23-
ContainedBy,
23+
Contains,
2424
#[sea_orm(num_value = 1)]
25-
DependencyOf,
25+
Dependency,
2626
#[sea_orm(num_value = 2)]
27-
DevDependencyOf,
27+
DevDependency,
2828
#[sea_orm(num_value = 3)]
29-
OptionalDependencyOf,
29+
OptionalDependency,
3030
#[sea_orm(num_value = 4)]
31-
ProvidedDependencyOf,
31+
ProvidedDependency,
3232
#[sea_orm(num_value = 5)]
33-
TestDependencyOf,
33+
TestDependency,
3434
#[sea_orm(num_value = 6)]
35-
RuntimeDependencyOf,
35+
RuntimeDependency,
3636
#[sea_orm(num_value = 7)]
37-
ExampleOf,
37+
Example,
3838
#[sea_orm(num_value = 8)]
39-
GeneratedFrom,
39+
Generates,
4040
#[sea_orm(num_value = 9)]
4141
AncestorOf,
4242
#[sea_orm(num_value = 10)]
43-
VariantOf,
43+
Variant,
4444
#[sea_orm(num_value = 11)]
45-
BuildToolOf,
45+
BuildTool,
4646
#[sea_orm(num_value = 12)]
47-
DevToolOf,
47+
DevTool,
4848
#[sea_orm(num_value = 13)]
49-
DescribedBy,
49+
Describes,
5050
#[sea_orm(num_value = 14)]
51-
PackageOf,
51+
Package,
5252
#[sea_orm(num_value = 15)]
53-
Contains,
54-
#[sea_orm(num_value = 16)]
55-
Dependency,
56-
#[sea_orm(num_value = 17)]
57-
DevDependency,
58-
#[sea_orm(num_value = 18)]
59-
OptionalDependency,
60-
#[sea_orm(num_value = 19)]
61-
ProvidedDependency,
62-
#[sea_orm(num_value = 20)]
63-
TestDependency,
64-
#[sea_orm(num_value = 21)]
65-
RuntimeDependency,
66-
#[sea_orm(num_value = 22)]
67-
Example,
68-
#[sea_orm(num_value = 23)]
69-
Generates,
70-
#[sea_orm(num_value = 24)]
71-
Variant,
72-
#[sea_orm(num_value = 25)]
73-
BuildTool,
74-
#[sea_orm(num_value = 26)]
75-
DevTool,
76-
#[sea_orm(num_value = 27)]
77-
Describes,
78-
#[sea_orm(num_value = 28)]
79-
Packages,
80-
#[sea_orm(num_value = 29)]
8153
Undefined,
8254
}
8355

‎migration/src/m0000860_normalise_relationships.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ use sea_orm_migration::prelude::*;
33
#[derive(DeriveMigrationName)]
44
pub struct Migration;
55
const DATA: [(i32, &str); 14] = [
6-
(16, "Contains"),
7-
(17, "Dependency"),
8-
(18, "DevDependency"),
9-
(19, "OptionalDependency"),
10-
(20, "ProvidedDependency"),
11-
(21, "TestDependency"),
12-
(22, "RuntimeDependency"),
13-
(23, "Example"),
14-
(24, "Generates"),
15-
(25, "Variant"),
16-
(26, "BuildTool"),
17-
(27, "DevTool"),
18-
(28, "Describes"),
19-
(29, "Packages"),
6+
(0, "Contains"),
7+
(1, "Dependency"),
8+
(2, "DevDependency"),
9+
(3, "OptionalDependency"),
10+
(4, "ProvidedDependency"),
11+
(5, "TestDependency"),
12+
(6, "RuntimeDependency"),
13+
(7, "Example"),
14+
(8, "Generates"),
15+
(10, "Variant"),
16+
(11, "BuildTool"),
17+
(12, "DevTool"),
18+
(13, "Describes"),
19+
(14, "Packages"),
2020
];
2121

2222
#[async_trait::async_trait]

‎modules/analysis/src/model/roots.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ mod test {
131131
relationship: None,
132132
ancestors: Some(vec![Node {
133133
ancestors: Some(vec![]),
134-
relationship: Some(Relationship::DependencyOf),
134+
relationship: Some(Relationship::Dependency), // TODO: Is this right ?
135135
..node("A")
136136
}]),
137137
descendants: None,
@@ -142,7 +142,7 @@ mod test {
142142
result,
143143
vec![Node {
144144
base: base("A"),
145-
relationship: Some(Relationship::DependencyOf),
145+
relationship: Some(Relationship::Dependency), // TODO: Is this right ?
146146
ancestors: Some(vec![]),
147147
descendants: None,
148148
}]
@@ -154,10 +154,10 @@ mod test {
154154
let result = vec![Node {
155155
ancestors: Some(vec![Node {
156156
base: base("AA"),
157-
relationship: Some(Relationship::DependencyOf),
157+
relationship: Some(Relationship::Dependency), // TODO: Is this right ?
158158
ancestors: Some(vec![Node {
159159
ancestors: Some(vec![]),
160-
relationship: Some(Relationship::DependencyOf),
160+
relationship: Some(Relationship::Dependency), // TODO: Is this right ?
161161
..node("A")
162162
}]),
163163
descendants: None,
@@ -170,7 +170,7 @@ mod test {
170170
result,
171171
vec![Node {
172172
base: base("A"),
173-
relationship: Some(Relationship::DependencyOf),
173+
relationship: Some(Relationship::Dependency), // TODO: Is this right ?
174174
ancestors: Some(vec![]),
175175
descendants: None,
176176
}]
@@ -182,10 +182,10 @@ mod test {
182182
let result = vec![Node {
183183
ancestors: Some(vec![Node {
184184
base: base("AA"),
185-
relationship: Some(Relationship::DependencyOf),
185+
relationship: Some(Relationship::Dependency), // TODO: Is this right ?
186186
ancestors: Some(vec![Node {
187187
ancestors: Some(vec![]),
188-
relationship: Some(Relationship::DependencyOf),
188+
relationship: Some(Relationship::Dependency), // TODO: Is this right ?
189189
..node("A")
190190
}]),
191191
descendants: None,
@@ -197,8 +197,8 @@ mod test {
197197
assert_eq!(
198198
result,
199199
vec![vec![
200-
(&base("AA"), Relationship::DependencyOf),
201-
(&base("A"), Relationship::DependencyOf),
200+
(&base("AA"), Relationship::Dependency), // TODO: Is this right ?
201+
(&base("A"), Relationship::Dependency), // TODO: Is this right ?
202202
]]
203203
);
204204
}

‎modules/analysis/src/service/load.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ impl AnalysisService {
292292
nodes.get(&edge.left_node_id),
293293
nodes.get(&edge.right_node_id),
294294
) {
295-
if edge.relationship == Relationship::DescribedBy {
295+
if edge.relationship == Relationship::Describes {
296296
describedby_node_id.push(*left);
297297
}
298298

‎modules/fundamental/src/sbom/service/sbom.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl SbomService {
210210
paginated,
211211
Which::Right,
212212
SbomNodeReference::All,
213-
Some(Relationship::DescribedBy),
213+
Some(Relationship::Describes), // TODO: Is this right ?
214214
db,
215215
)
216216
.await

‎modules/fundamental/tests/sbom/graph.rs

+27-24
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ async fn ingest_sboms(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
1818

1919
let sbom_v1 = system
2020
.ingest_sbom(
21-
("source", "http://sbom.com/test.json"),
21+
(
22+
"sour// TODO: Is this right ?ce",
23+
"http://sbom.com/test.json",
24+
),
2225
&Digests::digest("8"),
2326
Some("a".to_string()),
2427
(),
@@ -208,52 +211,52 @@ async fn transitive_dependency_of(ctx: &TrustifyContext) -> Result<(), anyhow::E
208211

209212
sbom1
210213
.ingest_package_relates_to_package(
211-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
212-
Relationship::DependencyOf,
213214
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
215+
Relationship::Dependency,
216+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
214217
&ctx.db,
215218
)
216219
.await?;
217220

218221
sbom1
219222
.ingest_package_relates_to_package(
220-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
221-
Relationship::DependencyOf,
222223
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
224+
Relationship::Dependency,
225+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
223226
&ctx.db,
224227
)
225228
.await?;
226229

227230
sbom1
228231
.ingest_package_relates_to_package(
229-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
230-
Relationship::DependencyOf,
231232
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
233+
Relationship::Dependency,
234+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
232235
&ctx.db,
233236
)
234237
.await?;
235238

236239
sbom1
237240
.ingest_package_relates_to_package(
238-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
239-
Relationship::DependencyOf,
240241
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
242+
Relationship::Dependency,
243+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
241244
&ctx.db,
242245
)
243246
.await?;
244247

245248
sbom1
246249
.ingest_package_relates_to_package(
247-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
248-
Relationship::DependencyOf,
249250
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
251+
Relationship::Dependency,
252+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
250253
&ctx.db,
251254
)
252255
.await?;
253256

254257
let _results = sbom1
255258
.related_packages_transitively(
256-
&[Relationship::DependencyOf],
259+
&[Relationship::Dependency],
257260
&"pkg:maven/io.quarkus/[email protected]".try_into()?,
258261
&ctx.db,
259262
)
@@ -282,9 +285,9 @@ async fn ingest_package_relates_to_package_dependency_of(
282285

283286
sbom1
284287
.ingest_package_relates_to_package(
285-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
286-
Relationship::DependencyOf,
287288
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
289+
Relationship::Dependency,
290+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
288291
&ctx.db,
289292
)
290293
.await?;
@@ -301,17 +304,17 @@ async fn ingest_package_relates_to_package_dependency_of(
301304

302305
sbom2
303306
.ingest_package_relates_to_package(
304-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
305-
Relationship::DependencyOf,
306307
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
308+
Relationship::Dependency,
309+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
307310
&ctx.db,
308311
)
309312
.await?;
310313

311314
let dependencies = fetch
312315
.related_packages(
313316
sbom1.sbom.sbom_id,
314-
Relationship::DependencyOf,
317+
Relationship::Dependency,
315318
"pkg:maven/io.quarkus/[email protected]",
316319
&ctx.db,
317320
)
@@ -334,7 +337,7 @@ async fn ingest_package_relates_to_package_dependency_of(
334337
let dependencies = fetch
335338
.related_packages(
336339
sbom2.sbom.sbom_id,
337-
Relationship::DependencyOf,
340+
Relationship::Dependency,
338341
"pkg:maven/io.quarkus/[email protected]",
339342
&ctx.db,
340343
)
@@ -381,27 +384,27 @@ async fn sbom_vulnerabilities(ctx: &TrustifyContext) -> Result<(), anyhow::Error
381384
log::debug!("-------------------- B");
382385

383386
sbom.ingest_package_relates_to_package(
384-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
385-
Relationship::DependencyOf,
386387
Purl::from_str("pkg:oci/[email protected]")?,
388+
Relationship::Dependency,
389+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
387390
&ctx.db,
388391
)
389392
.await?;
390393
log::debug!("-------------------- C");
391394

392395
sbom.ingest_package_relates_to_package(
393-
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
394-
Relationship::DependencyOf,
395396
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
397+
Relationship::Dependency,
398+
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
396399
&ctx.db,
397400
)
398401
.await?;
399402
log::debug!("-------------------- D");
400403

401404
sbom.ingest_package_relates_to_package(
402-
Purl::from_str("pkg:maven/postgres/[email protected]")?,
403-
Relationship::DependencyOf,
404405
Purl::from_str("pkg:maven/io.quarkus/[email protected]")?,
406+
Relationship::Dependency,
407+
Purl::from_str("pkg:maven/postgres/[email protected]")?,
405408
&ctx.db,
406409
)
407410
.await?;

‎modules/fundamental/tests/sbom/spdx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ async fn parse_spdx_quarkus(ctx: &TrustifyContext) -> Result<(), anyhow::Error>
5757
let contains = service
5858
.related_packages(
5959
sbom.sbom.sbom_id,
60-
Relationship::ContainedBy,
60+
Relationship::Contains, // TODO: Is this right ?
6161
first,
6262
&ctx.db,
6363
)
@@ -93,7 +93,7 @@ async fn test_parse_spdx(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
9393
Default::default(),
9494
Which::Right,
9595
first,
96-
Some(Relationship::ContainedBy),
96+
Some(Relationship::Contains), //TODO: Is this right ?
9797
&ctx.db,
9898
)
9999
.await?

‎modules/ingestor/src/graph/sbom/mod.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ impl SbomContext {
492492
fn query_describes_packages(&self) -> Select<sbom_package::Entity> {
493493
sbom_package::Entity::find()
494494
.filter(sbom::Column::SbomId.eq(self.sbom.sbom_id))
495-
.filter(package_relates_to_package::Column::Relationship.eq(Relationship::DescribedBy))
495+
.filter(package_relates_to_package::Column::Relationship.eq(Relationship::Describes))
496496
.select_only()
497497
.join(JoinType::Join, sbom_package::Relation::Sbom.def())
498498
.join(JoinType::Join, sbom_package::Relation::Node.def())
@@ -663,7 +663,7 @@ impl SbomContext {
663663
) -> anyhow::Result<()> {
664664
self.ingest_package_relates_to_package(
665665
RelationshipReference::Root,
666-
Relationship::DescribedBy,
666+
Relationship::Describes,
667667
RelationshipReference::Purl(package),
668668
connection,
669669
)
@@ -678,8 +678,9 @@ impl SbomContext {
678678
connection: &C,
679679
) -> anyhow::Result<()> {
680680
self.ingest_package_relates_to_package(
681+
// TODO: Is this right ?
681682
RelationshipReference::Root,
682-
Relationship::DescribedBy,
683+
Relationship::Describes,
683684
RelationshipReference::Cpe(cpe),
684685
connection,
685686
)

0 commit comments

Comments
 (0)