Skip to content

fix: Fix query resource count endpoint double counting and bucket overflow #22

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
andrest50 merged 5 commits into from
Sep 26, 2025
+13 −4
Merged

fix: Fix query resource count endpoint double counting and bucket overflow #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
053fe18
feat: Increase default bucket size to 100
andrest50 Sep 26, 2025
8114744
fix: Add PrivateOnly filter to OpenSearch template
andrest50 Sep 26, 2025
b0c5923
refactor: Remove unused ctx parameter from convertCountResponse
andrest50 Sep 26, 2025
00b4bc7
Merge branch 'main' of ssh://github.com/linuxfoundation/lfx-v2-query-…
andrest50 Sep 26, 2025
7b55069
chore: Bump chart version to 0.4.6
andrest50 Sep 26, 2025
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
2 changes: 1 addition & 1 deletion charts/lfx-v2-query-service/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ apiVersion: v2
name: lfx-v2-query-service
description: LFX Platform V2 Query Service chart
type: application
version: 0.4.5
version: 0.4.6
appVersion: "latest"
4 changes: 2 additions & 2 deletions internal/infrastructure/opensearch/searcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (os *OpenSearchSearcher) QueryResourcesCount(

slog.DebugContext(ctx, "aggregation response", "response", aggregationResponse)

result, err := os.convertCountResponse(ctx, countResponse, aggregationResponse)
result, err := os.convertCountResponse(countResponse, aggregationResponse)
if err != nil {
return nil, fmt.Errorf("failed to convert count response: %w", err)
}
Expand Down Expand Up @@ -205,7 +205,7 @@ func (os *OpenSearchSearcher) convertHit(hit Hit) (model.Resource, error) {
return resource, nil
}

func (os *OpenSearchSearcher) convertCountResponse(ctx context.Context, response *CountResponse, aggregationResponse *AggregationResponse) (*model.CountResult, error) {
func (os *OpenSearchSearcher) convertCountResponse(response *CountResponse, aggregationResponse *AggregationResponse) (*model.CountResult, error) {
aggregation := model.TermsAggregation{
DocCountErrorUpperBound: aggregationResponse.GroupBy.DocCountErrorUpperBound,
SumOtherDocCount: aggregationResponse.GroupBy.SumOtherDocCount,
Expand Down
9 changes: 9 additions & 0 deletions internal/infrastructure/opensearch/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ const queryResourceSource = `{
"term": {"public": true}
}
{{- end }}
{{- if .PrivateOnly }},
{
"bool": {
"must_not": {
"term": {"public": true}
}
}
}
{{- end }}
{{- if .ResourceType }},
{
"term": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/constants/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ const (
// DefaultPageSize is the default number of results per page for queries
DefaultPageSize = 50
// DefaultBucketSize is the default size of the bucket for queries
DefaultBucketSize = 10
DefaultBucketSize = 100
)