Skip to content

Commit

Permalink
[ENT] Complete ent pagination and update backend tests (#1870)
Browse files Browse the repository at this point in the history 
* add more descriptive error messages and update hasSBOM query

Signed-off-by: pxp928 <parth.psu@gmail.com>

* remove unnecessary limit with pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add certifyBad pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add certifyGood pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add certifyLegal pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add vex pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add certifyVuln and isDep pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add hashequal pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add hasMetadata and license pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add occurrence pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add package and pkgEqual pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add point of contact pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add sbom and scorecard pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add slsa pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add hasSourceAt pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add source pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* add vulnEqual, vuln and vulnMeta pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

* update backend unit tests for pagination

Signed-off-by: pxp928 <parth.psu@gmail.com>

---------

Signed-off-by: pxp928 <parth.psu@gmail.com>
  • Loading branch information
@pxp928
pxp928 committed Apr 29, 2024
1 parent 90d95a5 commit 8189495
Show file tree
Hide file tree
Showing 50 changed files with 2,059 additions and 448 deletions.
10 changes: 8 additions & 2 deletions internal/testing/backend/artifact_test.go
View file
Expand Up @@ -108,12 +108,18 @@ func TestArtifacts(t *testing.T) {
if tt.idInFilter {
tt.artifactSpec.ID = ptrfrom.String(ingestedArtID)
}
got, err := b.Artifacts(ctx, tt.artifactSpec)
got, err := b.ArtifactsList(ctx, *tt.artifactSpec, nil, nil)
if (err != nil) != tt.wantErr {
t.Errorf("arangoClient.Artifacts() error = %v, wantErr %v", err, tt.wantErr)
return
}
if diff := cmp.Diff(tt.want, got, commonOpts); diff != "" {
var returnedObjects []*model.Artifact
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(tt.want, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
10 changes: 8 additions & 2 deletions internal/testing/backend/builder_test.go
View file
Expand Up @@ -84,12 +84,18 @@ func TestBuilders(t *testing.T) {
if tt.idInFilter {
tt.builderSpec.ID = &ingestedBuilderID
}
got, err := b.Builders(ctx, tt.builderSpec)
got, err := b.BuildersList(ctx, *tt.builderSpec, nil, nil)
if (err != nil) != tt.wantErr {
t.Errorf("demoClient.Builders() error = %v, wantErr %v", err, tt.wantErr)
return
}
if diff := cmp.Diff(tt.want, got, commonOpts); diff != "" {
var returnedObjects []*model.Builder
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(tt.want, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
24 changes: 18 additions & 6 deletions internal/testing/backend/certifyBad_test.go
View file
Expand Up @@ -837,16 +837,22 @@ func TestCertifyBad(t *testing.T) {
}
}
}
got, err := b.CertifyBad(ctx, test.Query)
got, err := b.CertifyBadList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
slices.SortFunc(got, cmpCB)
var returnedObjects []*model.CertifyBad
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
slices.SortFunc(returnedObjects, cmpCB)
slices.SortFunc(test.ExpCB, cmpCB)
if diff := cmp.Diff(test.ExpCB, got, commonOpts); diff != "" {
if diff := cmp.Diff(test.ExpCB, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down Expand Up @@ -1159,16 +1165,22 @@ func TestIngestCertifyBads(t *testing.T) {
return
}
}
got, err := b.CertifyBad(ctx, test.Query)
got, err := b.CertifyBadList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
slices.SortFunc(got, cmpCB)
var returnedObjects []*model.CertifyBad
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
slices.SortFunc(returnedObjects, cmpCB)
slices.SortFunc(test.ExpCB, cmpCB)
if diff := cmp.Diff(test.ExpCB, got, commonOpts); diff != "" {
if diff := cmp.Diff(test.ExpCB, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
20 changes: 16 additions & 4 deletions internal/testing/backend/certifyGood_test.go
View file
Expand Up @@ -689,14 +689,20 @@ func TestCertifyGood(t *testing.T) {
}
}
}
got, err := b.CertifyGood(ctx, test.Query)
got, err := b.CertifyGoodList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpCG, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyGood
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpCG, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down Expand Up @@ -1006,14 +1012,20 @@ func TestIngestCertifyGoods(t *testing.T) {
return
}
}
got, err := b.CertifyGood(ctx, test.Query)
got, err := b.CertifyGoodList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpCG, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyGood
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpCG, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
20 changes: 16 additions & 4 deletions internal/testing/backend/certifyLegal_test.go
View file
Expand Up @@ -582,14 +582,20 @@ func TestLegal(t *testing.T) {
test.Query.ID = ptrfrom.String(clID)
}
}
got, err := b.CertifyLegal(ctx, test.Query)
got, err := b.CertifyLegalList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpLegal, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyLegal
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpLegal, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down Expand Up @@ -704,14 +710,20 @@ func TestLegals(t *testing.T) {
return
}
}
got, err := b.CertifyLegal(ctx, test.Query)
got, err := b.CertifyLegalList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpLegal, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyLegal
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpLegal, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
20 changes: 16 additions & 4 deletions internal/testing/backend/certifyScorecard_test.go
View file
Expand Up @@ -533,14 +533,20 @@ func TestCertifyScorecard(t *testing.T) {
}
}
}
got, err := b.Scorecards(ctx, test.Query)
got, err := b.ScorecardsList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpSC, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyScorecard
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpSC, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down Expand Up @@ -757,14 +763,20 @@ func TestIngestScorecards(t *testing.T) {
return
}
}
got, err := b.Scorecards(ctx, test.Query)
got, err := b.ScorecardsList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpSC, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyScorecard
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpSC, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
20 changes: 16 additions & 4 deletions internal/testing/backend/certifyVEXStatement_test.go
View file
Expand Up @@ -931,14 +931,20 @@ func TestVEX(t *testing.T) {
}
}
}
got, err := b.CertifyVEXStatement(ctx, test.Query)
got, err := b.CertifyVEXStatementList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpVEX, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyVEXStatement
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpVEX, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down Expand Up @@ -1350,14 +1356,20 @@ func TestVEXBulkIngest(t *testing.T) {
return
}
}
got, err := b.CertifyVEXStatement(ctx, test.Query)
got, err := b.CertifyVEXStatementList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpVEX, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyVEXStatement
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpVEX, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
20 changes: 16 additions & 4 deletions internal/testing/backend/certifyVuln_test.go
View file
Expand Up @@ -1014,14 +1014,20 @@ func TestIngestCertifyVulnerability(t *testing.T) {
}
}
}
got, err := b.CertifyVuln(ctx, test.Query)
got, err := b.CertifyVulnList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpVuln, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyVuln
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpVuln, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down Expand Up @@ -1489,14 +1495,20 @@ func TestIngestCertifyVulns(t *testing.T) {
}

}
got, err := b.CertifyVuln(ctx, test.Query)
got, err := b.CertifyVulnList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpVuln, got, commonOpts); diff != "" {
var returnedObjects []*model.CertifyVuln
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpVuln, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down
20 changes: 16 additions & 4 deletions internal/testing/backend/hasMetadata_test.go
View file
Expand Up @@ -824,14 +824,20 @@ func TestHasMetadata(t *testing.T) {
}
}
}
got, err := b.HasMetadata(ctx, test.Query)
got, err := b.HasMetadataList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpHM, got, commonOpts); diff != "" {
var returnedObjects []*model.HasMetadata
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpHM, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down Expand Up @@ -1148,14 +1154,20 @@ func TestIngestBulkHasMetadata(t *testing.T) {
return
}
}
got, err := b.HasMetadata(ctx, test.Query)
got, err := b.HasMetadataList(ctx, *test.Query, nil, nil)
if (err != nil) != test.ExpQueryErr {
t.Fatalf("did not get expected query error, want: %v, got: %v", test.ExpQueryErr, err)
}
if err != nil {
return
}
if diff := cmp.Diff(test.ExpHM, got, commonOpts); diff != "" {
var returnedObjects []*model.HasMetadata
if got != nil {
for _, obj := range got.Edges {
returnedObjects = append(returnedObjects, obj.Node)
}
}
if diff := cmp.Diff(test.ExpHM, returnedObjects, commonOpts); diff != "" {
t.Errorf("Unexpected results. (-want +got):\n%s", diff)
}
})
Expand Down

0 comments on commit 8189495

Please sign in to comment.