From 9fd1e0e1c76749a0ea3b8c0977764d903ef2c065 Mon Sep 17 00:00:00 2001 From: Kanstantsin Buklis Date: Tue, 5 May 2026 11:24:53 +0200 Subject: [PATCH] chore: format code Signed-off-by: Kanstantsin Buklis --- .../api/graphql/graph/baseResolver/common.go | 3 +- .../graph/resolver/component_version.go | 3 +- .../api/graphql/graph/resolver/issue_match.go | 9 +- .../app/severity/severity_handler_test.go | 6 +- internal/database/mariadb/autopatch_test.go | 6 +- internal/database/mariadb/component.go | 6 +- .../database/mariadb/component_instance.go | 3 +- .../mariadb/component_instance_test.go | 49 ++++---- internal/database/mariadb/component_test.go | 82 +++++++------- .../database/mariadb/component_version.go | 5 +- .../mariadb/component_version_test.go | 47 ++++---- internal/database/mariadb/database.go | 42 ++++--- internal/database/mariadb/db_object.go | 6 +- internal/database/mariadb/issue.go | 12 +- internal/database/mariadb/issue_match.go | 3 +- internal/database/mariadb/issue_match_test.go | 51 ++++----- internal/database/mariadb/issue_repository.go | 3 +- .../database/mariadb/issue_repository_test.go | 98 ++++++++-------- internal/database/mariadb/issue_test.go | 77 +++++++------ internal/database/mariadb/issue_variant.go | 3 +- .../database/mariadb/issue_variant_test.go | 91 +++++++-------- internal/database/mariadb/migration.go | 3 +- .../database/mariadb/mv_vulnerabilities.go | 3 +- internal/database/mariadb/patch.go | 3 +- internal/database/mariadb/patch_test.go | 39 +++---- internal/database/mariadb/remediation.go | 3 +- internal/database/mariadb/remediation_test.go | 45 ++++---- internal/database/mariadb/service.go | 9 +- .../database/mariadb/service_issue_variant.go | 3 +- internal/database/mariadb/service_test.go | 106 +++++++++--------- internal/database/mariadb/support_group.go | 3 +- internal/database/mariadb/user.go | 3 +- internal/e2e/authentication_test.go | 12 +- internal/e2e/cache_test.go | 12 +- .../e2e/component_instance_filter_test.go | 3 +- internal/e2e/component_version_query_test.go | 6 +- internal/e2e/image_query_test.go | 9 +- internal/e2e/patch_query_test.go | 6 +- internal/e2e/remediation_query_test.go | 42 ++++--- internal/e2e/siem_alert_test.go | 12 +- internal/server/server.go | 3 +- 41 files changed, 515 insertions(+), 415 deletions(-) diff --git a/internal/api/graphql/graph/baseResolver/common.go b/internal/api/graphql/graph/baseResolver/common.go index 58bac4034..e8de4bb47 100644 --- a/internal/api/graphql/graph/baseResolver/common.go +++ b/internal/api/graphql/graph/baseResolver/common.go @@ -122,7 +122,8 @@ func GetNestedPreloads( ctx, graphql.CollectFields(ctx, column.Selections, nil), prefixColumn, - )...) + )..., + ) } return diff --git a/internal/api/graphql/graph/resolver/component_version.go b/internal/api/graphql/graph/resolver/component_version.go index 7933c11d5..f6ef22df4 100644 --- a/internal/api/graphql/graph/resolver/component_version.go +++ b/internal/api/graphql/graph/resolver/component_version.go @@ -34,7 +34,8 @@ func (r *componentVersionResolver) Component(ctx context.Context, obj *model.Com Parent: obj, ParentName: model.IssueMatchNodeName, ChildIds: childIds, - }) + }, + ) } func (r *componentVersionResolver) Issues(ctx context.Context, obj *model.ComponentVersion, filter *model.IssueFilter, first *int, after *string, orderBy []*model.IssueOrderBy) (*model.IssueConnection, error) { diff --git a/internal/api/graphql/graph/resolver/issue_match.go b/internal/api/graphql/graph/resolver/issue_match.go index 85df5e7f6..a6868c6ba 100644 --- a/internal/api/graphql/graph/resolver/issue_match.go +++ b/internal/api/graphql/graph/resolver/issue_match.go @@ -28,7 +28,8 @@ func (r *issueMatchResolver) EffectiveIssueVariants(ctx context.Context, obj *mo &model.NodeParent{ Parent: obj, ParentName: model.IssueMatchNodeName, - }) + }, + ) } func (r *issueMatchResolver) Issue(ctx context.Context, obj *model.IssueMatch) (*model.Issue, error) { @@ -45,7 +46,8 @@ func (r *issueMatchResolver) Issue(ctx context.Context, obj *model.IssueMatch) ( Parent: obj, ParentName: model.IssueMatchNodeName, ChildIds: childIds, - }) + }, + ) } func (r *issueMatchResolver) ComponentInstance(ctx context.Context, obj *model.IssueMatch) (*model.ComponentInstance, error) { @@ -62,7 +64,8 @@ func (r *issueMatchResolver) ComponentInstance(ctx context.Context, obj *model.I Parent: obj, ParentName: model.IssueMatchNodeName, ChildIds: childIds, - }) + }, + ) } func (r *Resolver) IssueMatch() graph.IssueMatchResolver { return &issueMatchResolver{r} } diff --git a/internal/app/severity/severity_handler_test.go b/internal/app/severity/severity_handler_test.go index 9059e92d4..f36cf610d 100644 --- a/internal/app/severity/severity_handler_test.go +++ b/internal/app/severity/severity_handler_test.go @@ -123,7 +123,7 @@ var _ = Describe("When get Severity", Label("app", "GetSeverity"), func() { severityHandler = ss.NewSeverityHandler(handlerContext, ivs) severity, err := severityHandler.GetSeverity(context.Background(), sFilter) Expect(err).To(BeNil(), "no error should be thrown") - Expect(severity).ToNot((BeNil()), "severity should exist.") + Expect(severity).ToNot(BeNil(), "severity should exist.") Expect( severity.Score, ).To(BeEquivalentTo(maxSeverityScore), "severity score is correct.") @@ -139,7 +139,7 @@ var _ = Describe("When get Severity", Label("app", "GetSeverity"), func() { severityHandler = ss.NewSeverityHandler(handlerContext, ivs) severity, err := severityHandler.GetSeverity(context.Background(), sFilter) Expect(err).To(BeNil(), "no error should be thrown") - Expect(severity).ToNot((BeNil()), "severity should exist.") + Expect(severity).ToNot(BeNil(), "severity should exist.") Expect( severity.Score, ).To(BeEquivalentTo(maxSeverityScore-1), "severity score is correct.") @@ -188,7 +188,7 @@ var _ = Describe("When get Severity", Label("app", "GetSeverity"), func() { severityHandler = ss.NewSeverityHandler(handlerContext, ivs) severity, err := severityHandler.GetSeverity(context.Background(), sFilter) Expect(err).To(BeNil(), "no error should be thrown") - Expect(severity).ToNot((BeNil()), "severity should exist.") + Expect(severity).ToNot(BeNil(), "severity should exist.") Expect( severity.Score, ).To(BeEquivalentTo(maxSeverityScore), "severity score ist correct.") diff --git a/internal/database/mariadb/autopatch_test.go b/internal/database/mariadb/autopatch_test.go index d1f75e497..ea384c1e4 100644 --- a/internal/database/mariadb/autopatch_test.go +++ b/internal/database/mariadb/autopatch_test.go @@ -213,13 +213,15 @@ func (apt *autoPatchTest) ExpectComponentVersionIssuesToBeStoredInDatabase( ).To(BeNil(), "%s THEN component version issues: '%s' should not be deleted yet (%s)", when, strings.Join( lo.Map(expectComponentVersionIssues, func(cvi test.ComponentVersionIssue, _ int) string { return fmt.Sprintf("i:%s cv:%s", cvi.Issue, cvi.ComponentVersion) - }), ", "), err) + }), ", ", + ), err) Expect( componentVersionIssues, ).To(test.ContainAll(expectComponentVersionIssues), "%s THEN component version issues: '%s' should be deleted yet", when, strings.Join( lo.Map(expectComponentVersionIssues, func(cvi test.ComponentVersionIssue, _ int) string { return fmt.Sprintf("i:%s cv:%s", cvi.Issue, cvi.ComponentVersion) - }), ", ")) + }), ", ", + )) } func (apt *autoPatchTest) ExpectComponentVersionIssuesToBeDeleted( diff --git a/internal/database/mariadb/component.go b/internal/database/mariadb/component.go index 99b7918ca..2ce60de04 100644 --- a/internal/database/mariadb/component.go +++ b/internal/database/mariadb/component.go @@ -216,7 +216,8 @@ func (s *SqlDatabase) buildComponentStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } @@ -440,7 +441,8 @@ func (s *SqlDatabase) CountComponentVulnerabilities( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } diff --git a/internal/database/mariadb/component_instance.go b/internal/database/mariadb/component_instance.go index ccfb6f40c..f1db9347a 100644 --- a/internal/database/mariadb/component_instance.go +++ b/internal/database/mariadb/component_instance.go @@ -314,7 +314,8 @@ func (s *SqlDatabase) buildComponentInstanceStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("failed to prepare ComponentInstance statement: %w", err) } diff --git a/internal/database/mariadb/component_instance_test.go b/internal/database/mariadb/component_instance_test.go index adabfde0f..abcf028d1 100644 --- a/internal/database/mariadb/component_instance_test.go +++ b/internal/database/mariadb/component_instance_test.go @@ -194,8 +194,8 @@ var _ = Describe("ComponentInstance - ", Label("database", "ComponentInstance"), cir := test.PickOne(seedCollection.ComponentInstanceRows) service, ok := seedCollection.GetServiceById(cir.ServiceId.Int64) Expect(ok).To(BeTrue()) - Expect(service.Id.Valid).To((BeTrue())) - Expect(service.CCRN.Valid).To((BeTrue())) + Expect(service.Id.Valid).To(BeTrue()) + Expect(service.CCRN.Valid).To(BeTrue()) filter := &entity.ComponentInstanceFilter{ Paginated: entity.Paginated{}, ServiceCcrn: []*string{lo.ToPtr(service.CCRN.String)}, @@ -292,28 +292,29 @@ var _ = Describe("ComponentInstance - ", Label("database", "ComponentInstance"), }) }) Context("and using Pagination", func() { - DescribeTable("can correctly paginate with x elements", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetComponentInstances, - func(first *int, after *string) *entity.ComponentInstanceFilter { - return &entity.ComponentInstanceFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.ComponentInstanceResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithComponentInstance( - []entity.Order{}, - *entries[len(entries)-1].ComponentInstance, - ), - ) - return after - }, - len(seedCollection.ComponentInstanceRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate with x elements", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetComponentInstances, + func(first *int, after *string) *entity.ComponentInstanceFilter { + return &entity.ComponentInstanceFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.ComponentInstanceResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithComponentInstance( + []entity.Order{}, + *entries[len(entries)-1].ComponentInstance, + ), + ) + return after + }, + len(seedCollection.ComponentInstanceRows), + pageSize, + ) + }, Entry("when x is 1", 1), Entry("when x is 3", 3), Entry("when x is 5", 5), diff --git a/internal/database/mariadb/component_test.go b/internal/database/mariadb/component_test.go index 5c94915f8..8b081011c 100644 --- a/internal/database/mariadb/component_test.go +++ b/internal/database/mariadb/component_test.go @@ -250,29 +250,30 @@ var _ = Describe("Component", Label("database", "Component"), func() { }) }) Context("and using pagination", func() { - DescribeTable("can correctly paginate with x elements", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetComponents, - func(first *int, after *string) *entity.ComponentFilter { - return &entity.ComponentFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.ComponentResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithComponent( - []entity.Order{}, - *entries[len(entries)-1].Component, - entity.IssueSeverityCounts{}, - ), - ) - return after - }, - len(seedCollection.ComponentRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate with x elements", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetComponents, + func(first *int, after *string) *entity.ComponentFilter { + return &entity.ComponentFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.ComponentResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithComponent( + []entity.Order{}, + *entries[len(entries)-1].Component, + entity.IssueSeverityCounts{}, + ), + ) + return after + }, + len(seedCollection.ComponentRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), @@ -326,24 +327,25 @@ var _ = Describe("Component", Label("database", "Component"), func() { }) Context("and using a filter", func() { - DescribeTable("can count with a filter", func(pageSize int, filterMatches int) { - components := lo.Filter( - seedCollection.ComponentRows, - func(cr mariadb.ComponentRow, _ int) bool { - return cr.CCRN.String == randomComponent.CCRN.String - }, - ) - - filter := &entity.ComponentFilter{ - Paginated: entity.Paginated{ - First: &pageSize, - After: nil, - }, - CCRN: []*string{&randomComponent.CCRN.String}, - } + DescribeTable( + "can count with a filter", func(pageSize int, filterMatches int) { + components := lo.Filter( + seedCollection.ComponentRows, + func(cr mariadb.ComponentRow, _ int) bool { + return cr.CCRN.String == randomComponent.CCRN.String + }, + ) + + filter := &entity.ComponentFilter{ + Paginated: entity.Paginated{ + First: &pageSize, + After: nil, + }, + CCRN: []*string{&randomComponent.CCRN.String}, + } - testCountComponents(filter, len(components)) - }, + testCountComponents(filter, len(components)) + }, Entry("and pageSize is 1 and it has 13 elements", 1, 13), Entry("and pageSize is 20 and it has 5 elements", 20, 5), Entry("and pageSize is 100 and it has 100 elements", 100, 100), diff --git a/internal/database/mariadb/component_version.go b/internal/database/mariadb/component_version.go index 4f6b77958..68e2ba0e4 100644 --- a/internal/database/mariadb/component_version.go +++ b/internal/database/mariadb/component_version.go @@ -280,7 +280,8 @@ func (s *SqlDatabase) buildComponentVersionStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } @@ -394,7 +395,7 @@ func (s *SqlDatabase) GetComponentVersions( isc = e.AsIssueSeverityCounts() } - cursor, _ := EncodeCursor((WithComponentVersion(order, cv, isc))) + cursor, _ := EncodeCursor(WithComponentVersion(order, cv, isc)) cvr := entity.ComponentVersionResult{ WithCursor: entity.WithCursor{ diff --git a/internal/database/mariadb/component_version_test.go b/internal/database/mariadb/component_version_test.go index 45490846e..59f8289c0 100644 --- a/internal/database/mariadb/component_version_test.go +++ b/internal/database/mariadb/component_version_test.go @@ -400,29 +400,30 @@ var _ = Describe("ComponentVersion", Label("database", "ComponentVersion"), func }) Context("and using pagination", func() { - DescribeTable("can correctly paginate with x elements", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetComponentVersions, - func(first *int, after *string) *entity.ComponentVersionFilter { - return &entity.ComponentVersionFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.ComponentVersionResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithComponentVersion( - []entity.Order{}, - *entries[len(entries)-1].ComponentVersion, - entity.IssueSeverityCounts{}, - ), - ) - return after - }, - len(seedCollection.ComponentVersionRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate with x elements", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetComponentVersions, + func(first *int, after *string) *entity.ComponentVersionFilter { + return &entity.ComponentVersionFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.ComponentVersionResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithComponentVersion( + []entity.Order{}, + *entries[len(entries)-1].ComponentVersion, + entity.IssueSeverityCounts{}, + ), + ) + return after + }, + len(seedCollection.ComponentVersionRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), diff --git a/internal/database/mariadb/database.go b/internal/database/mariadb/database.go index 6cbfd508a..150dadb9f 100644 --- a/internal/database/mariadb/database.go +++ b/internal/database/mariadb/database.go @@ -159,7 +159,8 @@ func performInsert[T any](s *SqlDatabase, query string, item T, l *logrus.Entry) l.WithFields( logrus.Fields{ "error": err, - }).Error(msg) + }, + ).Error(msg) return -1, fmt.Errorf("%s", msg) } @@ -167,7 +168,8 @@ func performInsert[T any](s *SqlDatabase, query string, item T, l *logrus.Entry) l.WithFields( logrus.Fields{ "id": id, - }).Debug("Successfully performed insert") + }, + ).Debug("Successfully performed insert") return id, nil } @@ -180,7 +182,8 @@ func performExec[T any](s *SqlDatabase, query string, item T, l *logrus.Entry) ( logrus.Fields{ "error": err, "query": query, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } @@ -196,7 +199,8 @@ func performExec[T any](s *SqlDatabase, query string, item T, l *logrus.Entry) ( l.WithFields( logrus.Fields{ "error": err, - }).Error(err.Error()) + }, + ).Error(err.Error()) return nil, err } @@ -218,7 +222,8 @@ func performListScan[T DatabaseRow, E entity.HeurekaEntity | DatabaseRow]( logrus.Fields{ "error": err.Error(), "parameters": filterParameters, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } @@ -242,7 +247,8 @@ func performListScan[T DatabaseRow, E entity.HeurekaEntity | DatabaseRow]( logrus.Fields{ "error": err.Error(), "returnedColumns": cols, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } @@ -256,7 +262,8 @@ func performListScan[T DatabaseRow, E entity.HeurekaEntity | DatabaseRow]( logrus.Fields{ "error": err.Error(), "parameters": filterParameters, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } @@ -264,7 +271,8 @@ func performListScan[T DatabaseRow, E entity.HeurekaEntity | DatabaseRow]( l.WithFields( logrus.Fields{ "count": len(listEntries), - }).Debug("Successfully performed list scan") + }, + ).Debug("Successfully performed list scan") return listEntries, nil } @@ -278,7 +286,8 @@ func performIdScan(ctx context.Context, stmt Stmt, filterParameters []any, l *lo "error": err, "preparedStatement": stmt, "parameters": filterParameters, - }).Error(msg) + }, + ).Error(msg) return make([]int64, 0), fmt.Errorf("%s", msg) } @@ -302,7 +311,8 @@ func performIdScan(ctx context.Context, stmt Stmt, filterParameters []any, l *lo logrus.Fields{ "error": err, "returnedColumns": cols, - }).Error(msg) + }, + ).Error(msg) return make([]int64, 0), fmt.Errorf("%s", msg) } @@ -313,7 +323,8 @@ func performIdScan(ctx context.Context, stmt Stmt, filterParameters []any, l *lo l.WithFields( logrus.Fields{ "id_count": len(listEntries), - }).Debug("Successfully performed id scan") + }, + ).Debug("Successfully performed id scan") return listEntries, nil } @@ -327,7 +338,8 @@ func performCountScan(ctx context.Context, stmt Stmt, filterParameters []any, l "error": err, "preparedStatement": stmt, "parameters": filterParameters, - }).Error(msg) + }, + ).Error(msg) return -1, fmt.Errorf("%s", msg) } @@ -350,7 +362,8 @@ func performCountScan(ctx context.Context, stmt Stmt, filterParameters []any, l logrus.Fields{ "error": err, "returnedColumns": cols, - }).Error(msg) + }, + ).Error(msg) return -1, fmt.Errorf("%s", msg) } @@ -358,7 +371,8 @@ func performCountScan(ctx context.Context, stmt Stmt, filterParameters []any, l l.WithFields( logrus.Fields{ "count": row, - }).Debug("Successfully performed count scan") + }, + ).Debug("Successfully performed count scan") return row, nil } diff --git a/internal/database/mariadb/db_object.go b/internal/database/mariadb/db_object.go index b587d1315..d354960cd 100644 --- a/internal/database/mariadb/db_object.go +++ b/internal/database/mariadb/db_object.go @@ -65,7 +65,8 @@ func (do *DbObject[ET]) GetFilterParameters( paginated := filter.GetPaginated() filterParameters = append( filterParameters, - GetCursorQueryParameters(paginated.First, cursorFields)...) + GetCursorQueryParameters(paginated.First, cursorFields)..., + ) } return filterParameters @@ -369,7 +370,8 @@ func (jr *JoinResolver) Build(filter any, order *Order) string { uniqTableName[j.Table] = struct{}{} - joinSQL := fmt.Sprintf("%s %s ON %s", + joinSQL := fmt.Sprintf( + "%s %s ON %s", j.Type, j.Table, j.On, diff --git a/internal/database/mariadb/issue.go b/internal/database/mariadb/issue.go index ba26b4ab6..8db136987 100644 --- a/internal/database/mariadb/issue.go +++ b/internal/database/mariadb/issue.go @@ -390,7 +390,8 @@ func (s *SqlDatabase) buildIssueStatementWithCursor( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } @@ -427,7 +428,8 @@ func (s *SqlDatabase) buildIssueStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } @@ -526,7 +528,8 @@ func (s *SqlDatabase) GetIssuesWithAggregations( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } @@ -536,7 +539,8 @@ func (s *SqlDatabase) GetIssuesWithAggregations( // parameters for agg query filterParameters = append( filterParameters, - issueObject.GetFilterParameters(filter, true, cursorFields)...) + issueObject.GetFilterParameters(filter, true, cursorFields)..., + ) defer func() { if err := stmt.Close(); err != nil { diff --git a/internal/database/mariadb/issue_match.go b/internal/database/mariadb/issue_match.go index 8485aa203..0d937d86d 100644 --- a/internal/database/mariadb/issue_match.go +++ b/internal/database/mariadb/issue_match.go @@ -315,7 +315,8 @@ func (s *SqlDatabase) buildIssueMatchStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } diff --git a/internal/database/mariadb/issue_match_test.go b/internal/database/mariadb/issue_match_test.go index 10f4ba3cf..7954b55fa 100644 --- a/internal/database/mariadb/issue_match_test.go +++ b/internal/database/mariadb/issue_match_test.go @@ -544,31 +544,32 @@ var _ = Describe("IssueMatch", Label("database", "IssueMatch"), func() { }) }) Context("and and we use Pagination", func() { - DescribeTable("can correctly paginate ", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetIssueMatches, - func(first *int, after *string) *entity.IssueMatchFilter { - return &entity.IssueMatchFilter{ - Paginated: entity.Paginated{ - First: first, - After: after, - }, - } - }, - []entity.Order{}, - func(entries []entity.IssueMatchResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithIssueMatch( - []entity.Order{}, - *entries[len(entries)-1].IssueMatch, - ), - ) - return after - }, - len(issueMatches), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate ", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetIssueMatches, + func(first *int, after *string) *entity.IssueMatchFilter { + return &entity.IssueMatchFilter{ + Paginated: entity.Paginated{ + First: first, + After: after, + }, + } + }, + []entity.Order{}, + func(entries []entity.IssueMatchResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithIssueMatch( + []entity.Order{}, + *entries[len(entries)-1].IssueMatch, + ), + ) + return after + }, + len(issueMatches), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), diff --git a/internal/database/mariadb/issue_repository.go b/internal/database/mariadb/issue_repository.go index 33c6b3dcd..0f348a4e9 100644 --- a/internal/database/mariadb/issue_repository.go +++ b/internal/database/mariadb/issue_repository.go @@ -140,7 +140,8 @@ func (s *SqlDatabase) buildIssueRepositoryStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("failed to prepare IssueRepository statement: %w", err) } diff --git a/internal/database/mariadb/issue_repository_test.go b/internal/database/mariadb/issue_repository_test.go index c9f87d793..3ae32925e 100644 --- a/internal/database/mariadb/issue_repository_test.go +++ b/internal/database/mariadb/issue_repository_test.go @@ -166,28 +166,29 @@ var _ = Describe("IssueRepository", Label("database", "IssueRepository"), func() }) }) Context("and using pagination", func() { - DescribeTable("can correctly paginate with x elements", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetIssueRepositories, - func(first *int, after *string) *entity.IssueRepositoryFilter { - return &entity.IssueRepositoryFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.IssueRepositoryResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithIssueRepository( - []entity.Order{}, - *entries[len(entries)-1].IssueRepository, - ), - ) - return after - }, - len(seedCollection.IssueRepositoryRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate with x elements", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetIssueRepositories, + func(first *int, after *string) *entity.IssueRepositoryFilter { + return &entity.IssueRepositoryFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.IssueRepositoryResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithIssueRepository( + []entity.Order{}, + *entries[len(entries)-1].IssueRepository, + ), + ) + return after + }, + len(seedCollection.IssueRepositoryRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), @@ -252,34 +253,35 @@ var _ = Describe("IssueRepository", Label("database", "IssueRepository"), func() }) Context("and using a filter", func() { - DescribeTable("can count with a filter", func(pageSize int, filterMatches int) { - // select a service - sRow := test.PickOne(seedCollection.ServiceRows) - - // collect all issue repository ids that belong to the service - irIds := []int64{} - for _, irsRow := range seedCollection.IssueRepositoryServiceRows { - if irsRow.ServiceId.Int64 == sRow.Id.Int64 { - irIds = append(irIds, irsRow.IssueRepositoryId.Int64) + DescribeTable( + "can count with a filter", func(pageSize int, filterMatches int) { + // select a service + sRow := test.PickOne(seedCollection.ServiceRows) + + // collect all issue repository ids that belong to the service + irIds := []int64{} + for _, irsRow := range seedCollection.IssueRepositoryServiceRows { + if irsRow.ServiceId.Int64 == sRow.Id.Int64 { + irIds = append(irIds, irsRow.IssueRepositoryId.Int64) + } } - } - filter := &entity.IssueRepositoryFilter{ - Paginated: entity.Paginated{ - First: &pageSize, - After: nil, - }, - ServiceCCRN: []*string{&sRow.CCRN.String}, - } - entries, err := db.CountIssueRepositories(context.Background(), filter) - By("throwing no error", func() { - Expect(err).To(BeNil()) - }) - - By("returning the correct count", func() { - Expect(entries).To(BeEquivalentTo(len(irIds))) - }) - }, + filter := &entity.IssueRepositoryFilter{ + Paginated: entity.Paginated{ + First: &pageSize, + After: nil, + }, + ServiceCCRN: []*string{&sRow.CCRN.String}, + } + entries, err := db.CountIssueRepositories(context.Background(), filter) + By("throwing no error", func() { + Expect(err).To(BeNil()) + }) + + By("returning the correct count", func() { + Expect(entries).To(BeEquivalentTo(len(irIds))) + }) + }, Entry("and pageSize is 1 and it has 13 elements", 1, 13), Entry("and pageSize is 20 and it has 5 elements", 20, 5), Entry("and pageSize is 100 and it has 100 elements", 100, 100), diff --git a/internal/database/mariadb/issue_test.go b/internal/database/mariadb/issue_test.go index d05fae8b1..b2e8efd3b 100644 --- a/internal/database/mariadb/issue_test.go +++ b/internal/database/mariadb/issue_test.go @@ -145,7 +145,8 @@ var _ = Describe("Issue", Label("database", "Issue"), func() { x := row.CCRN.String expectedIssues = append( expectedIssues, - seedCollection.GetIssueByService(&row)...) + seedCollection.GetIssueByService(&row)..., + ) serviceCcrns[i] = &x } expectedIssues = lo.Uniq(expectedIssues) @@ -480,29 +481,30 @@ var _ = Describe("Issue", Label("database", "Issue"), func() { }) }) Context("and using pagination", func() { - DescribeTable("can correctly paginate", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetIssues, - func(first *int, after *string) *entity.IssueFilter { - return &entity.IssueFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.IssueResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithIssue( - []entity.Order{}, - *entries[len(entries)-1].Issue, - 0, - ), - ) - return after - }, - len(seedCollection.IssueRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetIssues, + func(first *int, after *string) *entity.IssueFilter { + return &entity.IssueFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.IssueResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithIssue( + []entity.Order{}, + *entries[len(entries)-1].Issue, + 0, + ), + ) + return after + }, + len(seedCollection.IssueRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), @@ -529,7 +531,8 @@ var _ = Describe("Issue", Label("database", "Issue"), func() { By("returning some aggregations", func() { for _, entryWithAggregations := range entriesWithAggregations { Expect(entryWithAggregations).NotTo( - BeEquivalentTo(entity.IssueAggregations{})) + BeEquivalentTo(entity.IssueAggregations{}), + ) Expect( entryWithAggregations.IssueAggregations.IssueMatches, ).To(BeEquivalentTo(0)) @@ -563,7 +566,8 @@ var _ = Describe("Issue", Label("database", "Issue"), func() { By("returning some aggregations", func() { for _, entryWithAggregations := range entriesWithAggregations { Expect(entryWithAggregations).NotTo( - BeEquivalentTo(entity.IssueAggregations{})) + BeEquivalentTo(entity.IssueAggregations{}), + ) } }) By("returning all ld constraints exclude all Go files inservices", func() { @@ -584,18 +588,19 @@ var _ = Describe("Issue", Label("database", "Issue"), func() { }) When("Counting Issues", Label("CountIssues"), func() { Context("and using no filter", func() { - DescribeTable("it returns correct count", func(x int) { - _ = seeder.SeedDbWithNFakeData(x) - res, err := db.CountIssues(context.Background(), nil) + DescribeTable( + "it returns correct count", func(x int) { + _ = seeder.SeedDbWithNFakeData(x) + res, err := db.CountIssues(context.Background(), nil) - By("throwing no error", func() { - Expect(err).To(BeNil()) - }) + By("throwing no error", func() { + Expect(err).To(BeNil()) + }) - By("returning the correct count", func() { - Expect(res).To(BeEquivalentTo(x)) - }) - }, + By("returning the correct count", func() { + Expect(res).To(BeEquivalentTo(x)) + }) + }, Entry("when page size is 0", 0), Entry("when page size is 1", 1), Entry("when page size is 11", 11), diff --git a/internal/database/mariadb/issue_variant.go b/internal/database/mariadb/issue_variant.go index 98522dd04..5f852f186 100644 --- a/internal/database/mariadb/issue_variant.go +++ b/internal/database/mariadb/issue_variant.go @@ -197,7 +197,8 @@ func (s *SqlDatabase) buildIssueVariantStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("failed to prepare IssueVariant statement: %w", err) } diff --git a/internal/database/mariadb/issue_variant_test.go b/internal/database/mariadb/issue_variant_test.go index 6b86ef847..13684ea26 100644 --- a/internal/database/mariadb/issue_variant_test.go +++ b/internal/database/mariadb/issue_variant_test.go @@ -159,7 +159,8 @@ var _ = Describe("IssueVariant - ", Label("database", "IssueVariant"), func() { issueVariants := seedCollection.GetIssueVariantsByIssueId(issueId1) issueVariants = append( issueVariants, - seedCollection.GetIssueVariantsByIssueId(issueId2)...) + seedCollection.GetIssueVariantsByIssueId(issueId2)..., + ) issueVariants = lo.UniqBy( issueVariants, func(e mariadb.IssueVariantRow) int64 { return e.Id.Int64 }, @@ -298,28 +299,29 @@ var _ = Describe("IssueVariant - ", Label("database", "IssueVariant"), func() { }) }) Context("and using Pagination", func() { - DescribeTable("can correctly paginate", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetIssueVariants, - func(first *int, after *string) *entity.IssueVariantFilter { - return &entity.IssueVariantFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.IssueVariantResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithIssueVariant( - []entity.Order{}, - *entries[len(entries)-1].IssueVariant, - ), - ) - return after - }, - len(seedCollection.IssueVariantRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetIssueVariants, + func(first *int, after *string) *entity.IssueVariantFilter { + return &entity.IssueVariantFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.IssueVariantResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithIssueVariant( + []entity.Order{}, + *entries[len(entries)-1].IssueVariant, + ), + ) + return after + }, + len(seedCollection.IssueVariantRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), @@ -384,27 +386,28 @@ var _ = Describe("IssueVariant - ", Label("database", "IssueVariant"), func() { }) Context("and using a filter", func() { - DescribeTable("can count with a filter", func(pageSize int, filterMatches int) { - rnd := test.PickOne(seedCollection.IssueVariantRows) - issueId := rnd.IssueId.Int64 - - issueVariants := seedCollection.GetIssueVariantsByIssueId(issueId) - - filter := &entity.IssueVariantFilter{ - Paginated: entity.Paginated{ - First: &pageSize, - After: nil, - }, - IssueId: []*int64{&issueId}, - } - entries, err := db.CountIssueVariants(context.Background(), filter) - By("throwing no error", func() { - Expect(err).To(BeNil()) - }) - By("returning the correct count", func() { - Expect(entries).To(BeEquivalentTo(len(issueVariants))) - }) - }, + DescribeTable( + "can count with a filter", func(pageSize int, filterMatches int) { + rnd := test.PickOne(seedCollection.IssueVariantRows) + issueId := rnd.IssueId.Int64 + + issueVariants := seedCollection.GetIssueVariantsByIssueId(issueId) + + filter := &entity.IssueVariantFilter{ + Paginated: entity.Paginated{ + First: &pageSize, + After: nil, + }, + IssueId: []*int64{&issueId}, + } + entries, err := db.CountIssueVariants(context.Background(), filter) + By("throwing no error", func() { + Expect(err).To(BeNil()) + }) + By("returning the correct count", func() { + Expect(entries).To(BeEquivalentTo(len(issueVariants))) + }) + }, Entry("and pageSize is 1 and it has 13 elements", 1, 13), Entry("and pageSize is 20 and it has 5 elements", 20, 5), Entry("and pageSize is 100 and it has 100 elements", 100, 100), diff --git a/internal/database/mariadb/migration.go b/internal/database/mariadb/migration.go index bf3cf062b..c39c4630a 100644 --- a/internal/database/mariadb/migration.go +++ b/internal/database/mariadb/migration.go @@ -73,7 +73,8 @@ func (s *SqlDatabase) openMigration() (*migrate.Migrate, error) { m, err := migrate.NewWithInstance( "iofs", d, - "mysql", driver) + "mysql", driver, + ) if err != nil { return nil, err } diff --git a/internal/database/mariadb/mv_vulnerabilities.go b/internal/database/mariadb/mv_vulnerabilities.go index bcc6cf124..d74bac508 100644 --- a/internal/database/mariadb/mv_vulnerabilities.go +++ b/internal/database/mariadb/mv_vulnerabilities.go @@ -103,7 +103,8 @@ func (s *SqlDatabase) CountIssueRatings( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } diff --git a/internal/database/mariadb/patch.go b/internal/database/mariadb/patch.go index bcd015e24..7a5356b58 100644 --- a/internal/database/mariadb/patch.go +++ b/internal/database/mariadb/patch.go @@ -91,7 +91,8 @@ func (s *SqlDatabase) buildPatchStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("failed to prepare Patch statement: %w", err) } diff --git a/internal/database/mariadb/patch_test.go b/internal/database/mariadb/patch_test.go index 4111ad8a6..17726fdfe 100644 --- a/internal/database/mariadb/patch_test.go +++ b/internal/database/mariadb/patch_test.go @@ -193,25 +193,26 @@ var _ = Describe("Patch", Label("database", "Patch"), func() { }) }) Context("and using pagination", func() { - DescribeTable("can correctly paginate with x elements", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetPatches, - func(first *int, after *string) *entity.PatchFilter { - return &entity.PatchFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.PatchResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithPatch([]entity.Order{}, *entries[len(entries)-1].Patch), - ) - return after - }, - len(seedCollection.PatchRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate with x elements", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetPatches, + func(first *int, after *string) *entity.PatchFilter { + return &entity.PatchFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.PatchResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithPatch([]entity.Order{}, *entries[len(entries)-1].Patch), + ) + return after + }, + len(seedCollection.PatchRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), diff --git a/internal/database/mariadb/remediation.go b/internal/database/mariadb/remediation.go index 242ff0af4..0680e8a38 100644 --- a/internal/database/mariadb/remediation.go +++ b/internal/database/mariadb/remediation.go @@ -226,7 +226,8 @@ func (s *SqlDatabase) buildRemediationStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("failed to prepare Remediation statement: %w", err) } diff --git a/internal/database/mariadb/remediation_test.go b/internal/database/mariadb/remediation_test.go index b64637541..bb6e78054 100644 --- a/internal/database/mariadb/remediation_test.go +++ b/internal/database/mariadb/remediation_test.go @@ -395,28 +395,29 @@ var _ = Describe("Remediation", Label("database", "Remediation"), func() { }) }) Context("and using pagination", func() { - DescribeTable("can correctly paginate with x elements", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetRemediations, - func(first *int, after *string) *entity.RemediationFilter { - return &entity.RemediationFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.RemediationResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithRemediation( - []entity.Order{}, - *entries[len(entries)-1].Remediation, - ), - ) - return after - }, - len(seedCollection.RemediationRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate with x elements", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetRemediations, + func(first *int, after *string) *entity.RemediationFilter { + return &entity.RemediationFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.RemediationResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithRemediation( + []entity.Order{}, + *entries[len(entries)-1].Remediation, + ), + ) + return after + }, + len(seedCollection.RemediationRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), diff --git a/internal/database/mariadb/service.go b/internal/database/mariadb/service.go index b35257bc9..fc4f60490 100644 --- a/internal/database/mariadb/service.go +++ b/internal/database/mariadb/service.go @@ -258,7 +258,8 @@ func (s *SqlDatabase) buildServiceStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } @@ -458,7 +459,8 @@ func (s *SqlDatabase) GetServicesWithAggregations( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, fmt.Errorf("%s", msg) } @@ -468,7 +470,8 @@ func (s *SqlDatabase) GetServicesWithAggregations( // parameters for component instance query filterParameters = append( filterParameters, - serviceObject.GetFilterParameters(filter, true, cursorFields)...) + serviceObject.GetFilterParameters(filter, true, cursorFields)..., + ) defer func() { if err := stmt.Close(); err != nil { diff --git a/internal/database/mariadb/service_issue_variant.go b/internal/database/mariadb/service_issue_variant.go index 50148cff3..534e672af 100644 --- a/internal/database/mariadb/service_issue_variant.go +++ b/internal/database/mariadb/service_issue_variant.go @@ -81,7 +81,8 @@ func (s *SqlDatabase) buildServiceIssueVariantStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } diff --git a/internal/database/mariadb/service_test.go b/internal/database/mariadb/service_test.go index d82169010..a48b5fb26 100644 --- a/internal/database/mariadb/service_test.go +++ b/internal/database/mariadb/service_test.go @@ -414,29 +414,30 @@ var _ = Describe("Service", Label("database", "Service"), func() { }) }) Context("and using pagination", func() { - DescribeTable("can correctly paginate with x elements", func(pageSize int) { - test.TestPaginationOfListWithOrder( - db.GetServices, - func(first *int, after *string) *entity.ServiceFilter { - return &entity.ServiceFilter{ - Paginated: entity.Paginated{First: first, After: after}, - } - }, - []entity.Order{}, - func(entries []entity.ServiceResult) string { - after, _ := mariadb.EncodeCursor( - mariadb.WithService( - []entity.Order{}, - *entries[len(entries)-1].Service, - entity.IssueSeverityCounts{}, - ), - ) - return after - }, - len(seedCollection.ServiceRows), - pageSize, - ) - }, + DescribeTable( + "can correctly paginate with x elements", func(pageSize int) { + test.TestPaginationOfListWithOrder( + db.GetServices, + func(first *int, after *string) *entity.ServiceFilter { + return &entity.ServiceFilter{ + Paginated: entity.Paginated{First: first, After: after}, + } + }, + []entity.Order{}, + func(entries []entity.ServiceResult) string { + after, _ := mariadb.EncodeCursor( + mariadb.WithService( + []entity.Order{}, + *entries[len(entries)-1].Service, + entity.IssueSeverityCounts{}, + ), + ) + return after + }, + len(seedCollection.ServiceRows), + pageSize, + ) + }, Entry("when pageSize is 1", 1), Entry("when pageSize is 3", 3), Entry("when pageSize is 5", 5), @@ -463,7 +464,8 @@ var _ = Describe("Service", Label("database", "Service"), func() { By("returning some aggregations", func() { for _, entryWithAggregations := range entriesWithAggregations { Expect(entryWithAggregations).NotTo( - BeEquivalentTo(entity.ServiceAggregations{})) + BeEquivalentTo(entity.ServiceAggregations{}), + ) Expect( entryWithAggregations.ServiceAggregations.ComponentInstances, ).To(BeEquivalentTo(0)) @@ -491,7 +493,8 @@ var _ = Describe("Service", Label("database", "Service"), func() { By("returning some aggregations", func() { for _, entryWithAggregations := range entriesWithAggregations { Expect(entryWithAggregations).NotTo( - BeEquivalentTo(entity.ServiceAggregations{})) + BeEquivalentTo(entity.ServiceAggregations{}), + ) } }) By("returning all services", func() { @@ -566,35 +569,36 @@ var _ = Describe("Service", Label("database", "Service"), func() { }) Context("and using a filter", func() { - DescribeTable("can count with a filter", func(pageSize int, filterMatches int) { - // select a support group - sgRow := test.PickOne(seedCollection.SupportGroupRows) - - // collect all service ids that belong to the support group - serviceIds := []int64{} - for _, sgsRow := range seedCollection.SupportGroupServiceRows { - if sgsRow.SupportGroupId.Int64 == sgRow.Id.Int64 { - serviceIds = append(serviceIds, sgsRow.ServiceId.Int64) + DescribeTable( + "can count with a filter", func(pageSize int, filterMatches int) { + // select a support group + sgRow := test.PickOne(seedCollection.SupportGroupRows) + + // collect all service ids that belong to the support group + serviceIds := []int64{} + for _, sgsRow := range seedCollection.SupportGroupServiceRows { + if sgsRow.SupportGroupId.Int64 == sgRow.Id.Int64 { + serviceIds = append(serviceIds, sgsRow.ServiceId.Int64) + } } - } - after := "" - filter := &entity.ServiceFilter{ - Paginated: entity.Paginated{ - First: &pageSize, - After: &after, - }, - SupportGroupCCRN: []*string{&sgRow.CCRN.String}, - } - entries, err := db.CountServices(context.Background(), filter) - By("throwing no error", func() { - Expect(err).To(BeNil()) - }) + after := "" + filter := &entity.ServiceFilter{ + Paginated: entity.Paginated{ + First: &pageSize, + After: &after, + }, + SupportGroupCCRN: []*string{&sgRow.CCRN.String}, + } + entries, err := db.CountServices(context.Background(), filter) + By("throwing no error", func() { + Expect(err).To(BeNil()) + }) - By("returning the correct count", func() { - Expect(entries).To(BeEquivalentTo(len(serviceIds))) - }) - }, + By("returning the correct count", func() { + Expect(entries).To(BeEquivalentTo(len(serviceIds))) + }) + }, Entry("and pageSize is 1 and it has 13 elements", 1, 13), Entry("and pageSize is 20 and it has 5 elements", 20, 5), Entry("and pageSize is 100 and it has 100 elements", 100, 100), diff --git a/internal/database/mariadb/support_group.go b/internal/database/mariadb/support_group.go index 75a4022b5..13d7dacf4 100644 --- a/internal/database/mariadb/support_group.go +++ b/internal/database/mariadb/support_group.go @@ -156,7 +156,8 @@ func (s *SqlDatabase) buildSupportGroupStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("%s", msg) } diff --git a/internal/database/mariadb/user.go b/internal/database/mariadb/user.go index a52471d99..ee59498a1 100644 --- a/internal/database/mariadb/user.go +++ b/internal/database/mariadb/user.go @@ -143,7 +143,8 @@ func (s *SqlDatabase) buildUserStatement( "error": err, "query": query, "stmt": stmt, - }).Error(msg) + }, + ).Error(msg) return nil, nil, fmt.Errorf("failed to prepare User statement: %w", err) } diff --git a/internal/e2e/authentication_test.go b/internal/e2e/authentication_test.go index f16eaebc3..bbed83b05 100644 --- a/internal/e2e/authentication_test.go +++ b/internal/e2e/authentication_test.go @@ -190,7 +190,8 @@ func (at *authenticationTest) createIssueByUser(issue entity.Issue, user entity. "type": issue.Type.String(), }, }, - at.getHeaders(user)) + at.getHeaders(user), + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Issue.PrimaryName).To(Equal(issue.PrimaryName)) @@ -211,7 +212,8 @@ func (at *authenticationTest) updateIssueByUser(issue entity.Issue, user entity. "id": strconv.FormatInt(issue.Id, 10), "input": map[string]string{"description": issue.Description}, }, - at.getHeaders(user)) + at.getHeaders(user), + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Issue.Description).To(Equal(issue.Description)) @@ -229,7 +231,8 @@ func (at *authenticationTest) deleteIssueByUser(issue entity.Issue, user entity. map[string]any{ "id": strconv.FormatInt(issue.Id, 10), }, - at.getHeaders(user)) + at.getHeaders(user), + ) Expect(err).ToNot(HaveOccurred()) Expect(respData.Id).To(Equal(strconv.FormatInt(issue.Id, 10))) @@ -248,7 +251,8 @@ func (at *authenticationTest) getDeletedIssue(issueId string, user entity.User) "first": defaultTestFakeDataItems, "after": "", }, - at.getHeaders(user)) + at.getHeaders(user), + ) item, ok := lo.Find( respData.Issues.Edges, diff --git a/internal/e2e/cache_test.go b/internal/e2e/cache_test.go index 302aa986e..4941b5b13 100644 --- a/internal/e2e/cache_test.go +++ b/internal/e2e/cache_test.go @@ -157,7 +157,8 @@ func (ct *cacheTest) expectTestResource() { existingServiceCcrns, func(cifv model.ComponentInstanceFilterValue) []*string { return cifv.ServiceCcrn.Values - }) + }, + ) } func (ct *cacheTest) expectTestResources(n int) { @@ -179,7 +180,8 @@ func (ct *cacheTest) expectTestResources(n int) { existingServiceCcrns, func(cifv model.ComponentInstanceFilterValue) []*string { return cifv.ServiceCcrn.Values - }) + }, + ) } } @@ -196,7 +198,8 @@ func (ct *cacheTest) expectTestResourceAndAddedResource() { existingServiceCcrns, func(cifv model.ComponentInstanceFilterValue) []*string { return cifv.ServiceCcrn.Values - }) + }, + ) } func (ct *cacheTest) expectNoResource() { @@ -205,7 +208,8 @@ func (ct *cacheTest) expectNoResource() { []string{}, func(cifv model.ComponentInstanceFilterValue) []*string { return cifv.ServiceCcrn.Values - }) + }, + ) } func (ct *cacheTest) addDbResource() { diff --git a/internal/e2e/component_instance_filter_test.go b/internal/e2e/component_instance_filter_test.go index 81844900f..bad12f623 100644 --- a/internal/e2e/component_instance_filter_test.go +++ b/internal/e2e/component_instance_filter_test.go @@ -225,7 +225,8 @@ var _ = Describe( existingPods, func(cifv model.ComponentInstanceFilterValue) []*string { return cifv.Pod.Values - }) + }, + ) }) It("returns correct container", func() { existingContainers := seedCollection.GetComponentInstanceVal( diff --git a/internal/e2e/component_version_query_test.go b/internal/e2e/component_version_query_test.go index 4138110ee..712112150 100644 --- a/internal/e2e/component_version_query_test.go +++ b/internal/e2e/component_version_query_test.go @@ -95,7 +95,8 @@ var _ = Describe("Getting ComponentVersions via API", Label("e2e", "ComponentVer It("returns correct result", func() { resp, err := e2e_common.ExecuteGqlQueryFromFile[struct { ComponentVersions model.ComponentVersionConnection `json:"ComponentVersions"` - }](cfg.Port, + }]( + cfg.Port, "../api/graphql/graph/queryCollection/componentVersion/minimal.graphql", map[string]any{ "filter": map[string]bool{ @@ -116,7 +117,8 @@ var _ = Describe("Getting ComponentVersions via API", Label("e2e", "ComponentVer It("returns correct result", func() { resp, err := e2e_common.ExecuteGqlQueryFromFile[struct { ComponentVersions model.ComponentVersionConnection `json:"ComponentVersions"` - }](cfg.Port, + }]( + cfg.Port, "../api/graphql/graph/queryCollection/componentVersion/minimal.graphql", map[string]any{ "filter": map[string]bool{ diff --git a/internal/e2e/image_query_test.go b/internal/e2e/image_query_test.go index 48957562c..6ea30c85e 100644 --- a/internal/e2e/image_query_test.go +++ b/internal/e2e/image_query_test.go @@ -55,7 +55,8 @@ var _ = Describe("Getting Images via API", Label("e2e", "Images"), func() { }, "first": 3, "after": "", - }) + }, + ) Expect(err).ToNot(HaveOccurred()) expectRespDataCounts(respData.Images, 5, 3) @@ -108,7 +109,8 @@ var _ = Describe("Getting Images via API", Label("e2e", "Images"), func() { }, "first": 3, "after": "", - }) + }, + ) Expect(err).ToNot(HaveOccurred()) expectRespDataCounts(respData.Images, 1, 1) @@ -294,7 +296,8 @@ func (it *imageTest) testImageSortingWithTieBreaker() { }, "first": 20, "after": "", - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(respData.Images.Edges).To(HaveLen(7), "Should return all 7 images") diff --git a/internal/e2e/patch_query_test.go b/internal/e2e/patch_query_test.go index 3514dcae7..598e11587 100644 --- a/internal/e2e/patch_query_test.go +++ b/internal/e2e/patch_query_test.go @@ -53,7 +53,8 @@ var _ = Describe("Getting Patches via API", Label("e2e", "Patches"), func() { "filter": map[string]string{}, "first": 10, "after": "", - }) + }, + ) Expect(err).NotTo(HaveOccurred()) Expect(respData.Patches.TotalCount).To(Equal(0)) }) @@ -77,7 +78,8 @@ var _ = Describe("Getting Patches via API", Label("e2e", "Patches"), func() { "filter": map[string]string{}, "first": 5, "after": "", - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(respData.Patches.TotalCount).To(Equal(len(seedCollection.PatchRows))) diff --git a/internal/e2e/remediation_query_test.go b/internal/e2e/remediation_query_test.go index 958f6e265..8c47c1dc4 100644 --- a/internal/e2e/remediation_query_test.go +++ b/internal/e2e/remediation_query_test.go @@ -56,7 +56,8 @@ var _ = Describe("Getting Remediations via API", Label("e2e", "Remediations"), f "filter": map[string]string{}, "first": 10, "after": "", - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(respData.Remediations.TotalCount).To(Equal(0)) @@ -82,7 +83,8 @@ var _ = Describe("Getting Remediations via API", Label("e2e", "Remediations"), f "filter": map[string]string{}, "first": 5, "after": "", - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect( respData.Remediations.TotalCount, @@ -190,7 +192,8 @@ var _ = Describe("Creating Remediation via API", Label("e2e", "Remediations"), f "remediationDate": remediation.RemediationDate.Format(time.RFC3339), "expirationDate": remediation.ExpirationDate.Format(time.RFC3339), }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Remediation.Description).To(Equal(remediation.Description)) @@ -228,7 +231,8 @@ var _ = Describe("Creating Remediation via API", Label("e2e", "Remediations"), f "expirationDate": remediation.ExpirationDate.Format(time.RFC3339), "remediatedBy": remediation.RemediatedBy, }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Remediation.Description).To(Equal(remediation.Description)) @@ -262,7 +266,8 @@ var _ = Describe("Creating Remediation via API", Label("e2e", "Remediations"), f "expirationDate": remediation.ExpirationDate.Format(time.RFC3339), "remediatedBy": remediation.RemediatedBy, }, - }) + }, + ) Expect(err).To(HaveOccurred()) }) @@ -285,7 +290,8 @@ var _ = Describe("Creating Remediation via API", Label("e2e", "Remediations"), f "remediatedBy": remediation.RemediatedBy, "url": "invalid-url", }, - }) + }, + ) Expect(err).To(HaveOccurred()) }) @@ -308,7 +314,8 @@ var _ = Describe("Creating Remediation via API", Label("e2e", "Remediations"), f "remediatedBy": remediation.RemediatedBy, "url": "https://example.com/risk-acceptance", }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) }) @@ -362,7 +369,8 @@ var _ = Describe("Updating remediation via API", Label("e2e", "Remediations"), f "input": map[string]string{ "description": description, }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Remediation.Description).To(Equal(description)) @@ -391,7 +399,8 @@ var _ = Describe("Updating remediation via API", Label("e2e", "Remediations"), f "input": map[string]string{ "service": service.CCRN.String, }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Remediation.Service).To(Equal(service.CCRN.String)) @@ -411,7 +420,8 @@ var _ = Describe("Updating remediation via API", Label("e2e", "Remediations"), f "input": map[string]string{ "image": component.Repository.String, }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Remediation.Image).To(Equal(component.Repository.String)) @@ -431,7 +441,8 @@ var _ = Describe("Updating remediation via API", Label("e2e", "Remediations"), f "input": map[string]string{ "vulnerability": issue.PrimaryName.String, }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(*respData.Remediation.Vulnerability).To(Equal(issue.PrimaryName.String)) @@ -452,7 +463,8 @@ var _ = Describe("Updating remediation via API", Label("e2e", "Remediations"), f "type": entity.RemediationTypeRiskAccepted.String(), "url": "invalid-url", }, - }) + }, + ) Expect(err).To(HaveOccurred()) }) @@ -469,7 +481,8 @@ var _ = Describe("Updating remediation via API", Label("e2e", "Remediations"), f "type": entity.RemediationTypeRiskAccepted.String(), "url": "https://example.com/risk-acceptance", }, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(respData.Remediation.Type.String()).To(Equal(entity.RemediationTypeRiskAccepted.String())) @@ -519,7 +532,8 @@ var _ = Describe("Deleting Remediation via API", Label("e2e", "Remediations"), f "../api/graphql/graph/queryCollection/remediation/delete.graphql", map[string]any{ "id": id, - }) + }, + ) Expect(err).ToNot(HaveOccurred()) Expect(respData.Id).To(Equal(id)) diff --git a/internal/e2e/siem_alert_test.go b/internal/e2e/siem_alert_test.go index 20feab743..c2e567d8e 100644 --- a/internal/e2e/siem_alert_test.go +++ b/internal/e2e/siem_alert_test.go @@ -85,7 +85,8 @@ var _ = Describe("Creating SIEMAlert via API", Label("e2e", "SIEMAlert"), func() graphqlPath, map[string]any{ "input": input, - }) + }, + ) Expect(err).To(BeNil()) Expect(*respData.SIEM.Name).To(Equal(alertName)) @@ -202,7 +203,8 @@ var _ = Describe("Creating SIEMAlert via API", Label("e2e", "SIEMAlert"), func() graphqlPath, map[string]any{ "input": input, - }) + }, + ) Expect(err).To(BeNil()) Expect(*respData.SIEM.Name).To(Equal(alertName)) @@ -229,7 +231,8 @@ var _ = Describe("Creating SIEMAlert via API", Label("e2e", "SIEMAlert"), func() &entity.IssueVariantFilter{ IssueId: []*int64{&issueId}, IssueRepositoryId: []*int64{&repos[0].Id}, - }, []entity.Order{}) + }, []entity.Order{}, + ) Expect(err).To(BeNil()) Expect(len(ivs)).To(Equal(1)) }) @@ -270,7 +273,8 @@ var _ = Describe("Creating SIEMAlert via API", Label("e2e", "SIEMAlert"), func() graphqlPath, map[string]any{ "input": input, - }) + }, + ) Expect( err, ).NotTo(BeNil(), "Expected mutation to fail with missing ComponentInstance data") diff --git a/internal/server/server.go b/internal/server/server.go index 1e271ea9a..8f3e2fae0 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -120,7 +120,8 @@ func (s *Server) initLogging() { resetColor = param.ResetColor() } - return fmt.Sprintf("[HEUREKA] %v |%s %3d %s| %13v | %15s | %10s |%s %-7s %s %#v\n%s", + return fmt.Sprintf( + "[HEUREKA] %v |%s %3d %s| %13v | %15s | %10s |%s %-7s %s %#v\n%s", param.TimeStamp.Format("2006/01/02 - 15:04:05"), statusColor, param.StatusCode, resetColor, param.Latency,