updated to latest API from validator

daveshanley · daveshanley · commit cc3e60b59370 · 2026-03-14T12:58:58.000-04:00
diff --git a/mock/mock_engine.go b/mock/mock_engine.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/pb33f/libopenapi-validator/config"
 	libopenapierrs "github.com/pb33f/libopenapi-validator/errors"
 	"github.com/pb33f/libopenapi-validator/helpers"
 	"github.com/pb33f/libopenapi-validator/paths"
@@ -26,7 +27,7 @@ type ResponseMockEngine struct {
 	validator      validation.HttpValidator
 	mockEngine     *renderer.MockGenerator
 	pretty         bool
-	regexCache     *sync.Map
+	validationOpts *config.ValidationOptions
 	hardValidation bool // when true, reject requests with validation errors
 }
 
@@ -45,7 +46,7 @@ func NewMockEngine(document *v3.Document, pretty, useAllPropertyExamples bool) *
 		validator:      validation.NewHttpValidator(document),
 		mockEngine:     me,
 		pretty:         pretty,
-		regexCache:     &sync.Map{},
+		validationOpts: config.NewValidationOptions(config.WithRegexCache(&sync.Map{})),
 		hardValidation: true, // default to rejecting on validation errors for backward compatibility
 	}
 }
@@ -67,7 +68,7 @@ func NewStrictMockEngine(document *v3.Document, pretty, useAllPropertyExamples b
 		validator:      validation.NewStrictHttpValidator(document),
 		mockEngine:     me,
 		pretty:         pretty,
-		regexCache:     &sync.Map{},
+		validationOpts: config.NewValidationOptions(config.WithRegexCache(&sync.Map{})),
 		hardValidation: true, // default to rejecting on validation errors for backward compatibility
 	}
 }
@@ -218,7 +219,7 @@ func (rme *ResponseMockEngine) extractMediaTypeHeader(request *http.Request) str
 }
 
 func (rme *ResponseMockEngine) findPath(request *http.Request) (*v3.PathItem, error) {
-	path, errs, _ := paths.FindPath(request, rme.doc, rme.regexCache)
+	path, errs, _ := paths.FindPath(request, rme.doc, rme.validationOpts)
 	return path, rme.packErrors(errs)
 }
 
diff --git a/mock/mock_engine_test.go b/mock/mock_engine_test.go
@@ -518,7 +518,7 @@ components:
 	buf := bytes.NewBuffer([]byte(payload))
 	request, _ := http.NewRequest(http.MethodPost, "https://api.pb33f.io/auth", buf)
 	request.Header.Set(helpers.ContentTypeHeader, "application/json")
-	request.Header.Set(helpers.AuthorizationHeader, "the science man")
+	request.Header.Set(helpers.AuthorizationHeader, "Basic dGVzdFVzZXI6dGVzdFBhc3M=")
 
 	b, status, err := me.GenerateResponse(request)
 	assert.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`"strings"`
`13`	`13`	`"sync"`
`14`	`14`
	`15`	`+ "github.com/pb33f/libopenapi-validator/config"`
`15`	`16`	`libopenapierrs "github.com/pb33f/libopenapi-validator/errors"`
`16`	`17`	`"github.com/pb33f/libopenapi-validator/helpers"`
`17`	`18`	`"github.com/pb33f/libopenapi-validator/paths"`
`@@ -26,7 +27,7 @@ type ResponseMockEngine struct {`
`26`	`27`	`validator validation.HttpValidator`
`27`	`28`	`mockEngine *renderer.MockGenerator`
`28`	`29`	`pretty bool`
`29`		`- regexCache *sync.Map`
	`30`	`+ validationOpts *config.ValidationOptions`
`30`	`31`	`hardValidation bool // when true, reject requests with validation errors`
`31`	`32`	`}`
`32`	`33`
`@@ -45,7 +46,7 @@ func NewMockEngine(document v3.Document, pretty, useAllPropertyExamples bool) `
`45`	`46`	`validator: validation.NewHttpValidator(document),`
`46`	`47`	`mockEngine: me,`
`47`	`48`	`pretty: pretty,`
`48`		`- regexCache: &sync.Map{},`
	`49`	`+ validationOpts: config.NewValidationOptions(config.WithRegexCache(&sync.Map{})),`
`49`	`50`	`hardValidation: true, // default to rejecting on validation errors for backward compatibility`
`50`	`51`	`}`
`51`	`52`	`}`
`@@ -67,7 +68,7 @@ func NewStrictMockEngine(document *v3.Document, pretty, useAllPropertyExamples b`
`67`	`68`	`validator: validation.NewStrictHttpValidator(document),`
`68`	`69`	`mockEngine: me,`
`69`	`70`	`pretty: pretty,`
`70`		`- regexCache: &sync.Map{},`
	`71`	`+ validationOpts: config.NewValidationOptions(config.WithRegexCache(&sync.Map{})),`
`71`	`72`	`hardValidation: true, // default to rejecting on validation errors for backward compatibility`
`72`	`73`	`}`
`73`	`74`	`}`
`@@ -218,7 +219,7 @@ func (rme ResponseMockEngine) extractMediaTypeHeader(request http.Request) str`
`218`	`219`	`}`
`219`	`220`
`220`	`221`	`func (rme ResponseMockEngine) findPath(request http.Request) (*v3.PathItem, error) {`
`221`		`- path, errs, _ := paths.FindPath(request, rme.doc, rme.regexCache)`
	`222`	`+ path, errs, _ := paths.FindPath(request, rme.doc, rme.validationOpts)`
`222`	`223`	`return path, rme.packErrors(errs)`
`223`	`224`	`}`
`224`	`225`