fixing containerd filters

srl-labs · Jun 28, 2021 · 1617539 · 1617539
1 parent 0aab7c9
commit 1617539
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/runtime/containerd/containerd.go b/runtime/containerd/containerd.go
@@ -496,8 +496,8 @@ func (c *ContainerdRuntime) ListContainers(ctx context.Context, filter []*types.
 
 func (c *ContainerdRuntime) buildFilterString(filter []*types.GenericFilter) string {
 	filterstring := ""
-	delim := ""
-	for _, filterEntry := range filter {
+	delim := ","
+	for counter, filterEntry := range filter {
 		isExistsOperator := false
 
 		operator := filterEntry.Operator
@@ -509,14 +509,17 @@ func (c *ContainerdRuntime) buildFilterString(filter []*types.GenericFilter) str
 			isExistsOperator = true
 		}
 
+		if counter+1 == len(filter) {
+			delim = ""
+		}
+
 		if filterEntry.FilterType == "label" {
-			filterstring = filterstring + "labels." + filterEntry.Field
+			filterstring = filterstring + "labels.\"" + filterEntry.Field + "\""
 			if !isExistsOperator {
-				filterstring = filterstring + operator + filterEntry.Match + delim
+				filterstring = filterstring + operator + "\"" + filterEntry.Match + "\"" + delim
 			}
 
 		} // more might be implemented later
-		delim = ","
 	}
 	log.Debug("Filterstring: " + filterstring)
 	return filterstring