Add modules support and bump version up to 3.0.0. (#292)

* Add modules support and bump version up to 3.0.0.

README.md

@@ -14,9 +14,17 @@ Martian is a great tool to use if you want to:
 By taking advantage of Go cross-compilation, Martian can be deployed
 anywhere that Go can target.
 
+## Latest Version
+
+v3.0.0
+
 ## Requirements
 
-Go 1.9
+Go 1.11
+
+## Go Modules Support
+
+Martian Proxy added support for Go modules since v3.0.0.  If you use a Go version that does not support modules, this will break you.  The latest version without Go modules support was tagged v2.1.0.
 
 ## Getting Started
 

api/forwarder.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/google/martian"
-	"github.com/google/martian/log"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/log"
 )
 
 // Forwarder is a request modifier that routes the request to the API server and

api/forwarder_test.go

@@ -18,7 +18,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/google/martian"
+	"github.com/google/martian/v3"
 )
 
 func TestApiForwarder(t *testing.T) {

auth/auth_filter.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/google/martian"
+	"github.com/google/martian/v3"
 )
 
 // Filter filters RequestModifiers and ResponseModifiers by auth ID.

auth/auth_filter_test.go

@@ -18,9 +18,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/google/martian"
-	"github.com/google/martian/martiantest"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/martiantest"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 func TestFilter(t *testing.T) {

auth/context.go

@@ -17,7 +17,7 @@ package auth
 import (
 	"sync"
 
-	"github.com/google/martian"
+	"github.com/google/martian/v3"
 )
 
 const key = "auth.Context"

body/body_modifier.go

@@ -28,8 +28,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/martian/log"
-	"github.com/google/martian/parse"
+	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/parse"
 )
 
 func init() {

body/body_modifier_test.go

@@ -25,9 +25,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/martian/messageview"
-	"github.com/google/martian/parse"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3/messageview"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 func TestBodyModifier(t *testing.T) {

cmd/marbl/viewer.go

@@ -30,7 +30,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/google/martian/marbl"
+	"github.com/google/martian/v3/marbl"
 )
 
 var (

cmd/proxy/main.go

@@ -205,33 +205,33 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/martian"
-	mapi "github.com/google/martian/api"
-	"github.com/google/martian/cors"
-	"github.com/google/martian/fifo"
-	"github.com/google/martian/har"
-	"github.com/google/martian/httpspec"
-	"github.com/google/martian/marbl"
-	"github.com/google/martian/martianhttp"
-	"github.com/google/martian/martianlog"
-	"github.com/google/martian/mitm"
-	"github.com/google/martian/servemux"
-	"github.com/google/martian/trafficshape"
-	"github.com/google/martian/verify"
-
-	_ "github.com/google/martian/body"
-	_ "github.com/google/martian/cookie"
-	_ "github.com/google/martian/failure"
-	_ "github.com/google/martian/martianurl"
-	_ "github.com/google/martian/method"
-	_ "github.com/google/martian/pingback"
-	_ "github.com/google/martian/port"
-	_ "github.com/google/martian/priority"
-	_ "github.com/google/martian/querystring"
-	_ "github.com/google/martian/skip"
-	_ "github.com/google/martian/stash"
-	_ "github.com/google/martian/static"
-	_ "github.com/google/martian/status"
+	"github.com/google/martian/v3"
+	mapi "github.com/google/martian/v3/api"
+	"github.com/google/martian/v3/cors"
+	"github.com/google/martian/v3/fifo"
+	"github.com/google/martian/v3/har"
+	"github.com/google/martian/v3/httpspec"
+	"github.com/google/martian/v3/marbl"
+	"github.com/google/martian/v3/martianhttp"
+	"github.com/google/martian/v3/martianlog"
+	"github.com/google/martian/v3/mitm"
+	"github.com/google/martian/v3/servemux"
+	"github.com/google/martian/v3/trafficshape"
+	"github.com/google/martian/v3/verify"
+
+	_ "github.com/google/martian/v3/body"
+	_ "github.com/google/martian/v3/cookie"
+	_ "github.com/google/martian/v3/failure"
+	_ "github.com/google/martian/v3/martianurl"
+	_ "github.com/google/martian/v3/method"
+	_ "github.com/google/martian/v3/pingback"
+	_ "github.com/google/martian/v3/port"
+	_ "github.com/google/martian/v3/priority"
+	_ "github.com/google/martian/v3/querystring"
+	_ "github.com/google/martian/v3/skip"
+	_ "github.com/google/martian/v3/stash"
+	_ "github.com/google/martian/v3/static"
+	_ "github.com/google/martian/v3/status"
 )
 
 var (

cmd/proxy/main_test.go

@@ -30,7 +30,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/martian/mitm"
+	"github.com/google/martian/v3/mitm"
 )
 
 func waitForProxy(t *testing.T, c *http.Client, apiURL string) {

cookie/cookie_filter.go

@@ -18,10 +18,10 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/google/martian"
-	"github.com/google/martian/filter"
-	"github.com/google/martian/log"
-	"github.com/google/martian/parse"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/filter"
+	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/parse"
 )
 
 var noop = martian.Noop("cookie.Filter")

