update ent schema

Signed-off-by: pxp928 <parth.psu@gmail.com>
guacsec · Jul 16, 2024 · c890709 · c890709
1 parent 919854a
commit c890709
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 19 deletions.
diff --git a/demo/graphql/queries.gql b/demo/graphql/queries.gql
@@ -51,7 +51,6 @@ query PkgQ4 {
 fragment allIsDependencyTree on IsDependency {
   id
   justification
-  versionRange
   package {
     ...allPkgTree
   }

diff --git a/demo/workflow/queries.gql b/demo/workflow/queries.gql
@@ -46,7 +46,6 @@ query isDependency {
         }
       }
     }
-    versionRange
     origin
     collector
   }

diff --git a/internal/testing/testdata/exampledata/ingest_predicates.json b/internal/testing/testdata/exampledata/ingest_predicates.json
@@ -91,7 +91,6 @@
         "pkg": "SPECIFIC_VERSION"
       },
       "isDependency": {
-        "versionRange": "3.2.0-r22",
         "dependencyType": "UNKNOWN",
         "justification": "top level package dependency",
         "origin": "",
@@ -132,7 +131,6 @@
         "pkg": "SPECIFIC_VERSION"
       },
       "isDependency": {
-        "versionRange": "3.2.0-r22",
         "dependencyType": "UNKNOWN",
         "justification": "top level package dependency",
         "origin": "",

diff --git a/internal/testing/testdata/testdata.go b/internal/testing/testdata/testdata.go
@@ -1493,8 +1493,7 @@ var (
             "collector":"",
             "dependencyType":"DIRECT",
             "justification":"dependency data collected via deps.dev",
-            "origin":"",
-            "versionRange":""
+            "origin":""
          }
       }
    ],
@@ -1682,8 +1681,7 @@ var (
 				 "collector":"",
 				 "dependencyType":"DIRECT",
 				 "justification":"dependency data collected via deps.dev",
-				 "origin":"",
-				 "versionRange":"^1.1.0"
+				 "origin":""
 			  }
 		   },
 		   {
@@ -1707,8 +1705,7 @@ var (
 				 "collector":"",
 				 "dependencyType":"DIRECT",
 				 "justification":"dependency data collected via deps.dev",
-				 "origin":"",
-				 "versionRange":"^4.1.1"
+				 "origin":""
 			  }
 		   },
 		   {
@@ -1732,8 +1729,7 @@ var (
 				 "collector":"",
 				 "dependencyType":"DIRECT",
 				 "justification":"dependency data collected via deps.dev",
-				 "origin":"",
-				 "versionRange":"^3.0.0 || ^4.0.0"
+				 "origin":""
 			  }
 		   }
 		],
@@ -2026,8 +2022,7 @@ var (
 				 "collector":"",
 				 "dependencyType":"DIRECT",
 				 "justification":"dependency data collected via deps.dev",
-				 "origin":"",
-				 "versionRange":"^0.1"
+				 "origin":""
 			  }
 		   }
 		],
@@ -2156,8 +2151,7 @@ var (
 				 "collector":"",
 				 "dependencyType":"DIRECT",
 				 "justification":"dependency data collected via deps.dev",
-				 "origin":"",
-				 "versionRange":"^3.0.0"
+				 "origin":""
 			  }
 		   }
 		],

diff --git a/pkg/assembler/backends/arangodb/backend.go b/pkg/assembler/backends/arangodb/backend.go
@@ -570,7 +570,7 @@ func getCollectionIndexMap() map[string][]index {
 	}
 
 	collectionIndexMap[isDependenciesStr] = []index{
-		initIndex("byPkgIDDepPkgIDversionRangeOrigin", []string{"packageID", "depPackageID", "versionRange", "origin", docRef}, false),
+		initIndex("byPkgIDDepPkgIDOrigin", []string{"packageID", "depPackageID", "origin", docRef}, false),
 	}
 
 	collectionIndexMap[isOccurrencesStr] = []index{

diff --git a/pkg/assembler/backends/ent/migrate/schema.go b/pkg/assembler/backends/ent/migrate/schema.go
diff --git a/pkg/assembler/backends/neo4j/isDependency.go b/pkg/assembler/backends/neo4j/isDependency.go
@@ -28,7 +28,6 @@ import (
 )
 
 const (
-	versionRange   string = "versionRange"
 	dependencyType string = "dependencyType"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,6 @@ query isDependency { @@
             }
           }
         }
-        versionRange
         origin
         collector
       }
@@ Expand Down @@