fixup: pr comments - to be squashed into 1st commit

Author: joshkeegan-form3

internal/app/pactproxy/constraint.go

@@ -19,7 +19,7 @@ func (i interactionConstraint) Key() string {
 	return strings.Join([]string{i.Interaction, i.Path}, "_")
 }
 
-func (i interactionConstraint) Check(expectedValues []interface{}, actualValue interface{}) error {
+func (i interactionConstraint) check(expectedValues []interface{}, actualValue interface{}) error {
 	if i.Format == fmtLen {
 		if len(expectedValues) != 1 {
 			return fmt.Errorf(

internal/app/pactproxy/interaction.go

@@ -278,7 +278,7 @@ func (i *Interaction) addJSONConstraintsFromPact(path string, matchingRules map[
 	case []interface{}:
 		// Create constraints for each element in the array. This allows matching rules to override them.
 		for j := range val {
-			i.addJSONConstraintsFromPact(fmt.Sprintf("%v[%v]", path, j), matchingRules, val[j])
+			i.addJSONConstraintsFromPact(fmt.Sprintf("%s[%d]", path, j), matchingRules, val[j])
 		}
 		// Length constraint so that requests with additional elements at the end of the array will not match
 		i.AddConstraint(interactionConstraint{
@@ -345,26 +345,26 @@ func (i *Interaction) EvaluateConstraints(request requestDocument, interactions
 	i.mu.RLock()
 	defer i.mu.RUnlock()
 	for _, constraint := range i.constraints {
-		values := constraint.Values
+		expected := constraint.Values
 		if constraint.Source != "" {
 			var err error
-			values, err = i.loadValuesFromSource(constraint, interactions)
+			expected, err = i.loadValuesFromSource(constraint, interactions)
 			if err != nil {
 				violations = append(violations, err.Error())
 				result = false
 				continue
 			}
 		}
 
-		val, err := jsonpath.Get(request.encodeValues(constraint.Path), map[string]interface{}(request))
+		actual, err := jsonpath.Get(request.encodeValues(constraint.Path), map[string]interface{}(request))
 		if err != nil {
 			violations = append(violations,
 				fmt.Sprintf("constraint path %q cannot be resolved within request: %q", constraint.Path, err))
 			result = false
 			continue
 		}
 
-		if err := constraint.Check(values, val); err != nil {
+		if err := constraint.check(expected, actual); err != nil {
 			violations = append(violations, err.Error())
 			result = false
 		}