fix issue gojek#79: add /v6 module import suffix

upnrunnHQ · May 15, 2020 · a006dd7 · a006dd7
1 parent 1aedfb0
commit a006dd7
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 16 deletions.
diff --git a/examples/client.go b/examples/client.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gojektech/heimdall"
-	"github.com/gojektech/heimdall/httpclient"
-	"github.com/gojektech/heimdall/hystrix"
+	"github.com/gojektech/heimdall/v6"
+	"github.com/gojektech/heimdall/v6/httpclient"
+	"github.com/gojektech/heimdall/v6/hystrix"
 	"github.com/pkg/errors"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,6 @@
-module github.com/gojektech/heimdall
+module github.com/gojektech/heimdall/v6
+
+go 1.11
 
 require (
 	github.com/afex/hystrix-go v0.0.0-20180209013831-27fae8d30f1a

diff --git a/httpclient/client.go b/httpclient/client.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
 	"github.com/gojektech/valkyrie"
 	"github.com/pkg/errors"
 )

diff --git a/httpclient/client_test.go b/httpclient/client_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

diff --git a/httpclient/options.go b/httpclient/options.go
@@ -3,7 +3,7 @@ package httpclient
 import (
 	"time"
 
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
 )
 
 // Option represents the client options

diff --git a/httpclient/options_test.go b/httpclient/options_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/hystrix/hystrix_client.go b/hystrix/hystrix_client.go
@@ -2,14 +2,14 @@ package hystrix
 
 import (
 	"bytes"
-	"github.com/gojektech/heimdall/httpclient"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"time"
 
 	"github.com/afex/hystrix-go/hystrix"
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
+	"github.com/gojektech/heimdall/v6/httpclient"
 	"github.com/pkg/errors"
 )
 

diff --git a/hystrix/hystrix_client_test.go b/hystrix/hystrix_client_test.go
@@ -5,12 +5,11 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 	"time"
 
-	"strings"
-
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/hystrix/options.go b/hystrix/options.go
@@ -1,10 +1,10 @@
 package hystrix
 
 import (
-	"github.com/gojektech/heimdall/httpclient"
 	"time"
 
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
+	"github.com/gojektech/heimdall/v6/httpclient"
 )
 
 // Option represents the hystrix client options

diff --git a/plugins/request_logger.go b/plugins/request_logger.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/gojektech/heimdall"
+	"github.com/gojektech/heimdall/v6"
 )
 
 type ctxKey string
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ import ( @@
     	"os"
     	"time"
-    	"github.com/gojektech/heimdall"
+    	"github.com/gojektech/heimdall/v6"
     )
     type ctxKey string
@@ Expand Down @@