diff --git a/cmd/guacone/cmd/vulnerability.go b/cmd/guacone/cmd/vulnerability.go index e440ac7841..d5d41b94ce 100644 --- 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 index 6f39d39fe7..acb61785a9 100644 --- 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 index ee03fcfa3d..2f84bbcdee 100644 --- 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 { diff --git a/internal/testing/e2e/expectIsDependencyQ1.json b/internal/testing/e2e/expectIsDependencyQ1.json index 3067ee4f17..099e73d2c4 100644 --- a/internal/testing/e2e/expectIsDependencyQ1.json +++ b/internal/testing/e2e/expectIsDependencyQ1.json @@ -1,7 +1,7 @@ { "IsDependency": [ { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -16,7 +16,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -31,7 +31,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -46,7 +46,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -61,7 +61,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -76,7 +76,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -91,7 +91,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -106,7 +106,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -121,7 +121,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -136,7 +136,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -151,7 +151,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -166,7 +166,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -181,7 +181,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -196,7 +196,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -211,7 +211,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -226,7 +226,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -241,7 +241,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -256,7 +256,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -271,7 +271,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -286,7 +286,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -301,7 +301,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -316,7 +316,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -331,7 +331,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -346,7 +346,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -361,7 +361,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -376,7 +376,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -391,7 +391,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -406,7 +406,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -421,7 +421,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -436,7 +436,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -451,7 +451,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -466,7 +466,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -481,7 +481,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -496,7 +496,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -511,7 +511,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -526,7 +526,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -541,7 +541,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -556,7 +556,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -571,7 +571,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -586,7 +586,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -601,7 +601,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -616,7 +616,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -631,7 +631,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -646,7 +646,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -661,7 +661,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -676,7 +676,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -691,7 +691,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -706,7 +706,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -721,7 +721,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -736,7 +736,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -751,7 +751,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -766,7 +766,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -781,7 +781,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -796,7 +796,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -811,7 +811,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -826,7 +826,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -841,7 +841,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -856,7 +856,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -871,7 +871,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -886,7 +886,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -901,7 +901,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -916,7 +916,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -931,7 +931,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -946,7 +946,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -961,7 +961,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -976,7 +976,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -991,7 +991,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1006,7 +1006,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1021,7 +1021,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1036,7 +1036,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1051,7 +1051,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1066,7 +1066,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1081,7 +1081,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1096,7 +1096,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1111,7 +1111,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1126,7 +1126,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1141,7 +1141,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1156,7 +1156,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1171,7 +1171,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1186,7 +1186,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1201,7 +1201,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1216,7 +1216,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1231,7 +1231,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1246,7 +1246,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1261,7 +1261,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1276,7 +1276,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1291,7 +1291,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1306,7 +1306,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1321,7 +1321,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1336,7 +1336,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1351,7 +1351,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1366,7 +1366,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1381,7 +1381,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1396,7 +1396,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1411,7 +1411,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1426,7 +1426,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1441,7 +1441,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1456,7 +1456,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1471,7 +1471,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1486,7 +1486,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1501,7 +1501,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1516,7 +1516,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1531,7 +1531,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1546,7 +1546,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1561,7 +1561,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1576,7 +1576,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1591,7 +1591,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1606,7 +1606,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1621,7 +1621,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1636,7 +1636,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1651,7 +1651,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1666,7 +1666,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1681,7 +1681,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1696,7 +1696,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1711,7 +1711,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1726,7 +1726,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1741,7 +1741,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1756,7 +1756,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1771,7 +1771,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1786,7 +1786,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1801,7 +1801,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1816,7 +1816,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1831,7 +1831,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1846,7 +1846,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1861,7 +1861,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1876,7 +1876,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1891,7 +1891,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1906,7 +1906,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1921,7 +1921,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1936,7 +1936,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -1951,7 +1951,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1966,7 +1966,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1981,7 +1981,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -1996,7 +1996,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -2011,7 +2011,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2026,7 +2026,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2041,7 +2041,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2056,7 +2056,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2071,7 +2071,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2086,7 +2086,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2101,7 +2101,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2116,7 +2116,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2131,7 +2131,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2146,7 +2146,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2161,7 +2161,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2176,7 +2176,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2191,7 +2191,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2206,7 +2206,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2221,7 +2221,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2236,7 +2236,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2251,7 +2251,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2266,7 +2266,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2281,7 +2281,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2296,7 +2296,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -2311,7 +2311,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2326,7 +2326,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2341,7 +2341,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2356,7 +2356,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2371,7 +2371,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2386,7 +2386,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2401,7 +2401,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2416,7 +2416,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -2431,7 +2431,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -2446,7 +2446,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2461,7 +2461,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2476,7 +2476,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2491,7 +2491,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2506,7 +2506,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2521,7 +2521,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2536,7 +2536,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2551,7 +2551,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2566,7 +2566,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2581,7 +2581,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2596,7 +2596,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2611,7 +2611,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { @@ -2626,7 +2626,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2641,7 +2641,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2656,7 +2656,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2671,7 +2671,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2686,7 +2686,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2701,7 +2701,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2716,7 +2716,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2731,7 +2731,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2746,7 +2746,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2761,7 +2761,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2776,7 +2776,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2791,7 +2791,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2806,7 +2806,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2821,7 +2821,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2836,7 +2836,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { @@ -2851,7 +2851,7 @@ } }, { - "dependentPackage": { + "dependencyPackage": { "type": "alpine", "namespaces": [ { diff --git a/internal/testing/e2e/expectIsDependencyQ2.json b/internal/testing/e2e/expectIsDependencyQ2.json index b07975ec70..1b6276fb7b 100644 --- a/internal/testing/e2e/expectIsDependencyQ2.json +++ b/internal/testing/e2e/expectIsDependencyQ2.json @@ -28,7 +28,7 @@ } ] }, - "dependentPackage": { + "dependencyPackage": { "type": "golang", "namespaces": [ { diff --git a/internal/testing/e2e/expectPathPy.json b/internal/testing/e2e/expectPathPy.json index 314dced93a..259ccc5675 100644 --- a/internal/testing/e2e/expectPathPy.json +++ b/internal/testing/e2e/expectPathPy.json @@ -57,7 +57,7 @@ } ] }, - "dependentPackage": { + "dependencyPackage": { "type": "deb", "namespaces": [ { diff --git a/pkg/assembler/backends/arangodb/isDependency.go b/pkg/assembler/backends/arangodb/isDependency.go index 54a7b2ab49..1696d71d83 100644 --- a/pkg/assembler/backends/arangodb/isDependency.go +++ b/pkg/assembler/backends/arangodb/isDependency.go @@ -30,12 +30,12 @@ const ( ) func checkPkgNameDependency(isDependencySpec *model.IsDependencySpec) bool { - if isDependencySpec.DependentPackage != nil { - if isDependencySpec.DependentPackage.ID != nil || - isDependencySpec.DependentPackage.Version != nil || - isDependencySpec.DependentPackage.Subpath != nil || - isDependencySpec.DependentPackage.Qualifiers != nil || - isDependencySpec.DependentPackage.MatchOnlyEmptyQualifiers != nil { + if isDependencySpec.DependencyPackage != nil { + if isDependencySpec.DependencyPackage.ID != nil || + isDependencySpec.DependencyPackage.Version != nil || + isDependencySpec.DependencyPackage.Subpath != nil || + isDependencySpec.DependencyPackage.Qualifiers != nil || + isDependencySpec.DependencyPackage.MatchOnlyEmptyQualifiers != nil { return false } } @@ -221,66 +221,66 @@ func setIsDependencyMatchValues(arangoQueryBuilder *arangoQueryBuilder, isDepend arangoQueryBuilder.filter("isDependency", collector, "==", "@"+collector) queryValues[collector] = *isDependencySpec.Collector } - if isDependencySpec.DependentPackage != nil { + if isDependencySpec.DependencyPackage != nil { if !queryDepPkgVersion { arangoQueryBuilder.forOutBound(isDependencyDepPkgNameEdgesStr, "depName", "isDependency") - if isDependencySpec.DependentPackage.Name != nil { + if isDependencySpec.DependencyPackage.Name != nil { arangoQueryBuilder.filter("depName", "name", "==", "@depName") - queryValues["depName"] = *isDependencySpec.DependentPackage.Name + queryValues["depName"] = *isDependencySpec.DependencyPackage.Name } arangoQueryBuilder.forInBound(pkgHasNameStr, "depNamespace", "depName") - if isDependencySpec.DependentPackage.Namespace != nil { + if isDependencySpec.DependencyPackage.Namespace != nil { arangoQueryBuilder.filter("depNamespace", "namespace", "==", "@depNamespace") - queryValues["depNamespace"] = *isDependencySpec.DependentPackage.Namespace + queryValues["depNamespace"] = *isDependencySpec.DependencyPackage.Namespace } arangoQueryBuilder.forInBound(pkgHasNamespaceStr, "depType", "depNamespace") - if isDependencySpec.DependentPackage.Type != nil { + if isDependencySpec.DependencyPackage.Type != nil { arangoQueryBuilder.filter("depType", "type", "==", "@depType") - queryValues["depType"] = *isDependencySpec.DependentPackage.Type + queryValues["depType"] = *isDependencySpec.DependencyPackage.Type } } else { arangoQueryBuilder.forOutBound(isDependencyDepPkgVersionEdgesStr, "depVersion", "isDependency") - if isDependencySpec.DependentPackage.ID != nil { + if isDependencySpec.DependencyPackage.ID != nil { arangoQueryBuilder.filter("depVersion", "_id", "==", "@depVersionID") - queryValues["depVersionID"] = *isDependencySpec.DependentPackage.ID + queryValues["depVersionID"] = *isDependencySpec.DependencyPackage.ID } - if isDependencySpec.DependentPackage.Version != nil { + if isDependencySpec.DependencyPackage.Version != nil { arangoQueryBuilder.filter("depVersion", "version", "==", "@depVersionValue") - queryValues["depVersionValue"] = *isDependencySpec.DependentPackage.Version + queryValues["depVersionValue"] = *isDependencySpec.DependencyPackage.Version } - if isDependencySpec.DependentPackage.Subpath != nil { + if isDependencySpec.DependencyPackage.Subpath != nil { arangoQueryBuilder.filter("depVersion", "subpath", "==", "@depSubpath") - queryValues["depSubpath"] = *isDependencySpec.DependentPackage.Subpath + queryValues["depSubpath"] = *isDependencySpec.DependencyPackage.Subpath } - if isDependencySpec.DependentPackage.MatchOnlyEmptyQualifiers != nil { - if !*isDependencySpec.DependentPackage.MatchOnlyEmptyQualifiers { - if len(isDependencySpec.DependentPackage.Qualifiers) > 0 { + if isDependencySpec.DependencyPackage.MatchOnlyEmptyQualifiers != nil { + if !*isDependencySpec.DependencyPackage.MatchOnlyEmptyQualifiers { + if len(isDependencySpec.DependencyPackage.Qualifiers) > 0 { arangoQueryBuilder.filter("depVersion", "qualifier_list", "==", "@depQualifier") - queryValues["depQualifier"] = getQualifiers(isDependencySpec.DependentPackage.Qualifiers) + queryValues["depQualifier"] = getQualifiers(isDependencySpec.DependencyPackage.Qualifiers) } } else { arangoQueryBuilder.filterLength("depVersion", "qualifier_list", "==", 0) } } else { - if len(isDependencySpec.DependentPackage.Qualifiers) > 0 { + if len(isDependencySpec.DependencyPackage.Qualifiers) > 0 { arangoQueryBuilder.filter("depVersion", "qualifier_list", "==", "@depQualifier") - queryValues["depQualifier"] = getQualifiers(isDependencySpec.DependentPackage.Qualifiers) + queryValues["depQualifier"] = getQualifiers(isDependencySpec.DependencyPackage.Qualifiers) } } arangoQueryBuilder.forInBound(pkgHasVersionStr, "depName", "depVersion") - if isDependencySpec.DependentPackage.Name != nil { + if isDependencySpec.DependencyPackage.Name != nil { arangoQueryBuilder.filter("depName", "name", "==", "@depName") - queryValues["depName"] = *isDependencySpec.DependentPackage.Name + queryValues["depName"] = *isDependencySpec.DependencyPackage.Name } arangoQueryBuilder.forInBound(pkgHasNameStr, "depNamespace", "depName") - if isDependencySpec.DependentPackage.Namespace != nil { + if isDependencySpec.DependencyPackage.Namespace != nil { arangoQueryBuilder.filter("depNamespace", "namespace", "==", "@depNamespace") - queryValues["depNamespace"] = *isDependencySpec.DependentPackage.Namespace + queryValues["depNamespace"] = *isDependencySpec.DependencyPackage.Namespace } arangoQueryBuilder.forInBound(pkgHasNamespaceStr, "depType", "depNamespace") - if isDependencySpec.DependentPackage.Type != nil { + if isDependencySpec.DependencyPackage.Type != nil { arangoQueryBuilder.filter("depType", "type", "==", "@depType") - queryValues["depType"] = *isDependencySpec.DependentPackage.Type + queryValues["depType"] = *isDependencySpec.DependencyPackage.Type } } } else { @@ -813,14 +813,14 @@ func getIsDependencyFromCursor(ctx context.Context, cursor driver.Cursor) ([]*mo } isDependency := &model.IsDependency{ - ID: createdValue.IsDependencyID, - Package: pkg, - DependentPackage: depPkg, - VersionRange: createdValue.VersionRange, - DependencyType: dependencyTypeEnum, - Justification: createdValue.Justification, - Origin: createdValue.Collector, - Collector: createdValue.Origin, + ID: createdValue.IsDependencyID, + Package: pkg, + DependencyPackage: depPkg, + VersionRange: createdValue.VersionRange, + DependencyType: dependencyTypeEnum, + Justification: createdValue.Justification, + Origin: createdValue.Collector, + Collector: createdValue.Origin, } isDependencyList = append(isDependencyList, isDependency) } diff --git a/pkg/assembler/backends/arangodb/isDependency_test.go b/pkg/assembler/backends/arangodb/isDependency_test.go index 9af135112c..33a05d9cdf 100644 --- a/pkg/assembler/backends/arangodb/isDependency_test.go +++ b/pkg/assembler/backends/arangodb/isDependency_test.go @@ -80,9 +80,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P2outName, - Justification: "test justification", + Package: testdata.P1out, + DependencyPackage: testdata.P2outName, + Justification: "test justification", }, }, }, @@ -112,9 +112,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P2outName, - Justification: "test justification", + Package: testdata.P1out, + DependencyPackage: testdata.P2outName, + Justification: "test justification", }, }, }, @@ -144,9 +144,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P2outName, - Justification: "test justification", + Package: testdata.P1out, + DependencyPackage: testdata.P2outName, + Justification: "test justification", }, }, }, @@ -176,9 +176,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P2outName, - Justification: "test justification one", + Package: testdata.P1out, + DependencyPackage: testdata.P2outName, + Justification: "test justification one", }, }, }, @@ -207,8 +207,8 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P2outName, + Package: testdata.P2out, + DependencyPackage: testdata.P2outName, }, }, }, @@ -230,14 +230,14 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Name: ptrfrom.String("openssl"), }, }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P4outName, + Package: testdata.P2out, + DependencyPackage: testdata.P4outName, }, }, }, @@ -259,14 +259,14 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Type: ptrfrom.String("conan"), }, }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P4outName, + Package: testdata.P2out, + DependencyPackage: testdata.P4outName, }, }, }, @@ -288,14 +288,14 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Namespace: ptrfrom.String("openssl.org"), }, }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P4outName, + Package: testdata.P2out, + DependencyPackage: testdata.P4outName, }, }, }, @@ -317,14 +317,14 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Version: ptrfrom.String("3.0.3"), }, }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P4out, + Package: testdata.P2out, + DependencyPackage: testdata.P4out, }, }, }, @@ -346,14 +346,14 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Subpath: ptrfrom.String("saved_model_cli.py"), }, }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P3out, + Package: testdata.P2out, + DependencyPackage: testdata.P3out, }, }, }, @@ -375,18 +375,18 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ MatchOnlyEmptyQualifiers: ptrfrom.Bool(true), }, }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P4out, + Package: testdata.P2out, + DependencyPackage: testdata.P4out, }, { - Package: testdata.P2out, - DependentPackage: testdata.P3out, + Package: testdata.P2out, + DependencyPackage: testdata.P3out, }, }, }, @@ -408,7 +408,7 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ MatchOnlyEmptyQualifiers: ptrfrom.Bool(false), Qualifiers: []*model.PackageQualifierSpec{ { @@ -420,8 +420,8 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P5out, + Package: testdata.P2out, + DependencyPackage: testdata.P5out, }, }, }, @@ -443,7 +443,7 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Qualifiers: []*model.PackageQualifierSpec{ { Key: "test", @@ -454,8 +454,8 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P5out, + Package: testdata.P2out, + DependencyPackage: testdata.P5out, }, }, }, @@ -489,8 +489,8 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P5out, - DependentPackage: testdata.P2out, + Package: testdata.P5out, + DependencyPackage: testdata.P2out, }, }, }, @@ -519,8 +519,8 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P3out, - DependentPackage: testdata.P1outName, + Package: testdata.P3out, + DependencyPackage: testdata.P1outName, }, }, }, @@ -545,14 +545,14 @@ func TestIsDependency(t *testing.T) { Package: &model.PkgSpec{ Subpath: ptrfrom.String("saved_model_cli.py"), }, - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Name: ptrfrom.String("openssl"), }, }, ExpID: []*model.IsDependency{ { - Package: testdata.P3out, - DependentPackage: testdata.P4outName, + Package: testdata.P3out, + DependencyPackage: testdata.P4outName, }, }, }, @@ -612,8 +612,8 @@ func TestIsDependency(t *testing.T) { QueryID: true, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P2outName, + Package: testdata.P1out, + DependencyPackage: testdata.P2outName, }, }, }, @@ -643,9 +643,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P1outName, - VersionRange: "1-3", + Package: testdata.P1out, + DependencyPackage: testdata.P1outName, + VersionRange: "1-3", }, }, }, @@ -675,9 +675,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P1outName, - DependencyType: model.DependencyTypeIndirect, + Package: testdata.P2out, + DependencyPackage: testdata.P1outName, + DependencyType: model.DependencyTypeIndirect, }, }, }, @@ -730,17 +730,17 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P3out, - DependentPackage: testdata.P2out, - Justification: "test justification", + Package: testdata.P3out, + DependencyPackage: testdata.P2out, + Justification: "test justification", }, { - Package: testdata.P3out, - DependentPackage: testdata.P4outName, + Package: testdata.P3out, + DependencyPackage: testdata.P4outName, }, { - Package: testdata.P3out, - DependentPackage: testdata.P1outName, + Package: testdata.P3out, + DependencyPackage: testdata.P1outName, }, }, }, @@ -758,16 +758,16 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Name: ptrfrom.String("openssl"), }, Justification: ptrfrom.String("test justification name only"), }, ExpID: []*model.IsDependency{ { - Package: testdata.P3out, - DependentPackage: testdata.P4outName, - Justification: "test justification name only", + Package: testdata.P3out, + DependencyPackage: testdata.P4outName, + Justification: "test justification name only", }, }, }, @@ -797,14 +797,14 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: testdata.P3out, - DependentPackage: testdata.P2out, - Justification: "test justification return specific", + Package: testdata.P3out, + DependencyPackage: testdata.P2out, + Justification: "test justification return specific", }, { - Package: testdata.P3out, - DependentPackage: testdata.P2outName, - Justification: "test justification return specific", + Package: testdata.P3out, + DependencyPackage: testdata.P2outName, + Justification: "test justification return specific", }, }, }, @@ -828,8 +828,8 @@ func TestIsDependency(t *testing.T) { QueryPkgID: true, ExpID: []*model.IsDependency{ { - Package: testdata.P4out, - DependentPackage: testdata.P2out, + Package: testdata.P4out, + DependencyPackage: testdata.P2out, }, }, }, @@ -853,8 +853,8 @@ func TestIsDependency(t *testing.T) { QueryDepPkgID: true, ExpID: []*model.IsDependency{ { - Package: testdata.P2out, - DependentPackage: testdata.P4out, + Package: testdata.P2out, + DependencyPackage: testdata.P4out, }, }, }, @@ -891,8 +891,8 @@ func TestIsDependency(t *testing.T) { } if test.QueryDepPkgID { test.Query = &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ - ID: ptrfrom.String(found.DependentPackage.Namespaces[0].Names[0].Versions[0].ID), + DependencyPackage: &model.PkgSpec{ + ID: ptrfrom.String(found.DependencyPackage.Namespaces[0].Names[0].Versions[0].ID), }, } } @@ -954,14 +954,14 @@ func TestIsDependencies(t *testing.T) { }}, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P2outName, - Justification: "test justification", + Package: testdata.P1out, + DependencyPackage: testdata.P2outName, + Justification: "test justification", }, { - Package: testdata.P2out, - DependentPackage: testdata.P4outName, - Justification: "test justification", + Package: testdata.P2out, + DependencyPackage: testdata.P4outName, + Justification: "test justification", }, }, }, @@ -983,14 +983,14 @@ func TestIsDependencies(t *testing.T) { }}, ExpID: []*model.IsDependency{ { - Package: testdata.P1out, - DependentPackage: testdata.P2out, - Justification: "test justification", + Package: testdata.P1out, + DependencyPackage: testdata.P2out, + Justification: "test justification", }, { - Package: testdata.P2out, - DependentPackage: testdata.P4out, - Justification: "test justification", + Package: testdata.P2out, + DependencyPackage: testdata.P4out, + Justification: "test justification", }, }, }, diff --git a/pkg/assembler/backends/ent/backend/dependency.go b/pkg/assembler/backends/ent/backend/dependency.go index 23731c379a..27c5d0b871 100644 --- a/pkg/assembler/backends/ent/backend/dependency.go +++ b/pkg/assembler/backends/ent/backend/dependency.go @@ -39,16 +39,16 @@ func (b *EntBackend) IsDependency(ctx context.Context, spec *model.IsDependencyS optionalPredicate(spec.Origin, dependency.Origin), optionalPredicate(spec.Collector, dependency.Collector), ) - if spec.DependentPackage != nil { - if spec.DependentPackage.Version == nil { + if spec.DependencyPackage != nil { + if spec.DependencyPackage.Version == nil { query.Where( dependency.Or( - dependency.HasDependentPackageNameWith(packageNameQuery(spec.DependentPackage)), - dependency.HasDependentPackageVersionWith(packageVersionQuery(spec.DependentPackage)), + dependency.HasDependentPackageNameWith(packageNameQuery(spec.DependencyPackage)), + dependency.HasDependentPackageVersionWith(packageVersionQuery(spec.DependencyPackage)), ), ) } else { - query.Where(dependency.HasDependentPackageVersionWith(packageVersionQuery(spec.DependentPackage))) + query.Where(dependency.HasDependentPackageVersionWith(packageVersionQuery(spec.DependencyPackage))) } } if spec.Package != nil { diff --git a/pkg/assembler/backends/ent/backend/dependency_test.go b/pkg/assembler/backends/ent/backend/dependency_test.go index 76e71c51e6..9e16476eb6 100644 --- a/pkg/assembler/backends/ent/backend/dependency_test.go +++ b/pkg/assembler/backends/ent/backend/dependency_test.go @@ -65,10 +65,10 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -98,10 +98,10 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -131,10 +131,10 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -164,10 +164,10 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification one", - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification one", + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -195,9 +195,9 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p2outName, + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -219,15 +219,15 @@ func (s *Suite) TestIsDependency() { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Name: ptrfrom.String("openssl"), }, }, ExpID: []*model.IsDependency{ { - Package: p2out, - DependentPackage: p4outName, - DependencyType: model.DependencyTypeUnknown, + Package: p2out, + DependencyPackage: p4outName, + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -255,14 +255,14 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p1outName, - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p1outName, + DependencyType: model.DependencyTypeUnknown, }, { - Package: p3out, - DependentPackage: p1outName, - DependencyType: model.DependencyTypeUnknown, + Package: p3out, + DependencyPackage: p1outName, + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -287,15 +287,15 @@ func (s *Suite) TestIsDependency() { Package: &model.PkgSpec{ Subpath: ptrfrom.String("saved_model_cli.py"), }, - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Name: ptrfrom.String("openssl"), }, }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p4outName, - DependencyType: model.DependencyTypeUnknown, + Package: p3out, + DependencyPackage: p4outName, + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -357,9 +357,9 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p2out, - DependentPackage: p1outName, - DependencyType: model.DependencyTypeUnknown, + Package: p2out, + DependencyPackage: p1outName, + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -389,10 +389,10 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p1outName, - VersionRange: "1-3", - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p1outName, + VersionRange: "1-3", + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -422,9 +422,9 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p2out, - DependentPackage: p1outName, - DependencyType: model.DependencyTypeIndirect, + Package: p2out, + DependencyPackage: p1outName, + DependencyType: model.DependencyTypeIndirect, }, }, }, @@ -500,10 +500,10 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p2out, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p3out, + DependencyPackage: p2out, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -525,10 +525,10 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p2outName, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p3out, + DependencyPackage: p2outName, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, }, }, @@ -558,21 +558,21 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p2out, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p3out, + DependencyPackage: p2out, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, { - Package: p3out, - DependentPackage: p2outName, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p3out, + DependencyPackage: p2outName, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, }, }, { - Name: "Ingest DependentPackage with version and query without version", + Name: "Ingest DependencyPackage with version and query without version", InPkg: []*model.PkgInputSpec{p2, p4}, Calls: []call{ { @@ -590,7 +590,7 @@ func (s *Suite) TestIsDependency() { Type: ptrfrom.String("pypi"), Name: ptrfrom.String("tensorflow"), }, - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Type: ptrfrom.String("conan"), Namespace: ptrfrom.String("openssl.org"), Name: ptrfrom.String("openssl"), @@ -598,11 +598,11 @@ func (s *Suite) TestIsDependency() { }, ExpID: []*model.IsDependency{ { - Package: p2out, - DependentPackage: p4out, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, - VersionRange: "v3.0.3", + Package: p2out, + DependencyPackage: p4out, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, + VersionRange: "v3.0.3", }, }, }, @@ -712,16 +712,16 @@ func (s *Suite) TestIngestDependencies() { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, { - Package: p2out, - DependentPackage: p4outName, - Justification: "test justification", - DependencyType: model.DependencyTypeUnknown, + Package: p2out, + DependencyPackage: p4outName, + Justification: "test justification", + DependencyType: model.DependencyTypeUnknown, }, }, }, diff --git a/pkg/assembler/backends/ent/backend/transforms.go b/pkg/assembler/backends/ent/backend/transforms.go index ce0e2891dd..7ef40c10ae 100644 --- a/pkg/assembler/backends/ent/backend/transforms.go +++ b/pkg/assembler/backends/ent/backend/transforms.go @@ -199,14 +199,14 @@ func toModelIsDependency(id *ent.Dependency, backrefs bool) *model.IsDependency } return &model.IsDependency{ - ID: nodeID(id.ID), - Package: pkg, - DependentPackage: depPkg, - VersionRange: id.VersionRange, - DependencyType: dependencyTypeFromEnum(id.DependencyType), - Justification: id.Justification, - Origin: id.Origin, - Collector: id.Collector, + ID: nodeID(id.ID), + Package: pkg, + DependencyPackage: depPkg, + VersionRange: id.VersionRange, + DependencyType: dependencyTypeFromEnum(id.DependencyType), + Justification: id.Justification, + Origin: id.Origin, + Collector: id.Collector, } } diff --git a/pkg/assembler/backends/inmem/isDependency.go b/pkg/assembler/backends/inmem/isDependency.go index e72489063a..4bc5f28ac2 100644 --- a/pkg/assembler/backends/inmem/isDependency.go +++ b/pkg/assembler/backends/inmem/isDependency.go @@ -192,9 +192,9 @@ func (c *demoClient) IsDependency(ctx context.Context, filter *model.IsDependenc search = append(search, pkg.isDependencyLinks...) } } - if !foundOne && filter != nil && filter.DependentPackage != nil { - if filter.DependentPackage.Version == nil { - exactPackage, err := c.exactPackageName(filter.DependentPackage) + if !foundOne && filter != nil && filter.DependencyPackage != nil { + if filter.DependencyPackage.Version == nil { + exactPackage, err := c.exactPackageName(filter.DependencyPackage) if err != nil { return nil, gqlerror.Errorf("%v :: %v", funcName, err) } @@ -254,9 +254,9 @@ func (c *demoClient) buildIsDependency(link *isDependencyLink, filter *model.IsD return nil, err } } - if filter != nil && filter.DependentPackage != nil { - depPkgFilter := &model.PkgSpec{Type: filter.DependentPackage.Type, Namespace: filter.DependentPackage.Namespace, - Name: filter.DependentPackage.Name} + if filter != nil && filter.DependencyPackage != nil { + depPkgFilter := &model.PkgSpec{Type: filter.DependencyPackage.Type, Namespace: filter.DependencyPackage.Namespace, + Name: filter.DependencyPackage.Name} dep, err = c.buildPackageResponse(link.depPackageID, depPkgFilter) if err != nil { return nil, err @@ -282,14 +282,14 @@ func (c *demoClient) buildIsDependency(link *isDependencyLink, filter *model.IsD } foundIsDependency := model.IsDependency{ - ID: nodeID(link.id), - Package: p, - DependentPackage: dep, - VersionRange: link.versionRange, - DependencyType: link.dependencyType, - Justification: link.justification, - Origin: link.origin, - Collector: link.collector, + ID: nodeID(link.id), + Package: p, + DependencyPackage: dep, + VersionRange: link.versionRange, + DependencyType: link.dependencyType, + Justification: link.justification, + Origin: link.origin, + Collector: link.collector, } return &foundIsDependency, nil } diff --git a/pkg/assembler/backends/inmem/isDependency_test.go b/pkg/assembler/backends/inmem/isDependency_test.go index 2d44370406..bd1b8e6321 100644 --- a/pkg/assembler/backends/inmem/isDependency_test.go +++ b/pkg/assembler/backends/inmem/isDependency_test.go @@ -66,9 +66,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", }, }, }, @@ -98,9 +98,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", }, }, }, @@ -130,9 +130,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", }, }, }, @@ -162,9 +162,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification one", + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification one", }, }, }, @@ -192,8 +192,8 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, + Package: p1out, + DependencyPackage: p2outName, }, }, }, @@ -215,14 +215,14 @@ func TestIsDependency(t *testing.T) { }, }, Query: &model.IsDependencySpec{ - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Name: ptrfrom.String("openssl"), }, }, ExpID: []*model.IsDependency{ { - Package: p2out, - DependentPackage: p4outName, + Package: p2out, + DependencyPackage: p4outName, }, }, }, @@ -250,12 +250,12 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p1outName, + Package: p1out, + DependencyPackage: p1outName, }, { - Package: p3out, - DependentPackage: p1outName, + Package: p3out, + DependencyPackage: p1outName, }, }, }, @@ -280,14 +280,14 @@ func TestIsDependency(t *testing.T) { Package: &model.PkgSpec{ Subpath: ptrfrom.String("saved_model_cli.py"), }, - DependentPackage: &model.PkgSpec{ + DependencyPackage: &model.PkgSpec{ Name: ptrfrom.String("openssl"), }, }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p4outName, + Package: p3out, + DependencyPackage: p4outName, }, }, }, @@ -349,8 +349,8 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p2out, - DependentPackage: p1outName, + Package: p2out, + DependencyPackage: p1outName, }, }, }, @@ -380,9 +380,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p1outName, - VersionRange: "1-3", + Package: p1out, + DependencyPackage: p1outName, + VersionRange: "1-3", }, }, }, @@ -412,9 +412,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p2out, - DependentPackage: p1outName, - DependencyType: model.DependencyTypeIndirect, + Package: p2out, + DependencyPackage: p1outName, + DependencyType: model.DependencyTypeIndirect, }, }, }, @@ -490,9 +490,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p2out, - Justification: "test justification", + Package: p3out, + DependencyPackage: p2out, + Justification: "test justification", }, }, }, @@ -514,9 +514,9 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p2outName, - Justification: "test justification", + Package: p3out, + DependencyPackage: p2outName, + Justification: "test justification", }, }, }, @@ -546,14 +546,14 @@ func TestIsDependency(t *testing.T) { }, ExpID: []*model.IsDependency{ { - Package: p3out, - DependentPackage: p2out, - Justification: "test justification", + Package: p3out, + DependencyPackage: p2out, + Justification: "test justification", }, { - Package: p3out, - DependentPackage: p2outName, - Justification: "test justification", + Package: p3out, + DependencyPackage: p2outName, + Justification: "test justification", }, }, }, @@ -636,14 +636,14 @@ func TestIsDependencies(t *testing.T) { }}, ExpID: []*model.IsDependency{ { - Package: p1out, - DependentPackage: p2outName, - Justification: "test justification", + Package: p1out, + DependencyPackage: p2outName, + Justification: "test justification", }, { - Package: p2out, - DependentPackage: p4outName, - Justification: "test justification", + Package: p2out, + DependencyPackage: p4outName, + Justification: "test justification", }, }, }, diff --git a/pkg/assembler/backends/neo4j/isDependency.go b/pkg/assembler/backends/neo4j/isDependency.go index 2fdab82255..1428c47595 100644 --- a/pkg/assembler/backends/neo4j/isDependency.go +++ b/pkg/assembler/backends/neo4j/isDependency.go @@ -44,11 +44,11 @@ func (c *neo4jClient) IsDependency(ctx context.Context, isDependencySpec *model. selectedPkg := isDependencySpec.Package var dependentPkg *model.PkgSpec = nil depMatchOnlyEmptyQualifiers := false - if isDependencySpec.DependentPackage != nil { + if isDependencySpec.DependencyPackage != nil { dependentPkg = &model.PkgSpec{ - Type: isDependencySpec.DependentPackage.Type, - Namespace: isDependencySpec.DependentPackage.Namespace, - Name: isDependencySpec.DependentPackage.Name, + Type: isDependencySpec.DependencyPackage.Type, + Namespace: isDependencySpec.DependencyPackage.Namespace, + Name: isDependencySpec.DependencyPackage.Name, // remove version, subpath and set qualifiers to empty list Qualifiers: []*model.PackageQualifierSpec{}, // setting to default value of false as package version is not checked for dependent packages @@ -112,12 +112,12 @@ func (c *neo4jClient) IsDependency(ctx context.Context, isDependencySpec *model. } isDependency := &model.IsDependency{ - Package: pkg, - DependentPackage: depPkg, - VersionRange: isDependencyNode.Props[versionRange].(string), - DependencyType: dependencyTypeEnum, - Origin: isDependencyNode.Props[origin].(string), - Collector: isDependencyNode.Props[collector].(string), + Package: pkg, + DependencyPackage: depPkg, + VersionRange: isDependencyNode.Props[versionRange].(string), + DependencyType: dependencyTypeEnum, + Origin: isDependencyNode.Props[origin].(string), + Collector: isDependencyNode.Props[collector].(string), } collectedIsDependency = append(collectedIsDependency, isDependency) } @@ -253,12 +253,12 @@ func (c *neo4jClient) IngestDependency(ctx context.Context, pkg model.PkgInputSp } isDependency := &model.IsDependency{ - Package: pkg, - DependentPackage: depPkg, - VersionRange: isDependencyNode.Props[versionRange].(string), - DependencyType: dependencyTypeEnum, - Origin: isDependencyNode.Props[origin].(string), - Collector: isDependencyNode.Props[collector].(string), + Package: pkg, + DependencyPackage: depPkg, + VersionRange: isDependencyNode.Props[versionRange].(string), + DependencyType: dependencyTypeEnum, + Origin: isDependencyNode.Props[origin].(string), + Collector: isDependencyNode.Props[collector].(string), } return isDependency, nil diff --git a/pkg/assembler/clients/generated/operations.go b/pkg/assembler/clients/generated/operations.go index a70b718ea3..0081dc08dd 100644 --- a/pkg/assembler/clients/generated/operations.go +++ b/pkg/assembler/clients/generated/operations.go @@ -3740,7 +3740,7 @@ type AllIsDependencyTree struct { // Package that has the dependency Package AllIsDependencyTreePackage `json:"package"` // Package for the dependency; MUST be PackageName or PackageVersion - DependentPackage AllIsDependencyTreeDependentPackage `json:"dependentPackage"` + DependencyPackage AllIsDependencyTreeDependencyPackage `json:"dependencyPackage"` // Type of dependency DependencyType DependencyType `json:"dependencyType"` // Version range for the dependency link, required if depedentPackage points to PackageName @@ -3760,9 +3760,9 @@ func (v *AllIsDependencyTree) GetJustification() string { return v.Justification // GetPackage returns AllIsDependencyTree.Package, and is useful for accessing the field via an interface. func (v *AllIsDependencyTree) GetPackage() AllIsDependencyTreePackage { return v.Package } -// GetDependentPackage returns AllIsDependencyTree.DependentPackage, and is useful for accessing the field via an interface. -func (v *AllIsDependencyTree) GetDependentPackage() AllIsDependencyTreeDependentPackage { - return v.DependentPackage +// GetDependencyPackage returns AllIsDependencyTree.DependencyPackage, and is useful for accessing the field via an interface. +func (v *AllIsDependencyTree) GetDependencyPackage() AllIsDependencyTreeDependencyPackage { + return v.DependencyPackage } // GetDependencyType returns AllIsDependencyTree.DependencyType, and is useful for accessing the field via an interface. @@ -3777,7 +3777,7 @@ func (v *AllIsDependencyTree) GetOrigin() string { return v.Origin } // GetCollector returns AllIsDependencyTree.Collector, and is useful for accessing the field via an interface. func (v *AllIsDependencyTree) GetCollector() string { return v.Collector } -// AllIsDependencyTreeDependentPackage includes the requested fields of the GraphQL type Package. +// AllIsDependencyTreeDependencyPackage includes the requested fields of the GraphQL type Package. // The GraphQL type's documentation follows. // // Package represents the root of the package trie/tree. @@ -3794,32 +3794,32 @@ func (v *AllIsDependencyTree) GetCollector() string { return v.Collector } // // Since this node is at the root of the package trie, it is named Package, not // PackageType. -type AllIsDependencyTreeDependentPackage struct { +type AllIsDependencyTreeDependencyPackage struct { AllPkgTree `json:"-"` } -// GetId returns AllIsDependencyTreeDependentPackage.Id, and is useful for accessing the field via an interface. -func (v *AllIsDependencyTreeDependentPackage) GetId() string { return v.AllPkgTree.Id } +// GetId returns AllIsDependencyTreeDependencyPackage.Id, and is useful for accessing the field via an interface. +func (v *AllIsDependencyTreeDependencyPackage) GetId() string { return v.AllPkgTree.Id } -// GetType returns AllIsDependencyTreeDependentPackage.Type, and is useful for accessing the field via an interface. -func (v *AllIsDependencyTreeDependentPackage) GetType() string { return v.AllPkgTree.Type } +// GetType returns AllIsDependencyTreeDependencyPackage.Type, and is useful for accessing the field via an interface. +func (v *AllIsDependencyTreeDependencyPackage) GetType() string { return v.AllPkgTree.Type } -// GetNamespaces returns AllIsDependencyTreeDependentPackage.Namespaces, and is useful for accessing the field via an interface. -func (v *AllIsDependencyTreeDependentPackage) GetNamespaces() []AllPkgTreeNamespacesPackageNamespace { +// GetNamespaces returns AllIsDependencyTreeDependencyPackage.Namespaces, and is useful for accessing the field via an interface. +func (v *AllIsDependencyTreeDependencyPackage) GetNamespaces() []AllPkgTreeNamespacesPackageNamespace { return v.AllPkgTree.Namespaces } -func (v *AllIsDependencyTreeDependentPackage) UnmarshalJSON(b []byte) error { +func (v *AllIsDependencyTreeDependencyPackage) UnmarshalJSON(b []byte) error { if string(b) == "null" { return nil } var firstPass struct { - *AllIsDependencyTreeDependentPackage + *AllIsDependencyTreeDependencyPackage graphql.NoUnmarshalJSON } - firstPass.AllIsDependencyTreeDependentPackage = v + firstPass.AllIsDependencyTreeDependencyPackage = v err := json.Unmarshal(b, &firstPass) if err != nil { @@ -3834,7 +3834,7 @@ func (v *AllIsDependencyTreeDependentPackage) UnmarshalJSON(b []byte) error { return nil } -type __premarshalAllIsDependencyTreeDependentPackage struct { +type __premarshalAllIsDependencyTreeDependencyPackage struct { Id string `json:"id"` Type string `json:"type"` @@ -3842,7 +3842,7 @@ type __premarshalAllIsDependencyTreeDependentPackage struct { Namespaces []AllPkgTreeNamespacesPackageNamespace `json:"namespaces"` } -func (v *AllIsDependencyTreeDependentPackage) MarshalJSON() ([]byte, error) { +func (v *AllIsDependencyTreeDependencyPackage) MarshalJSON() ([]byte, error) { premarshaled, err := v.__premarshalJSON() if err != nil { return nil, err @@ -3850,8 +3850,8 @@ func (v *AllIsDependencyTreeDependentPackage) MarshalJSON() ([]byte, error) { return json.Marshal(premarshaled) } -func (v *AllIsDependencyTreeDependentPackage) __premarshalJSON() (*__premarshalAllIsDependencyTreeDependentPackage, error) { - var retval __premarshalAllIsDependencyTreeDependentPackage +func (v *AllIsDependencyTreeDependencyPackage) __premarshalJSON() (*__premarshalAllIsDependencyTreeDependencyPackage, error) { + var retval __premarshalAllIsDependencyTreeDependencyPackage retval.Id = v.AllPkgTree.Id retval.Type = v.AllPkgTree.Type @@ -9241,9 +9241,9 @@ func (v *NeighborsNeighborsIsDependency) GetPackage() AllIsDependencyTreePackage return v.AllIsDependencyTree.Package } -// GetDependentPackage returns NeighborsNeighborsIsDependency.DependentPackage, and is useful for accessing the field via an interface. -func (v *NeighborsNeighborsIsDependency) GetDependentPackage() AllIsDependencyTreeDependentPackage { - return v.AllIsDependencyTree.DependentPackage +// GetDependencyPackage returns NeighborsNeighborsIsDependency.DependencyPackage, and is useful for accessing the field via an interface. +func (v *NeighborsNeighborsIsDependency) GetDependencyPackage() AllIsDependencyTreeDependencyPackage { + return v.AllIsDependencyTree.DependencyPackage } // GetDependencyType returns NeighborsNeighborsIsDependency.DependencyType, and is useful for accessing the field via an interface. @@ -9298,7 +9298,7 @@ type __premarshalNeighborsNeighborsIsDependency struct { Package AllIsDependencyTreePackage `json:"package"` - DependentPackage AllIsDependencyTreeDependentPackage `json:"dependentPackage"` + DependencyPackage AllIsDependencyTreeDependencyPackage `json:"dependencyPackage"` DependencyType DependencyType `json:"dependencyType"` @@ -9324,7 +9324,7 @@ func (v *NeighborsNeighborsIsDependency) __premarshalJSON() (*__premarshalNeighb retval.Id = v.AllIsDependencyTree.Id retval.Justification = v.AllIsDependencyTree.Justification retval.Package = v.AllIsDependencyTree.Package - retval.DependentPackage = v.AllIsDependencyTree.DependentPackage + retval.DependencyPackage = v.AllIsDependencyTree.DependencyPackage retval.DependencyType = v.AllIsDependencyTree.DependencyType retval.VersionRange = v.AllIsDependencyTree.VersionRange retval.Origin = v.AllIsDependencyTree.Origin @@ -12609,9 +12609,9 @@ func (v *NodeNodeIsDependency) GetPackage() AllIsDependencyTreePackage { return v.AllIsDependencyTree.Package } -// GetDependentPackage returns NodeNodeIsDependency.DependentPackage, and is useful for accessing the field via an interface. -func (v *NodeNodeIsDependency) GetDependentPackage() AllIsDependencyTreeDependentPackage { - return v.AllIsDependencyTree.DependentPackage +// GetDependencyPackage returns NodeNodeIsDependency.DependencyPackage, and is useful for accessing the field via an interface. +func (v *NodeNodeIsDependency) GetDependencyPackage() AllIsDependencyTreeDependencyPackage { + return v.AllIsDependencyTree.DependencyPackage } // GetDependencyType returns NodeNodeIsDependency.DependencyType, and is useful for accessing the field via an interface. @@ -12662,7 +12662,7 @@ type __premarshalNodeNodeIsDependency struct { Package AllIsDependencyTreePackage `json:"package"` - DependentPackage AllIsDependencyTreeDependentPackage `json:"dependentPackage"` + DependencyPackage AllIsDependencyTreeDependencyPackage `json:"dependencyPackage"` DependencyType DependencyType `json:"dependencyType"` @@ -12688,7 +12688,7 @@ func (v *NodeNodeIsDependency) __premarshalJSON() (*__premarshalNodeNodeIsDepend retval.Id = v.AllIsDependencyTree.Id retval.Justification = v.AllIsDependencyTree.Justification retval.Package = v.AllIsDependencyTree.Package - retval.DependentPackage = v.AllIsDependencyTree.DependentPackage + retval.DependencyPackage = v.AllIsDependencyTree.DependencyPackage retval.DependencyType = v.AllIsDependencyTree.DependencyType retval.VersionRange = v.AllIsDependencyTree.VersionRange retval.Origin = v.AllIsDependencyTree.Origin @@ -15061,9 +15061,9 @@ func (v *NodesNodesIsDependency) GetPackage() AllIsDependencyTreePackage { return v.AllIsDependencyTree.Package } -// GetDependentPackage returns NodesNodesIsDependency.DependentPackage, and is useful for accessing the field via an interface. -func (v *NodesNodesIsDependency) GetDependentPackage() AllIsDependencyTreeDependentPackage { - return v.AllIsDependencyTree.DependentPackage +// GetDependencyPackage returns NodesNodesIsDependency.DependencyPackage, and is useful for accessing the field via an interface. +func (v *NodesNodesIsDependency) GetDependencyPackage() AllIsDependencyTreeDependencyPackage { + return v.AllIsDependencyTree.DependencyPackage } // GetDependencyType returns NodesNodesIsDependency.DependencyType, and is useful for accessing the field via an interface. @@ -15114,7 +15114,7 @@ type __premarshalNodesNodesIsDependency struct { Package AllIsDependencyTreePackage `json:"package"` - DependentPackage AllIsDependencyTreeDependentPackage `json:"dependentPackage"` + DependencyPackage AllIsDependencyTreeDependencyPackage `json:"dependencyPackage"` DependencyType DependencyType `json:"dependencyType"` @@ -15140,7 +15140,7 @@ func (v *NodesNodesIsDependency) __premarshalJSON() (*__premarshalNodesNodesIsDe retval.Id = v.AllIsDependencyTree.Id retval.Justification = v.AllIsDependencyTree.Justification retval.Package = v.AllIsDependencyTree.Package - retval.DependentPackage = v.AllIsDependencyTree.DependentPackage + retval.DependencyPackage = v.AllIsDependencyTree.DependencyPackage retval.DependencyType = v.AllIsDependencyTree.DependencyType retval.VersionRange = v.AllIsDependencyTree.VersionRange retval.Origin = v.AllIsDependencyTree.Origin @@ -18511,9 +18511,9 @@ func (v *PathPathIsDependency) GetPackage() AllIsDependencyTreePackage { return v.AllIsDependencyTree.Package } -// GetDependentPackage returns PathPathIsDependency.DependentPackage, and is useful for accessing the field via an interface. -func (v *PathPathIsDependency) GetDependentPackage() AllIsDependencyTreeDependentPackage { - return v.AllIsDependencyTree.DependentPackage +// GetDependencyPackage returns PathPathIsDependency.DependencyPackage, and is useful for accessing the field via an interface. +func (v *PathPathIsDependency) GetDependencyPackage() AllIsDependencyTreeDependencyPackage { + return v.AllIsDependencyTree.DependencyPackage } // GetDependencyType returns PathPathIsDependency.DependencyType, and is useful for accessing the field via an interface. @@ -18564,7 +18564,7 @@ type __premarshalPathPathIsDependency struct { Package AllIsDependencyTreePackage `json:"package"` - DependentPackage AllIsDependencyTreeDependentPackage `json:"dependentPackage"` + DependencyPackage AllIsDependencyTreeDependencyPackage `json:"dependencyPackage"` DependencyType DependencyType `json:"dependencyType"` @@ -18590,7 +18590,7 @@ func (v *PathPathIsDependency) __premarshalJSON() (*__premarshalPathPathIsDepend retval.Id = v.AllIsDependencyTree.Id retval.Justification = v.AllIsDependencyTree.Justification retval.Package = v.AllIsDependencyTree.Package - retval.DependentPackage = v.AllIsDependencyTree.DependentPackage + retval.DependencyPackage = v.AllIsDependencyTree.DependencyPackage retval.DependencyType = v.AllIsDependencyTree.DependencyType retval.VersionRange = v.AllIsDependencyTree.VersionRange retval.Origin = v.AllIsDependencyTree.Origin @@ -24712,7 +24712,7 @@ fragment AllIsDependencyTree on IsDependency { package { ... AllPkgTree } - dependentPackage { + dependencyPackage { ... AllPkgTree } dependencyType @@ -25171,7 +25171,7 @@ fragment AllIsDependencyTree on IsDependency { package { ... AllPkgTree } - dependentPackage { + dependencyPackage { ... AllPkgTree } dependencyType @@ -25628,7 +25628,7 @@ fragment AllIsDependencyTree on IsDependency { package { ... AllPkgTree } - dependentPackage { + dependencyPackage { ... AllPkgTree } dependencyType @@ -26314,7 +26314,7 @@ fragment AllIsDependencyTree on IsDependency { package { ... AllPkgTree } - dependentPackage { + dependencyPackage { ... AllPkgTree } dependencyType diff --git a/pkg/assembler/clients/operations/trees.graphql b/pkg/assembler/clients/operations/trees.graphql index aba7d89e48..6e10474b9f 100644 --- a/pkg/assembler/clients/operations/trees.graphql +++ b/pkg/assembler/clients/operations/trees.graphql @@ -144,7 +144,7 @@ fragment AllIsDependencyTree on IsDependency { package { ...AllPkgTree } - dependentPackage { + dependencyPackage { ...AllPkgTree } dependencyType diff --git a/pkg/assembler/graphql/examples/is_dependency.gql b/pkg/assembler/graphql/examples/is_dependency.gql index 8ec927c070..14f27bf5c7 100644 --- a/pkg/assembler/graphql/examples/is_dependency.gql +++ b/pkg/assembler/graphql/examples/is_dependency.gql @@ -22,7 +22,7 @@ fragment allIsDependencyTree on IsDependency { } } } - dependentPackage { + dependencyPackage { id type namespaces { diff --git a/pkg/assembler/graphql/generated/artifact.generated.go b/pkg/assembler/graphql/generated/artifact.generated.go index 439daa9d23..84495986fb 100644 --- a/pkg/assembler/graphql/generated/artifact.generated.go +++ b/pkg/assembler/graphql/generated/artifact.generated.go @@ -5494,8 +5494,8 @@ func (ec *executionContext) fieldContext_Query_IsDependency(ctx context.Context, return ec.fieldContext_IsDependency_id(ctx, field) case "package": return ec.fieldContext_IsDependency_package(ctx, field) - case "dependentPackage": - return ec.fieldContext_IsDependency_dependentPackage(ctx, field) + case "dependencyPackage": + return ec.fieldContext_IsDependency_dependencyPackage(ctx, field) case "versionRange": return ec.fieldContext_IsDependency_versionRange(ctx, field) case "dependencyType": diff --git a/pkg/assembler/graphql/generated/isDependency.generated.go b/pkg/assembler/graphql/generated/isDependency.generated.go index f7a333ebeb..78679f4f88 100644 --- a/pkg/assembler/graphql/generated/isDependency.generated.go +++ b/pkg/assembler/graphql/generated/isDependency.generated.go @@ -125,8 +125,8 @@ func (ec *executionContext) fieldContext_IsDependency_package(ctx context.Contex return fc, nil } -func (ec *executionContext) _IsDependency_dependentPackage(ctx context.Context, field graphql.CollectedField, obj *model.IsDependency) (ret graphql.Marshaler) { - fc, err := ec.fieldContext_IsDependency_dependentPackage(ctx, field) +func (ec *executionContext) _IsDependency_dependencyPackage(ctx context.Context, field graphql.CollectedField, obj *model.IsDependency) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_IsDependency_dependencyPackage(ctx, field) if err != nil { return graphql.Null } @@ -139,7 +139,7 @@ func (ec *executionContext) _IsDependency_dependentPackage(ctx context.Context, }() resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { ctx = rctx // use context from middleware stack in children - return obj.DependentPackage, nil + return obj.DependencyPackage, nil }) if err != nil { ec.Error(ctx, err) @@ -156,7 +156,7 @@ func (ec *executionContext) _IsDependency_dependentPackage(ctx context.Context, return ec.marshalNPackage2ᚖgithubᚗcomᚋguacsecᚋguacᚋpkgᚋassemblerᚋgraphqlᚋmodelᚐPackage(ctx, field.Selections, res) } -func (ec *executionContext) fieldContext_IsDependency_dependentPackage(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { +func (ec *executionContext) fieldContext_IsDependency_dependencyPackage(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { fc = &graphql.FieldContext{ Object: "IsDependency", Field: field, @@ -473,7 +473,7 @@ func (ec *executionContext) unmarshalInputIsDependencySpec(ctx context.Context, asMap[k] = v } - fieldsInOrder := [...]string{"id", "package", "dependentPackage", "versionRange", "dependencyType", "justification", "origin", "collector"} + fieldsInOrder := [...]string{"id", "package", "dependencyPackage", "versionRange", "dependencyType", "justification", "origin", "collector"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -498,15 +498,15 @@ func (ec *executionContext) unmarshalInputIsDependencySpec(ctx context.Context, return it, err } it.Package = data - case "dependentPackage": + case "dependencyPackage": var err error - ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("dependentPackage")) + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("dependencyPackage")) data, err := ec.unmarshalOPkgSpec2ᚖgithubᚗcomᚋguacsecᚋguacᚋpkgᚋassemblerᚋgraphqlᚋmodelᚐPkgSpec(ctx, v) if err != nil { return it, err } - it.DependentPackage = data + it.DependencyPackage = data case "versionRange": var err error @@ -587,8 +587,8 @@ func (ec *executionContext) _IsDependency(ctx context.Context, sel ast.Selection if out.Values[i] == graphql.Null { out.Invalids++ } - case "dependentPackage": - out.Values[i] = ec._IsDependency_dependentPackage(ctx, field, obj) + case "dependencyPackage": + out.Values[i] = ec._IsDependency_dependencyPackage(ctx, field, obj) if out.Values[i] == graphql.Null { out.Invalids++ } diff --git a/pkg/assembler/graphql/generated/root_.generated.go b/pkg/assembler/graphql/generated/root_.generated.go index a64dbd1f8a..7665457db5 100644 --- a/pkg/assembler/graphql/generated/root_.generated.go +++ b/pkg/assembler/graphql/generated/root_.generated.go @@ -153,14 +153,14 @@ type ComplexityRoot struct { } IsDependency struct { - Collector func(childComplexity int) int - DependencyType func(childComplexity int) int - DependentPackage func(childComplexity int) int - ID func(childComplexity int) int - Justification func(childComplexity int) int - Origin func(childComplexity int) int - Package func(childComplexity int) int - VersionRange func(childComplexity int) int + Collector func(childComplexity int) int + DependencyPackage func(childComplexity int) int + DependencyType func(childComplexity int) int + ID func(childComplexity int) int + Justification func(childComplexity int) int + Origin func(childComplexity int) int + Package func(childComplexity int) int + VersionRange func(childComplexity int) int } IsOccurrence struct { @@ -939,19 +939,19 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.IsDependency.Collector(childComplexity), true - case "IsDependency.dependencyType": - if e.complexity.IsDependency.DependencyType == nil { + case "IsDependency.dependencyPackage": + if e.complexity.IsDependency.DependencyPackage == nil { break } - return e.complexity.IsDependency.DependencyType(childComplexity), true + return e.complexity.IsDependency.DependencyPackage(childComplexity), true - case "IsDependency.dependentPackage": - if e.complexity.IsDependency.DependentPackage == nil { + case "IsDependency.dependencyType": + if e.complexity.IsDependency.DependencyType == nil { break } - return e.complexity.IsDependency.DependentPackage(childComplexity), true + return e.complexity.IsDependency.DependencyType(childComplexity), true case "IsDependency.id": if e.complexity.IsDependency.ID == nil { @@ -4063,13 +4063,13 @@ enum DependencyType { UNKNOWN } -"IsDependency is an attestation to record that a package depends on another." +"IsDependency is an attestation to record that a package depends on another. " type IsDependency { id: ID! "Package that has the dependency" package: Package! - "Package for the dependency; MUST be PackageName or PackageVersion" - dependentPackage: Package! + "Package for the dependency; MUST be PackageName or PackageVersion " + dependencyPackage: Package! "Version range for the dependency link, required if depedentPackage points to PackageName" versionRange: String! "Type of dependency" @@ -4088,12 +4088,12 @@ IsDependencySpec allows filtering the list of dependencies to return. To obtain the list of dependency packages, caller must fill in the package field. -Dependent packages must be defined at PackageName, not PackageVersion. +Dependency packages must be defined at PackageName, not PackageVersion. """ input IsDependencySpec { id: ID package: PkgSpec - dependentPackage: PkgSpec + dependencyPackage: PkgSpec versionRange: String dependencyType: DependencyType justification: String diff --git a/pkg/assembler/graphql/model/nodes.go b/pkg/assembler/graphql/model/nodes.go index b5ed7aba57..a68007b6e9 100644 --- a/pkg/assembler/graphql/model/nodes.go +++ b/pkg/assembler/graphql/model/nodes.go @@ -568,7 +568,7 @@ type IsDependency struct { // Package that has the dependency Package *Package `json:"package"` // Package for the dependency; MUST be PackageName or PackageVersion - DependentPackage *Package `json:"dependentPackage"` + DependencyPackage *Package `json:"dependencyPackage"` // Version range for the dependency link, required if depedentPackage points to PackageName VersionRange string `json:"versionRange"` // Type of dependency @@ -598,16 +598,16 @@ type IsDependencyInputSpec struct { // To obtain the list of dependency packages, caller must fill in the package // field. // -// Dependent packages must be defined at PackageName, not PackageVersion. +// Dependency packages must be defined at PackageName, not PackageVersion. type IsDependencySpec struct { - ID *string `json:"id,omitempty"` - Package *PkgSpec `json:"package,omitempty"` - DependentPackage *PkgSpec `json:"dependentPackage,omitempty"` - VersionRange *string `json:"versionRange,omitempty"` - DependencyType *DependencyType `json:"dependencyType,omitempty"` - Justification *string `json:"justification,omitempty"` - Origin *string `json:"origin,omitempty"` - Collector *string `json:"collector,omitempty"` + ID *string `json:"id,omitempty"` + Package *PkgSpec `json:"package,omitempty"` + DependencyPackage *PkgSpec `json:"dependencyPackage,omitempty"` + VersionRange *string `json:"versionRange,omitempty"` + DependencyType *DependencyType `json:"dependencyType,omitempty"` + Justification *string `json:"justification,omitempty"` + Origin *string `json:"origin,omitempty"` + Collector *string `json:"collector,omitempty"` } // IsOccurrence is an attestation to link an artifact to a package or source. diff --git a/pkg/assembler/graphql/schema/isDependency.graphql b/pkg/assembler/graphql/schema/isDependency.graphql index 7dbcf8b0a8..56a8e63588 100644 --- a/pkg/assembler/graphql/schema/isDependency.graphql +++ b/pkg/assembler/graphql/schema/isDependency.graphql @@ -27,13 +27,13 @@ enum DependencyType { UNKNOWN } -"IsDependency is an attestation to record that a package depends on another." +"IsDependency is an attestation to record that a package depends on another. " type IsDependency { id: ID! "Package that has the dependency" package: Package! - "Package for the dependency; MUST be PackageName or PackageVersion" - dependentPackage: Package! + "Package for the dependency; MUST be PackageName or PackageVersion " + dependencyPackage: Package! "Version range for the dependency link, required if depedentPackage points to PackageName" versionRange: String! "Type of dependency" @@ -52,12 +52,12 @@ IsDependencySpec allows filtering the list of dependencies to return. To obtain the list of dependency packages, caller must fill in the package field. -Dependent packages must be defined at PackageName, not PackageVersion. +Dependency packages must be defined at PackageName, not PackageVersion. """ input IsDependencySpec { id: ID package: PkgSpec - dependentPackage: PkgSpec + dependencyPackage: PkgSpec versionRange: String dependencyType: DependencyType justification: String diff --git a/pkg/guacanalytics/patchPlanning.go b/pkg/guacanalytics/patchPlanning.go index 15b2d4cddc..855b6a11dc 100644 --- a/pkg/guacanalytics/patchPlanning.go +++ b/pkg/guacanalytics/patchPlanning.go @@ -241,7 +241,7 @@ func exploreIsDependencyFromDepPkg(ctx context.Context, gqlClient graphql.Client } path = append(path, isDependency.Id) - targetDepPkgVersion := len(isDependency.DependentPackage.Namespaces[0].Names[0].Versions) > 0 + targetDepPkgVersion := len(isDependency.DependencyPackage.Namespaces[0].Names[0].Versions) > 0 if !targetDepPkgVersion { doesRangeInclude, err := depversion.DoesRangeInclude(q.nowNode.nodeVersions, isDependency.VersionRange)