Support '!=' operator in filters

Introduced matchWithOperator to determine inclusionary (=) or exclusionary (!=) filtering based on CLI input, per changes in [this PR](docker/cli#6035).

Integrated it into Match, ExactMatch, UniqueExactMatch, and FuzzyMatch functions

Also created GetPair Function and updated the Add function for use in the CLI update in the above PR

Signed-off-by: Mohammed Aminu Futa <[email protected]>

Author: mohammedfuta2000

api/types/filters/parse.go

@@ -123,12 +123,23 @@ func (args Args) Get(key string) []string {
 	return slice
 }
 
+// Get returns the list of children key/value pairs associated with the key
+func (args Args) GetPair(key string) map[string]bool {
+	values := args.fields[key]
+	return values
+}
+
 // Add a new value to the set of values
-func (args Args) Add(key, value string) {
+func (args Args) Add(key, value string, isEqualOps ...bool) {
+	isEqualOp := true
+	if len(isEqualOps) > 0 {
+		isEqualOp = isEqualOps[0]
+	}
+
 	if _, ok := args.fields[key]; ok {
-		args.fields[key][value] = true
+		args.fields[key][value] = isEqualOp
 	} else {
-		args.fields[key] = map[string]bool{value: true}
+		args.fields[key] = map[string]bool{value: isEqualOp}
 	}
 }
 
@@ -181,18 +192,7 @@ func (args Args) Match(field, source string) bool {
 	if args.ExactMatch(field, source) {
 		return true
 	}
-
-	fieldValues := args.fields[field]
-	for name2match := range fieldValues {
-		match, err := regexp.MatchString(name2match, source)
-		if err != nil {
-			continue
-		}
-		if match {
-			return true
-		}
-	}
-	return false
+	return matchWithOperator(args.fields[field], source, regexp.MatchString)
 }
 
 // GetBoolOrDefault returns a boolean value of the key if the key is present
@@ -226,7 +226,32 @@ func (args Args) ExactMatch(key, source string) bool {
 	}
 
 	// try to match full name value to avoid O(N) regular expression matching
-	return fieldValues[source]
+	return matchWithOperator(fieldValues, source, func(a, b string) (bool, error) {
+		return a == b, nil
+	})
+}
+
+func matchWithOperator(fieldValues map[string]bool, source string, matcher func(string, string) (bool, error)) bool {
+	hasExclusion := false
+	for pattern, isEqual := range fieldValues {
+		match, err := matcher(pattern, source)
+		if err != nil {
+			continue
+		}
+		if isEqual {
+			if match {
+				return true
+			}
+		} else {
+			hasExclusion = true
+			if match {
+				return false
+			}
+		}
+	}
+	return hasExclusion
+	// If exclusion filters(!=) exist and none match the source, include the container
+	// if only inclusion filters(=), and none match the source, exclude the container
 }
 
 // UniqueExactMatch returns true if there is only one value and the source
@@ -242,7 +267,9 @@ func (args Args) UniqueExactMatch(key, source string) bool {
 	}
 
 	// try to match full name value to avoid O(N) regular expression matching
-	return fieldValues[source]
+	return matchWithOperator(fieldValues, source, func(a, b string) (bool, error) {
+		return a == b, nil
+	})
 }
 
 // FuzzyMatch returns true if the source matches exactly one value,  or the
@@ -253,12 +280,9 @@ func (args Args) FuzzyMatch(key, source string) bool {
 	}
 
 	fieldValues := args.fields[key]
-	for prefix := range fieldValues {
-		if strings.HasPrefix(source, prefix) {
-			return true
-		}
-	}
-	return false
+	return matchWithOperator(fieldValues, source, func(a, b string) (bool, error) {
+		return strings.HasPrefix(b, a), nil
+	})
 }
 
 // Contains returns true if the key exists in the mapping