Fixed Tavern executor excludes ** expressions

Author: c4s4

.build/go.mk

@@ -31,15 +31,15 @@ IS_TEST                    = $(filter test,$(MAKECMDGOALS))
 TARGET_OS                  = $(filter-out $(TARGET_OS_EXCLUDED), $(if ${ENABLE_CROSS_COMPILATION},$(if ${OS},${OS}, $(if $(IS_TEST), $(shell go env GOOS), windows darwin linux openbsd freebsd)),$(shell go env GOOS)))
 TARGET_ARCH                = $(if ${ARCH},${ARCH}, $(if $(IS_TEST), $(shell go env GOARCH),amd64 arm 386 arm64 ppc64le))
 BINARIES                   = $(addprefix $(TARGET_DIST)/, $(addsuffix .$(OS)-$(ARCH)$(if $(IS_WINDOWS),.exe), $(notdir $(TARGET_NAME))))
-OSARCHVALID                := $(shell go tool dist list | grep -v '^darwin/arm'|grep -v '^darwin/386'|grep -v '^windows/386'|grep -v '^windows/arm'|grep -v '^openbsd/arm*'|grep -v '^openbsd/386'|grep -v '^freebsd/arm*'|grep -v '^freebsd/386')
+OSARCHVALID                := $(shell go tool dist list | grep -v '^darwin/386'|grep -v '^windows/386'|grep -v '^windows/arm'|grep -v '^openbsd/arm*'|grep -v '^openbsd/386'|grep -v '^freebsd/arm*'|grep -v '^freebsd/386')
 IS_OS_ARCH_VALID           = $(filter $(OS)/$(ARCH),$(OSARCHVALID))
 CROSS_COMPILED_BINARIES    = $(foreach OS, $(TARGET_OS), $(foreach ARCH, $(TARGET_ARCH), $(if $(IS_OS_ARCH_VALID), $(BINARIES))))
 GOFILES                    := $(call get_recursive_files, '.')
 
 mk_go_build:
 	$(info *** mk_go_build)
 
-mk_go_build_plugin: 
+mk_go_build_plugin:
 	@mkdir -p dist/lib && \
 	go build -buildmode=plugin -o dist/lib/$(TARGET_NAME).so
 

executors/tavern/assert.go

@@ -125,12 +125,12 @@ func PathToRegexp(path string) string {
 	var parts []string
 	for _, element := range elements {
 		if element == "*" {
-			parts = append(parts, "[^/]*?")
+			parts = append(parts, "[^/]+/")
 		} else if element == "**" {
-			parts = append(parts, ".*?")
+			parts = append(parts, "(.*?/)?")
 		} else {
-			parts = append(parts, element)
+			parts = append(parts, element+"/")
 		}
 	}
-	return "^" + strings.Join(parts, "/") + "$"
+	return "^" + strings.TrimSuffix(strings.Join(parts, ""), "/") + "$"
 }

executors/tavern/assert_test.go

@@ -384,22 +384,22 @@ func TestPathToRegexp(t *testing.T) {
 	}
 	path = "*/bar"
 	regex = PathToRegexp(path)
-	if regex != "^[^/]*?/bar$" {
+	if regex != "^[^/]+/bar$" {
 		t.Fatalf("bad path regexp: %s", regex)
 	}
 	path = "foo/*"
 	regex = PathToRegexp(path)
-	if regex != "^foo/[^/]*?$" {
+	if regex != "^foo/[^/]+$" {
 		t.Fatalf("bad path regexp: %s", regex)
 	}
 	path = "foo/**"
 	regex = PathToRegexp(path)
-	if regex != "^foo/.*?$" {
+	if regex != "^foo/(.*?/)?$" {
 		t.Fatalf("bad path regexp: %s", regex)
 	}
 	path = "**/bar"
 	regex = PathToRegexp(path)
-	if regex != "^.*?/bar$" {
+	if regex != "^(.*?/)?bar$" {
 		t.Fatalf("bad path regexp: %s", regex)
 	}
 }