update dependency schema to make dependent_package_version_id required (

guacsec#2060) * update dependency schema to make dependent_package_version_id required Signed-off-by: pxp928 <[email protected]> * update dependent_package_version_id to be not null on dependency table Signed-off-by: pxp928 <[email protected]> --------- Signed-off-by: pxp928 <[email protected]>
mrizzi · Aug 6, 2024 · c4b6a42 · c4b6a42
1 parent 5e25e14
commit c4b6a42
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 78 deletions.
diff --git a/pkg/assembler/backends/ent/dependency/where.go b/pkg/assembler/backends/ent/dependency/where.go
diff --git a/pkg/assembler/backends/ent/dependency_create.go b/pkg/assembler/backends/ent/dependency_create.go
diff --git a/pkg/assembler/backends/ent/dependency_update.go b/pkg/assembler/backends/ent/dependency_update.go
diff --git a/pkg/assembler/backends/ent/gql_edge.go b/pkg/assembler/backends/ent/gql_edge.go
diff --git a/pkg/assembler/backends/ent/migrate/migrations/20240802204508_ent_diff.sql b/pkg/assembler/backends/ent/migrate/migrations/20240802204508_ent_diff.sql
@@ -0,0 +1,2 @@
+-- Modify "dependencies" table
+ALTER TABLE "dependencies" ALTER COLUMN "dependent_package_version_id" SET NOT NULL;
diff --git a/pkg/assembler/backends/ent/migrate/migrations/atlas.sum b/pkg/assembler/backends/ent/migrate/migrations/atlas.sum
@@ -1,7 +1,8 @@
-h1:2v3i5iU6MalDXCn9jNXp+75vnIcNccKwMbKG2r1uBkc=
+h1:mYbfXOAYvSgAht05+9wroDncH1ZJDdll9KZ1sDjie30=
 20240503123155_baseline.sql h1:oZtbKI8sJj3xQq7ibfvfhFoVl+Oa67CWP7DFrsVLVds=
 20240626153721_ent_diff.sql h1:FvV1xELikdPbtJk7kxIZn9MhvVVoFLF/2/iT/wM5RkA=
 20240702195630_ent_diff.sql h1:y8TgeUg35krYVORmC7cN4O96HqOc3mVO9IQ2lYzIzwg=
 20240712131658_ent_diff.sql h1:N54EB3Wh2NC2v9RToXo/BfpezLnSeHJBP1ha6VXfxD8=
 20240712193834_ent_diff.sql h1:gHTfEzlqvgYi6NKwT/Mb+wooWsVjAkp98zfg1OvdoZw=
 20240716182144_ent_diff.sql h1:Pm0/+7zkBUGOY/AiF3bCJzW8giL5+uSg/j/0SUDsuNg=
+20240802204508_ent_diff.sql h1:+qucLy0vqkEDoJsfG4Phh+babyGB5Ud/Dn0+WNB6BLY=
diff --git a/pkg/assembler/backends/ent/migrate/schema.go b/pkg/assembler/backends/ent/migrate/schema.go
diff --git a/pkg/assembler/backends/ent/mutation.go b/pkg/assembler/backends/ent/mutation.go
diff --git a/pkg/assembler/backends/ent/schema/dependency.go b/pkg/assembler/backends/ent/schema/dependency.go
@@ -46,7 +46,7 @@ func (Dependency) Fields() []ent.Field {
 			Unique().
 			Immutable(),
 		field.UUID("package_id", getUUIDv7()),
-		field.UUID("dependent_package_version_id", getUUIDv7()).Optional(),
+		field.UUID("dependent_package_version_id", getUUIDv7()),
 		field.Enum("dependency_type").Values(model.DependencyTypeDirect.String(), model.DependencyTypeIndirect.String(), model.DependencyTypeUnknown.String()),
 		field.String("justification"),
 		field.String("origin"),
@@ -63,6 +63,7 @@ func (Dependency) Edges() []ent.Edge {
 			Field("package_id").
 			Unique().Annotations(entsql.OnDelete(entsql.Cascade)),
 		edge.To("dependent_package_version", PackageVersion.Type).
+			Required().
 			Field("dependent_package_version_id").
 			Unique().Annotations(entsql.OnDelete(entsql.Cascade)),
 		edge.From("included_in_sboms", BillOfMaterials.Type).Ref("included_dependencies").Annotations(entsql.OnDelete(entsql.Cascade)),