Fix bug where only one list item was being checked

Refs:
 - https://issues.redhat.com/browse/ACM-7889

Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>

controllers/configurationpolicy_controller_test.go

@@ -382,6 +382,32 @@ func TestCheckListsMatch(t *testing.T) {
 
  assert.False(t, checkListsMatch(twoFullItems, twoSmallItems))
  assert.False(t, checkListsMatch(twoSmallItems, twoFullItems))
+
+ oneSmallOneBig := []interface{}{
+ map[string]interface{}{
+ "a": "apple",
+ },
+ map[string]interface{}{
+ "c": "candy",
+ "d": "dog",
+ },
+ }
+
+ assert.False(t, checkListsMatch(twoFullItems, oneSmallOneBig))
+ assert.False(t, checkListsMatch(oneSmallOneBig, twoFullItems))
+
+ oneBigOneSmall := []interface{}{
+ map[string]interface{}{
+ "a": "apple",
+ "b": "boy",
+ },
+ map[string]interface{}{
+ "c": "candy",
+ },
+ }
+
+ assert.False(t, checkListsMatch(twoFullItems, oneBigOneSmall))
+ assert.False(t, checkListsMatch(oneBigOneSmall, twoFullItems))
 }
 
 func TestAddRelatedObject(t *testing.T) {

controllers/configurationpolicy_utils.go

@@ -323,7 +323,11 @@ func checkListsMatch(oldVal []interface{}, mergedVal []interface{}) (m bool) {
  case map[string]interface{}:
  // if list contains maps, recurse on those maps to check for a match
  if mVal, ok := mVal[idx].(map[string]interface{}); ok {
- return len(mVal) == len(oNestedVal) && checkFieldsWithSort(mVal, oNestedVal)
+ if len(mVal) != len(oNestedVal) || !checkFieldsWithSort(mVal, oNestedVal) {
+ return false
+ }
+
+ continue
  }
 
  return false