Skip to content

[LFXV2-775] Add support for tags_all parameter with AND logic #25

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 4 commits into from
Nov 21, 2025
Merged

[LFXV2-775] Add support for tags_all parameter with AND logic #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c06bad
Add support for tags_all parameter with AND logic
andrest50 Nov 20, 2025
6489075
Merge branch 'main' of ssh://github.com/linuxfoundation/lfx-v2-query-…
andrest50 Nov 20, 2025
3990f9e
Bump chart version
andrest50 Nov 20, 2025
5141b4f
Fix nil pointer dereference in BadRequest error handling
andrest50 Nov 20, 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.8
version: 0.4.9
appVersion: "latest"
3 changes: 3 additions & 0 deletions cmd/service/converters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ func (s *querySvcsrvc) payloadToCriteria(ctx context.Context, p *querysvc.QueryR
Parent: p.Parent,
ResourceType: p.Type,
Tags: p.Tags,
TagsAll: p.TagsAll,
SortBy: p.Sort,
PageToken: p.PageToken,
PageSize: constants.DefaultPageSize,
Expand Down Expand Up @@ -91,6 +92,7 @@ func (s *querySvcsrvc) payloadToCountPublicCriteria(payload *querysvc.QueryResou

// Set the criteria from the payload
criteria.Tags = payload.Tags
criteria.TagsAll = payload.TagsAll
if payload.Name != nil {
criteria.Name = payload.Name
}
Expand Down Expand Up @@ -119,6 +121,7 @@ func (s *querySvcsrvc) payloadToCountAggregationCriteria(payload *querysvc.Query

// Set the criteria from the payload
criteria.Tags = payload.Tags
criteria.TagsAll = payload.TagsAll
if payload.Name != nil {
criteria.Name = payload.Name
}
Expand Down
18 changes: 12 additions & 6 deletions design/query-svc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ var _ = dsl.Service("query-svc", func() {
dsl.Attribute("type", dsl.String, "Resource type to search", func() {
dsl.Example("committee")
})
dsl.Attribute("tags", dsl.ArrayOf(dsl.String), "Tags to search (varies by object type)", func() {
dsl.Example([]string{"active"})
dsl.Attribute("tags", dsl.ArrayOf(dsl.String), "Tags to search with OR logic - matches resources with any of these tags", func() {
dsl.Example([]string{"active", "public"})
})
dsl.Attribute("tags_all", dsl.ArrayOf(dsl.String), "Tags to search with AND logic - matches resources that have all of these tags", func() {
dsl.Example([]string{"governance", "security"})
})
dsl.Required("bearer_token", "version")
})
Expand All @@ -74,6 +77,7 @@ var _ = dsl.Service("query-svc", func() {
dsl.Param("parent")
dsl.Param("type")
dsl.Param("tags")
dsl.Param("tags_all")
dsl.Param("sort")
dsl.Param("page_token")
dsl.Header("bearer_token:Authorization")
Expand Down Expand Up @@ -110,8 +114,11 @@ var _ = dsl.Service("query-svc", func() {
dsl.Attribute("type", dsl.String, "Resource type to search", func() {
dsl.Example("committee")
})
dsl.Attribute("tags", dsl.ArrayOf(dsl.String), "Tags to search (varies by object type)", func() {
dsl.Example([]string{"active"})
dsl.Attribute("tags", dsl.ArrayOf(dsl.String), "Tags to search with OR logic - matches resources with any of these tags", func() {
dsl.Example([]string{"active", "public"})
})
dsl.Attribute("tags_all", dsl.ArrayOf(dsl.String), "Tags to search with AND logic - matches resources that have all of these tags", func() {
dsl.Example([]string{"governance", "security"})
})
dsl.Required("bearer_token", "version")
})
Expand All @@ -129,15 +136,14 @@ var _ = dsl.Service("query-svc", func() {
dsl.Required("count", "has_more")
})

dsl.Error("BadRequest", dsl.ErrorResult, "Bad request")

dsl.HTTP(func() {
dsl.GET("/query/resources/count")
dsl.Param("version:v")
dsl.Param("name")
dsl.Param("parent")
dsl.Param("type")
dsl.Param("tags")
dsl.Param("tags_all")
dsl.Header("bearer_token:Authorization")
dsl.Response(dsl.StatusOK, func() {
dsl.Header("cache_control:Cache-Control")
Expand Down
30 changes: 23 additions & 7 deletions gen/http/cli/lfx_v2_query_service/cli.go
View file
Open in desktop

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

Loading