Merge pull request #7 from kolesa-team/default-values-fix

Some fixes for Default Values Filter
kolesa-team · Jun 2, 2022 · f29d04e · f29d04e
2 parents c17b03c + 3000e46
commit f29d04e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/http-api-mock.go b/http-api-mock.go
@@ -29,7 +29,7 @@ var ErrNotFoundDefaultPath = errors.New("We can't determinate the current path")
 var ErrNotFoundAnyMock = errors.New("No valid mock definition found")
 
 func banner() {
-	fmt.Println("HTTP API Mock v 1.1.5")
+	fmt.Println("HTTP API Mock v 1.2.1")
 	fmt.Println("")
 
 	fmt.Print(

diff --git a/vars/default_values_filter.go b/vars/default_values_filter.go
@@ -14,7 +14,7 @@ type DefaultValuesFilter struct {
 }
 
 func (dvf DefaultValuesFilter) Fill(_ *definition.Mock, input string, _ bool) string {
-	r := regexp.MustCompile(`\{\{\s*default\.([^{]+?)\s*}}`)
+	r := regexp.MustCompile(`\{\{\s*default\.[A-Za-z]+\(.*\,*\)\s*}}`)
 	if r.MatchString(input) {
 		input = dvf.Process(r, input)
 	}

diff --git a/vars/vars_processor.go b/vars/vars_processor.go
@@ -30,13 +30,12 @@ func (fp VarsProcessor) Eval(req *definition.Request, m *definition.Mock) {
 
 	// handle possible dynamic values and use it in storage again
 	fp.walkAndFill(dynamicVarsFiller, m, true)
-	fp.walkAndFill(defaultValuesVarsFiller, m, true)
 	fp.walkAndFill(storageFiller, m, true)
 
 	entityActions.ApplyActions(m)
 
+	fp.walkAndFill(defaultValuesVarsFiller, m, true)
 	fp.walkAndFill(persistFiller, m, false)
-
 }
 
 func (fp VarsProcessor) walkAndFill(f Filler, m *definition.Mock, fillPersisted bool) {