diff --git a/assets b/assets index 8b91fca9..51bbced0 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 8b91fca9291b58edd100949954039fc71524f97d +Subproject commit 51bbced0b36c1d5de5fa1b8e49955c771082449f diff --git a/inventory/file_utils.go b/inventory/file_utils.go index 890d4191..b0b04264 100644 --- a/inventory/file_utils.go +++ b/inventory/file_utils.go @@ -78,7 +78,7 @@ func (f *fileClient) searchQuery(q *ent.FileQuery, args *SearchFileParameters, p return metadata.And(metadata.NameEQ(item.Key), metadata.ValueEQ(item.Value)) } - nameEq := metadata.NameEQ(item.Key) + nameEq := metadata.And(metadata.IsPublic(true), metadata.NameEQ(item.Key)) if item.Value == "" { return nameEq } else { @@ -86,8 +86,9 @@ func (f *fileClient) searchQuery(q *ent.FileQuery, args *SearchFileParameters, p return metadata.And(nameEq, valueContain) } }) - metaPredicates = append(metaPredicates, metadata.IsPublic(true)) - q.Where(file.HasMetadataWith(metadata.And(metaPredicates...))) + q.Where(file.And(lo.Map(metaPredicates, func(item predicate.Metadata, index int) predicate.File { + return file.HasMetadataWith(item) + })...)) } if args.SizeLte > 0 || args.SizeGte > 0 {