add jsvm to lint schema and update otto vendor

TykTechnologies · Nov 6, 2018 · f93d402 · f93d402
1 parent a7b8e32
commit f93d402
Show file tree

Hide file tree

Showing 12 changed files with 169 additions and 20 deletions.
diff --git a/cli/lint/schema.go b/cli/lint/schema.go
@@ -236,6 +236,9 @@ const confSchema = `{
 	"enable_jsvm": {
 		"type": "boolean"
 	},
+	"jsvm":{
+		"type": "string"
+	},
 	"jsvm_timeout": {
 		"type": "integer"
 	},

diff --git a/jsvm_goja.go b/jsvm_goja.go
@@ -12,10 +12,11 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/dop251/goja"
+
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
 	"github.com/TykTechnologies/tyk/user"
-	"github.com/dop251/goja"
 )
 
 type TykJSVM interface {

diff --git a/jsvm_otto.go b/jsvm_otto.go
@@ -12,11 +12,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/robertkrimen/otto"
+	_ "github.com/robertkrimen/otto/underscore"
+
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
 	"github.com/TykTechnologies/tyk/user"
-	"github.com/robertkrimen/otto"
-	_ "github.com/robertkrimen/otto/underscore"
 
 	"github.com/Sirupsen/logrus"
 )

diff --git a/mw_js_plugin.go b/mw_js_plugin.go
@@ -139,6 +139,7 @@ func (d *DynamicMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Reques
 	err, code, returnDataStr := d.Spec.JSVM.RunJSRequestDynamic(d, logger, string(requestAsJson), string(sessionAsJson), specAsJson)
 	if err != nil {
 		log.Errorf("JSVM error: %v", err)
+		return err, code
 	}
 
 	if code != -1 {

diff --git a/mw_virtual_endpoint.go b/mw_virtual_endpoint.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -158,8 +157,8 @@ func (d *VirtualEndpoint) ServeHTTPForCache(w http.ResponseWriter, r *http.Reque
 	// Run the middleware
 	err, code, returnDataStr := d.Spec.JSVM.RunJSRequestVirtual(d, d.logger, vmeta, string(requestAsJson), string(sessionAsJson), specAsJson)
 	if err != nil {
-		//TODO
-		fmt.Println(err)
+		log.Errorf("JSVM VE error: %v", err)
+		return nil
 	}
 	if code != -1 {
 		return nil

diff --git a/vendor/github.com/robertkrimen/otto/README.markdown b/vendor/github.com/robertkrimen/otto/README.markdown
diff --git a/vendor/github.com/robertkrimen/otto/builtin_array.go b/vendor/github.com/robertkrimen/otto/builtin_array.go
diff --git a/vendor/github.com/robertkrimen/otto/error.go b/vendor/github.com/robertkrimen/otto/error.go
diff --git a/vendor/github.com/robertkrimen/otto/inline.pl b/vendor/github.com/robertkrimen/otto/inline.pl
diff --git a/vendor/github.com/robertkrimen/otto/runtime.go b/vendor/github.com/robertkrimen/otto/runtime.go
diff --git a/vendor/github.com/robertkrimen/otto/type_function.go b/vendor/github.com/robertkrimen/otto/type_function.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -443,10 +443,10 @@
 			"revisionTime": "2016-01-27T17:00:04Z"
 		},
 		{
-			"checksumSHA1": "ZSYig6eYkc34ELHl6O5gRtJvr6o=",
+			"checksumSHA1": "WdorbyEJiNbjIOiQzM4TLb/XA7Q=",
 			"path": "github.com/robertkrimen/otto",
-			"revision": "fc2eb1bbf1c5c462313c810bb02dc93cd964aebe",
-			"revisionTime": "2017-07-21T19:43:36Z"
+			"revision": "15f95af6e78dcd2030d8195a138bd88d4f403546",
+			"revisionTime": "2018-06-17T13:11:54Z"
 		},
 		{
 			"checksumSHA1": "q1HKpLIWi3tTT5W5LqMlwPcGmyQ=",