Renamed validator to matcher

Author: iv-p

cmd/check.go

@@ -52,9 +52,9 @@ func check(cmd *cobra.Command, args []string) error {
 	httpClient := http.NewClient()
 	stepHttpClient := step.NewHTTPClient(httpClient)
 	stepInterpolator := step.NewInterpolator()
-	stepValidator := step.NewValidator()
+	stepMatcher := step.NewMatcher()
 	stepExporter := step.NewExporter()
-	stepRunner := step.NewRunner(stepHttpClient, *stepInterpolator, stepValidator, stepExporter)
+	stepRunner := step.NewRunner(stepHttpClient, *stepInterpolator, stepMatcher, stepExporter)
 	specRunner := runner.NewParallelSpecRunner(parallelism, stepRunner, w)
 
 	w.Prelude()

spec/validator/body.go spec/matcher/body.gospec/validator/body.go renamed to spec/matcher/body.go

@@ -1,18 +1,18 @@
-package validator
+package matcher
 
 import (
 	"fmt"
 	"strings"
 )
 
-type BodyTextValidator string
+type BodyTextMatcher string
 
-func (v *BodyTextValidator) Set(str string) {
-	val := BodyTextValidator(str)
+func (v *BodyTextMatcher) Set(str string) {
+	val := BodyTextMatcher(str)
 	v = &val
 }
 
-func (v BodyTextValidator) Validate(str string) (pass []string, fail []string) {
+func (v BodyTextMatcher) Validate(str string) (pass []string, fail []string) {
 	if len(v) == 0 {
 		fail = append(fail, "expected body is empty")
 		return

spec/matcher/headers.go

@@ -0,0 +1,48 @@
+package matcher
+
+import (
+	"fmt"
+
+	"github.com/getapid/apid/log"
+)
+
+type HeaderMatcher map[StringMatcher]StringMatcher
+
+func (v *HeaderMatcher) Set(headers map[string]string) {
+	m := make(map[StringMatcher]StringMatcher, len(headers))
+	for name, value := range headers {
+		m[StringMatcher(name)] = StringMatcher(value)
+	}
+	val := HeaderMatcher(m)
+	v = &val
+}
+
+func (v HeaderMatcher) Validate(headers map[string][]string) (pass []string, fail []string) {
+	log.L.Infof("validating headers %v", headers)
+	for nameMatcher, valueMatcher := range v {
+		found := false
+		errStr := fmt.Sprintf("expected header %s, but none found", nameMatcher)
+		for name, values := range headers {
+			if !nameMatcher.Validate(name) {
+				continue
+			}
+			errStr = fmt.Sprintf("expected header %s to match %s, got %v", nameMatcher, valueMatcher, values)
+
+			for _, value := range values {
+				if !valueMatcher.Validate(value) {
+					continue
+				}
+				pass = append(pass, fmt.Sprintf("has header %s = %s", nameMatcher, valueMatcher))
+				found = true
+				break
+			}
+			if found {
+				break
+			}
+		}
+		if !found {
+			fail = append(fail, errStr)
+		}
+	}
+	return pass, fail
+}

spec/validator/json.go spec/matcher/json.gospec/validator/json.go renamed to spec/matcher/json.go

@@ -1,4 +1,4 @@
-package validator
+package matcher
 
 import (
 	"encoding/json"
@@ -8,13 +8,13 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-type JSONValidator struct {
+type JSONMatcher struct {
 	Selector *string     `json:"selector"`
 	Subset   *bool       `json:"is_subset"`
 	Is       interface{} `json:"is"`
 }
 
-func (v *JSONValidator) Validate(body []byte) (pass []string, fail []string) {
+func (v *JSONMatcher) Validate(body []byte) (pass []string, fail []string) {
 	message := "body"
 	var received interface{}
 	if v.Selector != nil {

spec/validator/regex.go spec/matcher/regex.gospec/validator/regex.go renamed to spec/matcher/regex.go

@@ -1,4 +1,4 @@
-package validator
+package matcher
 
 import (
 	"regexp"

spec/validator/status_code.go spec/matcher/status_code.gospec/validator/status_code.go renamed to spec/matcher/status_code.go

@@ -1,17 +1,17 @@
-package validator
+package matcher
 
 import (
 	"fmt"
 )
 
-type StatusCodeValidator int64
+type StatusCodeMatcher int64
 
-func (v *StatusCodeValidator) Set(i int64) {
-	val := StatusCodeValidator(i)
+func (v *StatusCodeMatcher) Set(i int64) {
+	val := StatusCodeMatcher(i)
 	v = &val
 }
 
-func (v StatusCodeValidator) Validate(value int64) ([]string, []string) {
+func (v StatusCodeMatcher) Validate(value int64) ([]string, []string) {
 	if int64(v) != value {
 		return nil, []string{fmt.Sprintf("expected status code to be %d, got %d", v, value)}
 	}

spec/validator/string.go spec/matcher/string.gospec/validator/string.go renamed to spec/matcher/string.go

@@ -1,17 +1,17 @@
-package validator
+package matcher
 
 import (
 	"strings"
 )
 
-type StringValidator string
+type StringMatcher string
 
-func (v *StringValidator) Set(str string) {
-	val := StringValidator(str)
+func (v *StringMatcher) Set(str string) {
+	val := StringMatcher(str)
 	v = &val
 }
 
-func (v StringValidator) Validate(str string) bool {
+func (v StringMatcher) Validate(str string) bool {
 	if len(v) == 0 {
 		return false
 	}

spec/spec.go

@@ -1,7 +1,7 @@
 package spec
 
 import (
-	"github.com/getapid/apid/spec/validator"
+	"github.com/getapid/apid/spec/matcher"
 )
 
 type Spec struct {
@@ -26,8 +26,8 @@ type Request struct {
 }
 
 type Expect struct {
-	Code    *validator.StatusCodeValidator `json:"code"`
-	Headers *validator.HeaderValidator     `json:"headers"`
-	JSON    []validator.JSONValidator      `json:"json"`
-	Text    *validator.BodyTextValidator   `json:"text"`
+	Code    *matcher.StatusCodeMatcher `json:"code"`
+	Headers *matcher.HeaderMatcher     `json:"headers"`
+	JSON    []matcher.JSONMatcher      `json:"json"`
+	Text    *matcher.BodyTextMatcher   `json:"text"`
 }

spec/validator/headers.go

@@ -70,7 +70,7 @@ func (i *Interpolator) interpolate(step spec.Step, vars variables.Variables) (sp
 	// }
 
 	if result.Expect.Headers != nil {
-		headerValidators := make(map[string]string, len(*result.Expect.Headers))
+		headerMatchers := make(map[string]string, len(*result.Expect.Headers))
 		for header, value := range *result.Expect.Headers {
 			header, err := template.Render(string(header), vars)
 			if err != nil {
@@ -84,9 +84,9 @@ func (i *Interpolator) interpolate(step spec.Step, vars variables.Variables) (sp
 				return result, ErrInterpolationError
 			}
 
-			headerValidators[header] = value
+			headerMatchers[header] = value
 		}
-		result.Expect.Headers.Set(headerValidators)
+		result.Expect.Headers.Set(headerMatchers)
 	}
 
 	return result, nil