cookie/cookie_filter_test.go

@@ -18,11 +18,11 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/google/martian/filter"
-	_ "github.com/google/martian/header"
-	"github.com/google/martian/martiantest"
-	"github.com/google/martian/parse"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3/filter"
+	_ "github.com/google/martian/v3/header"
+	"github.com/google/martian/v3/martiantest"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 func TestFilterFromJSON(t *testing.T) {

cookie/cookie_matcher.go

@@ -17,7 +17,7 @@ package cookie
 import (
 	"net/http"
 
-	"github.com/google/martian/log"
+	"github.com/google/martian/v3/log"
 )
 
 // Matcher is a conditonal evalutor of request or

cookie/cookie_modifier.go

@@ -20,9 +20,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/google/martian"
-	"github.com/google/martian/log"
-	"github.com/google/martian/parse"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/parse"
 )
 
 func init() {

cookie/cookie_modifier_test.go

@@ -18,8 +18,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/google/martian/parse"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 func TestCookieModifier(t *testing.T) {

failure/failure_verifier.go

@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/google/martian"
-	"github.com/google/martian/parse"
-	"github.com/google/martian/verify"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/verify"
 )
 
 func init() {

failure/failure_verifier_test.go

@@ -18,9 +18,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/google/martian"
-	"github.com/google/martian/parse"
-	"github.com/google/martian/verify"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/verify"
 )
 
 func TestVerifyRequestFails(t *testing.T) {

fifo/fifo_group.go

@@ -25,10 +25,10 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/google/martian"
-	"github.com/google/martian/log"
-	"github.com/google/martian/parse"
-	"github.com/google/martian/verify"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/verify"
 )
 
 // Group is a martian.RequestResponseModifier that maintains lists of

fifo/fifo_group_test.go

@@ -21,13 +21,13 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/google/martian"
-	"github.com/google/martian/martiantest"
-	"github.com/google/martian/parse"
-	"github.com/google/martian/proxyutil"
-	"github.com/google/martian/verify"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/martiantest"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/proxyutil"
+	"github.com/google/martian/v3/verify"
 
-	_ "github.com/google/martian/header"
+	_ "github.com/google/martian/v3/header"
 )
 
 func TestGroupFromJSON(t *testing.T) {

filter/filter.go

@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/google/martian"
-	"github.com/google/martian/log"
-	"github.com/google/martian/verify"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/verify"
 )
 
 var noop = martian.Noop("Filter")

filter/filter_test.go

@@ -19,9 +19,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/google/martian/martiantest"
-	"github.com/google/martian/proxyutil"
-	"github.com/google/martian/verify"
+	"github.com/google/martian/v3/martiantest"
+	"github.com/google/martian/v3/proxyutil"
+	"github.com/google/martian/v3/verify"
 )
 
 func TestRequestWhenTrueCondition(t *testing.T) {

go.mod

@@ -0,0 +1,5 @@
+module github.com/google/martian/v3
+
+go 1.11
+
+require golang.org/x/net v0.0.0-20190628185345-da137c7871d7

go.sum

@@ -0,0 +1,5 @@
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

har/har.go

@@ -33,10 +33,10 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/google/martian"
-	"github.com/google/martian/log"
-	"github.com/google/martian/messageview"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/messageview"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 // Logger maintains request and response log entries.

har/har_handlers.go

@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/google/martian/log"
+	"github.com/google/martian/v3/log"
 )
 
 type exportHandler struct {

har/har_handlers_test.go

@@ -20,8 +20,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/google/martian"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 func TestExportHandlerServeHTTP(t *testing.T) {

har/har_test.go

@@ -24,8 +24,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/martian"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 func TestModifyRequest(t *testing.T) {

header/copy_modifier.go

@@ -18,10 +18,10 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/google/martian"
-	"github.com/google/martian/log"
-	"github.com/google/martian/parse"
-	"github.com/google/martian/proxyutil"
+	"github.com/google/martian/v3"
+	"github.com/google/martian/v3/log"
+	"github.com/google/martian/v3/parse"
+	"github.com/google/martian/v3/proxyutil"
 )
 
 func init() {