Merge pull request #25 from linuxfoundation/andrest50/tags-all

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

Author: andrest50

charts/lfx-v2-query-service/Chart.yaml

@@ -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"

cmd/service/converters.go

@@ -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,
@@ -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
 	}
@@ -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
 	}

design/query-svc.go

@@ -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")
 		})
@@ -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")
@@ -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")
 		})
@@ -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")