Merge branch 'master' into go-native-plugins

TykTechnologies · Jun 2, 2019 · 68d19fb · 68d19fb
2 parents 09ff2cb + 379328b
commit 68d19fb
Show file tree

Hide file tree

Showing 106 changed files with 10,903 additions and 366 deletions.
diff --git a/apidef/api_definitions.go b/apidef/api_definitions.go
@@ -172,7 +172,7 @@ type URLRewriteMeta struct {
 	MatchPattern string           `bson:"match_pattern" json:"match_pattern"`
 	RewriteTo    string           `bson:"rewrite_to" json:"rewrite_to"`
 	Triggers     []RoutingTrigger `bson:"triggers" json:"triggers"`
-	MatchRegexp  *regexp.Regexp
+	MatchRegexp  *regexp.Regexp   `json:"-"`
 }
 
 type VirtualMeta struct {

diff --git a/apidef/importer/importer.go b/apidef/importer/importer.go
@@ -26,6 +26,8 @@ func GetImporterForSource(source APIImporterSource) (APIImporter, error) {
 		return &BluePrintAST{}, nil
 	case SwaggerSource:
 		return &SwaggerAST{}, nil
+	case WSDLSource:
+		return &WSDLDef{}, nil
 	default:
 		return nil, errors.New("source not matched, failing")
 	}