Confusing name of field in IsDependency GraphQL (#1305)

Signed-off-by: desmax74 <mdessi@redhat.com>
guacsec · Sep 21, 2023 · c46528b · c46528b
1 parent 3b1e4e0
commit c46528b
Show file tree

Hide file tree

Showing 23 changed files with 594 additions and 594 deletions.
diff --git a/cmd/guacone/cmd/vulnerability.go b/cmd/guacone/cmd/vulnerability.go
@@ -262,14 +262,14 @@ func searchDependencyPackages(ctx context.Context, gqlclient graphql.Client, top
 		}
 		for _, neighbor := range isDependencyNeighborResponses.Neighbors {
 			if isDependency, ok := neighbor.(*model.NeighborsNeighborsIsDependency); ok {
-				if isDependency.DependentPackage.Type == guacType {
+				if isDependency.DependencyPackage.Type == guacType {
 					continue
 				}
 
 				depPkgFilter := &model.PkgSpec{
-					Type:      &isDependency.DependentPackage.Type,
-					Namespace: &isDependency.DependentPackage.Namespaces[0].Namespace,
-					Name:      &isDependency.DependentPackage.Namespaces[0].Names[0].Name,
+					Type:      &isDependency.DependencyPackage.Type,
+					Namespace: &isDependency.DependencyPackage.Namespaces[0].Namespace,
+					Name:      &isDependency.DependencyPackage.Namespaces[0].Names[0].Name,
 				}
 
 				depPkgResponse, err := model.Packages(ctx, gqlclient, *depPkgFilter)
@@ -458,8 +458,8 @@ func searchDependencyPackagesReverse(ctx context.Context, gqlclient graphql.Clie
 	if topPkgID != "" {
 		now = topPkgID
 		for now != searchPkgID {
-			path = append(path, nodeMap[now].isDependency.Id, nodeMap[now].isDependency.DependentPackage.Namespaces[0].Names[0].Id,
-				nodeMap[now].isDependency.DependentPackage.Namespaces[0].Id, nodeMap[now].isDependency.DependentPackage.Id,
+			path = append(path, nodeMap[now].isDependency.Id, nodeMap[now].isDependency.DependencyPackage.Namespaces[0].Names[0].Id,
+				nodeMap[now].isDependency.DependencyPackage.Namespaces[0].Id, nodeMap[now].isDependency.DependencyPackage.Id,
 				nodeMap[now].isDependency.Package.Namespaces[0].Names[0].Versions[0].Id,
 				nodeMap[now].isDependency.Package.Namespaces[0].Names[0].Id, nodeMap[now].isDependency.Package.Namespaces[0].Id,
 				nodeMap[now].isDependency.Package.Id)
@@ -469,8 +469,8 @@ func searchDependencyPackagesReverse(ctx context.Context, gqlclient graphql.Clie
 	} else {
 		for i := len(collectedIDs) - 1; i >= 0; i-- {
 			if nodeMap[collectedIDs[i]].isDependency != nil {
-				path = append(path, nodeMap[collectedIDs[i]].isDependency.Id, nodeMap[collectedIDs[i]].isDependency.DependentPackage.Namespaces[0].Names[0].Id,
-					nodeMap[collectedIDs[i]].isDependency.DependentPackage.Namespaces[0].Id, nodeMap[collectedIDs[i]].isDependency.DependentPackage.Id,
+				path = append(path, nodeMap[collectedIDs[i]].isDependency.Id, nodeMap[collectedIDs[i]].isDependency.DependencyPackage.Namespaces[0].Names[0].Id,
+					nodeMap[collectedIDs[i]].isDependency.DependencyPackage.Namespaces[0].Id, nodeMap[collectedIDs[i]].isDependency.DependencyPackage.Id,
 					nodeMap[collectedIDs[i]].isDependency.Package.Namespaces[0].Names[0].Versions[0].Id,
 					nodeMap[collectedIDs[i]].isDependency.Package.Namespaces[0].Names[0].Id, nodeMap[collectedIDs[i]].isDependency.Package.Namespaces[0].Id,
 					nodeMap[collectedIDs[i]].isDependency.Package.Id)

diff --git a/demo/graphql/queries.gql b/demo/graphql/queries.gql
@@ -54,7 +54,7 @@ fragment allIsDependencyTree on IsDependency {
   package {
     ...allPkgTree
   }
-  dependentPackage {
+  dependencyPackage {
     ...allPkgTree
   }
   origin
@@ -63,7 +63,7 @@ fragment allIsDependencyTree on IsDependency {
 
 query IsDependencyQ1 {
   IsDependency(isDependencySpec: { package: { type: "guac", namespace: "cdx/docker.io/library", name: "consul" }}) {
-    dependentPackage {
+    dependencyPackage {
       type
       namespaces {
         namespace
@@ -78,7 +78,7 @@ query IsDependencyQ1 {
 query IsDependencyQ2 {
   IsDependency(isDependencySpec: {
     package: { type: "guac", namespace: "cdx/docker.io/library", name: "consul" }
-    dependentPackage: { type: "golang", namespace: "github.com/sirupsen", name: "logrus" }
+    dependencyPackage: { type: "golang", namespace: "github.com/sirupsen", name: "logrus" }
   }) {
     ...allIsDependencyTree
   }

diff --git a/demo/workflow/queries.gql b/demo/workflow/queries.gql
@@ -1,6 +1,6 @@
 query isDependency {
   IsDependency(
-    isDependencySpec: {dependentPackage: {namespace: "github.com/prometheus", name: "client_golang"}}
+    isDependencySpec: {dependencyPackage: {namespace: "github.com/prometheus", name: "client_golang"}}
   ) {
     id
     justification
@@ -25,7 +25,7 @@ query isDependency {
         }
       }
     }
-    dependentPackage {
+    dependencyPackage {
       id
       type
       namespaces {