Update runtime with request changes

vinglogn · Dec 19, 2016 · 333bf4f · 333bf4f
1 parent 4a0dfec
commit 333bf4f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/runtime/logging.go b/runtime/logging.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	"github.com/open-policy-agent/opa/server"
 )
 
 // LoggingHandler returns an http.Handler that will print log messages to glog
@@ -36,12 +37,12 @@ func (h *LoggingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		glog.Infof("%v %v %v %v %v %vms",
 			r.RemoteAddr,
 			r.Method,
-			dropGlobals(r.URL),
+			dropRequestParam(r.URL),
 			statusCode,
 			recorder.bytesWritten,
 			float64(dt.Nanoseconds())/1e6)
 		if glog.V(3) {
-			for _, g := range getGlobals(r.URL) {
+			for _, g := range getRequestParam(r.URL) {
 				glog.Infoln(g)
 			}
 		}
@@ -74,10 +75,10 @@ func (r *recorder) WriteHeader(s int) {
 	r.inner.WriteHeader(s)
 }
 
-func dropGlobals(u *url.URL) string {
+func dropRequestParam(u *url.URL) string {
 	cpy := url.Values{}
 	for k, v := range u.Query() {
-		if k != "global" {
+		if k != server.ParamRequestV1 {
 			cpy[k] = v
 		}
 	}
@@ -87,8 +88,8 @@ func dropGlobals(u *url.URL) string {
 	return u.Path + "?" + cpy.Encode()
 }
 
-func getGlobals(u *url.URL) (r []string) {
-	for _, g := range u.Query()["global"] {
+func getRequestParam(u *url.URL) (r []string) {
+	for _, g := range u.Query()[server.ParamRequestV1] {
 		s, err := url.QueryUnescape(g)
 		if err == nil {
 			r = append(r, s)

diff --git a/runtime/logging_test.go b/runtime/logging_test.go
@@ -11,18 +11,18 @@ import (
 	"testing"
 )
 
-func TestDropGlobals(t *testing.T) {
+func TestDropRequestParam(t *testing.T) {
 
 	// Without other params.
 	abc := `a.b.c:{"foo":[1,2,3,4]}`
 	abcEncoded := url.QueryEscape(abc)
 
-	uri, err := url.ParseRequestURI(fmt.Sprintf(`http://localhost:8181/v1/data/foo/bar?global=%v`, abcEncoded))
+	uri, err := url.ParseRequestURI(fmt.Sprintf(`http://localhost:8181/v1/data/foo/bar?request=%v`, abcEncoded))
 	if err != nil {
 		panic(err)
 	}
 
-	result := dropGlobals(uri)
+	result := dropRequestParam(uri)
 	expected := "/v1/data/foo/bar"
 
 	if result != expected {
@@ -33,12 +33,12 @@ func TestDropGlobals(t *testing.T) {
 	def := `d.e.f:{"bar":{"baz":null}}`
 	defEncoded := url.QueryEscape(def)
 
-	uri, err = url.ParseRequestURI(fmt.Sprintf(`http://localhost:8181/v1/data/foo/bar?global=%v&pretty=true&depth=1&global=%v`, abcEncoded, defEncoded))
+	uri, err = url.ParseRequestURI(fmt.Sprintf(`http://localhost:8181/v1/data/foo/bar?request=%v&pretty=true&depth=1&request=%v`, abcEncoded, defEncoded))
 	if err != nil {
 		panic(err)
 	}
 
-	result = dropGlobals(uri)
+	result = dropRequestParam(uri)
 	expected = "/v1/data/foo/bar?depth=1&pretty=true"
 
 	if result != expected {
@@ -47,19 +47,19 @@ func TestDropGlobals(t *testing.T) {
 
 }
 
-func TestGetGlobals(t *testing.T) {
+func TestGetRequestParam(t *testing.T) {
 
 	abc := `a.b.c:{"foo":[1,2,3,4]}`
 	def := `d.e.f:{"bar":{"baz":null}}`
 	abcEncoded := url.QueryEscape(abc)
 	defEncoded := url.QueryEscape(def)
 
-	uri, err := url.ParseRequestURI(fmt.Sprintf(`http://localhost:8181/v1/data/foo/bar?global=%v&pretty=true&global=%v`, abcEncoded, defEncoded))
+	uri, err := url.ParseRequestURI(fmt.Sprintf(`http://localhost:8181/v1/data/foo/bar?request=%v&pretty=true&request=%v`, abcEncoded, defEncoded))
 	if err != nil {
 		panic(err)
 	}
 
-	result := getGlobals(uri)
+	result := getRequestParam(uri)
 	expected := []string{abc, def}
 
 	if !reflect.DeepEqual(result, expected) {

diff --git a/server/server.go b/server/server.go
@@ -274,6 +274,12 @@ type patchImpl struct {
 	value interface{}
 }
 
+const (
+	// ParamRequestV1 defines the name of the HTTP URL parameter that specifies
+	// values for the "request" document.
+	ParamRequestV1 = "request"
+)
+
 // Server represents an instance of OPA running in server mode.
 type Server struct {
 	Handler http.Handler
@@ -462,7 +468,7 @@ func (s *Server) v1DataGet(w http.ResponseWriter, r *http.Request) {
 	path := stringPathToDataRef(vars["path"])
 	pretty := getPretty(r.URL.Query()["pretty"])
 	explainMode := getExplain(r.URL.Query()["explain"])
-	request, nonGround, err := parseRequest(r.URL.Query()["request"])
+	request, nonGround, err := parseRequest(r.URL.Query()[ParamRequestV1])
 
 	if err != nil {
 		handleError(w, 400, err)