From 549fcad76e0d4e4accb1b265fa54756387249699 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Thu, 17 Sep 2020 13:00:27 +0300 Subject: [PATCH] [#148] sdk/object: Change search filters v2 converter return type Unified structures from v2 package work with the slice of pointers. Signed-off-by: Alex Vanin --- pkg/object/search.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/object/search.go b/pkg/object/search.go index 4f7a539..3cf97be 100644 --- a/pkg/object/search.go +++ b/pkg/object/search.go @@ -56,9 +56,13 @@ func NewSearchFilters() SearchFilters { return SearchFilters{} } -func NewSearchFiltersFromV2(v2 []v2object.SearchFilter) SearchFilters { +func NewSearchFiltersFromV2(v2 []*v2object.SearchFilter) SearchFilters { filters := make(SearchFilters, 0, len(v2)) for i := range v2 { + if v2[i] == nil { + continue + } + filters = append(filters, SearchFilter{ header: v2[i].GetName(), value: v2[i].GetValue(), @@ -81,10 +85,10 @@ func (f *SearchFilters) AddFilter(header, value string, op SearchMatchType) { }) } -func (f SearchFilters) ToV2() []v2object.SearchFilter { - result := make([]v2object.SearchFilter, 0, len(f)) +func (f SearchFilters) ToV2() []*v2object.SearchFilter { + result := make([]*v2object.SearchFilter, 0, len(f)) for i := range f { - v2 := v2object.SearchFilter{} + v2 := new(v2object.SearchFilter) v2.SetName(f[i].header) v2.SetValue(f[i].value) v2.SetMatchType(f[i].op.ToV2())