Skip to content

chore: format code #1188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MR2011 merged 1 commit into from
May 5, 2026
Merged

chore: format code #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/api/graphql/graph/baseResolver/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ func GetNestedPreloads(
ctx,
graphql.CollectFields(ctx, column.Selections, nil),
prefixColumn,
)...)
)...,
)
}

return
Expand Down
3 changes: 2 additions & 1 deletion internal/api/graphql/graph/resolver/component_version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions internal/api/graphql/graph/resolver/issue_match.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/app/severity/severity_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand All @@ -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.")
Expand Down Expand Up @@ -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.")
Expand Down
6 changes: 4 additions & 2 deletions internal/database/mariadb/autopatch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 4 additions & 2 deletions internal/database/mariadb/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -440,7 +441,8 @@ func (s *SqlDatabase) CountComponentVulnerabilities(
"error": err,
"query": query,
"stmt": stmt,
}).Error(msg)
},
).Error(msg)

return nil, fmt.Errorf("%s", msg)
}
Expand Down
3 changes: 2 additions & 1 deletion internal/database/mariadb/component_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
49 changes: 25 additions & 24 deletions internal/database/mariadb/component_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)},
Expand Down Expand Up @@ -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),
Expand Down
82 changes: 42 additions & 40 deletions internal/database/mariadb/component_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
5 changes: 3 additions & 2 deletions internal/database/mariadb/component_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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{
Expand Down
47 changes: 24 additions & 23 deletions internal/database/mariadb/component_version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading
Loading