change config value to bool and reflect in package and tests

TykTechnologies · May 7, 2019 · dd07c80 · dd07c80
1 parent a73afc8
commit dd07c80
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/config/config.go b/config/config.go
@@ -281,7 +281,7 @@ type Config struct {
 	ControlAPIPort                    int                                   `json:"control_api_port"`
 	EnableCustomDomains               bool                                  `json:"enable_custom_domains"`
 	EnableJSVM                        bool                                  `json:"enable_jsvm"`
-	JSVM                              string                                `json:"jsvm"`
+	EnableV2JSVM                      bool                                  `json:"enable_v2_jsvm"`
 	JSVMTimeout                       int                                   `json:"jsvm_timeout"`
 	CoProcessOptions                  CoProcessConfig                       `json:"coprocess_options"`
 	HideGeneratorHeader               bool                                  `json:"hide_generator_header"`

diff --git a/jsvm_goja.go b/jsvm_goja.go
@@ -33,11 +33,9 @@ type TykJSVM interface {
 }
 
 func InitJSVM() TykJSVM {
-
-	switch config.Global().JSVM {
-	case "goja":
+	if config.Global().EnableV2JSVM {
 		return &GojaJSVM{}
-	default:
+	} else {
 		return &OttoJSVM{}
 	}
 }

diff --git a/main.go b/main.go
@@ -483,11 +483,9 @@ func loadCustomMiddleware(spec *APISpec) ([]string, apidef.MiddlewareDefinition,
 	mwPreFuncs := []apidef.MiddlewareDefinition{}
 	mwPostFuncs := []apidef.MiddlewareDefinition{}
 	mwPostKeyAuthFuncs := []apidef.MiddlewareDefinition{}
-	var mwDriver apidef.MiddlewareDriver
-	if config.Global().JSVM == "goja" {
+	mwDriver := apidef.OttoDriver
+	if config.Global().EnableV2JSVM {
 		mwDriver = apidef.GojaDriver
-	} else {
-		mwDriver = apidef.OttoDriver
 	}
 	// Set AuthCheck hook
 	if spec.CustomMiddleware.AuthCheck.Name != "" {

diff --git a/mw_js_plugin_test.go b/mw_js_plugin_test.go
@@ -685,7 +685,6 @@ leakMid.NewProcessRequest(function(request, session) {
 
 func TestTykMakeHTTPRequestOtto(t *testing.T) {
 	globalConf := config.Global()
-	globalConf.JSVM = "otto"
 	config.SetGlobal(globalConf)
 	ts := newTykTestServer()
 	defer ts.Close()
@@ -800,7 +799,7 @@ func TestTykMakeHTTPRequestOtto(t *testing.T) {
 
 func TestTykMakeHTTPRequestGoja(t *testing.T) {
 	globalConf := config.Global()
-	globalConf.JSVM = "goja"
+	globalConf.EnableV2JSVM = true
 	config.SetGlobal(globalConf)
 	ts := newTykTestServer()
 	defer ts.Close()

diff --git a/mw_virtual_endpoint_test.go b/mw_virtual_endpoint_test.go
@@ -79,7 +79,7 @@ func TestVirtualEndpointOtto(t *testing.T) {
 
 func TestVirtualEndpointGoja(t *testing.T) {
 	globalConf := config.Global()
-	globalConf.JSVM = "goja"
+	globalConf.EnableV2JSVM = true
 	config.SetGlobal(globalConf)
 	defer resetTestConfig()
 	ts := newTykTestServer()
@@ -130,3 +130,27 @@ func BenchmarkVirtualEndpoint(b *testing.B) {
 		})
 	}
 }
+
+func BenchmarkVirtualEndpointGoja(b *testing.B) {
+	b.ReportAllocs()
+	globalConf := config.Global()
+	globalConf.EnableV2JSVM = true
+	config.SetGlobal(globalConf)
+	defer resetTestConfig()
+	ts := newTykTestServer()
+	defer ts.Close()
+
+	testPrepareVirtualEndpoint(virtTestJS, "GET", "/virt", true)
+
+	for i := 0; i < b.N; i++ {
+		ts.Run(b, test.TestCase{
+			Path:      "/virt",
+			Code:      202,
+			BodyMatch: "foobar",
+			HeadersMatch: map[string]string{
+				"data-foo":   "x",
+				"data-bar-y": "3",
+			},
+		})
+	}
+}