refactor: migrate to /v2 path

pact-foundation · Jun 7, 2021 · 56c9e0a · 56c9e0a
1 parent c2b16eb
commit 56c9e0a
Show file tree

Hide file tree

Showing 1,671 changed files with 422,537 additions and 175,358 deletions.
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -16,9 +16,7 @@ TBC
 
 ## Steps to reproduce
 
-Provide a repository, gist or reproducable code snippet so that we can test the problem.
-
-Consider forking the project and modifying the [E2E test](https://github.com/pact-foundation/pact-go/blob/master/dsl/pact_integration_test.go)
+Provide a repository, gist or reproducable code snippet so that we can test the problem. You may also want to adapt one of the examples in the repository to demonstrate the problem.
 
 ## Relevent log files
 

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/Makefile b/Makefile
@@ -18,12 +18,13 @@ clean:
 
 deps:
 	@echo "--- 🐿  Fetching build dependencies "
-	go get github.com/axw/gocov/gocov
-	go get github.com/mattn/goveralls
-	go get golang.org/x/tools/cmd/cover
-	go get github.com/modocache/gover
-	go get github.com/mitchellh/gox
-	go get -a
+	cd /tmp; \
+	go get github.com/axw/gocov/gocov; \
+	go get github.com/mattn/goveralls; \
+	go get golang.org/x/tools/cmd/cover; \
+	go get github.com/modocache/gover; \
+	go get github.com/mitchellh/gox; \
+	cd -
 
 goveralls:
 	goveralls -service="travis-ci" -coverprofile=coverage.txt -repotoken $(COVERALLS_TOKEN)
@@ -41,8 +42,8 @@ install: bin
 pact: clean install #docker
 	@echo "--- 🔨 Running Pact examples"
 	mkdir -p ./examples/v3/pacts
-	go test -v -tags=consumer -count=1 github.com/pact-foundation/pact-go/examples/...
-	go test -v -timeout=10s -tags=provider -count=1 github.com/pact-foundation/pact-go/examples/...
+	go test -v -tags=consumer -count=1 github.com/pact-foundation/pact-go/v2/examples/...
+	go test -v -timeout=10s -tags=provider -count=1 github.com/pact-foundation/pact-go/v2/examples/...
 
 release:
 	echo "--- 🚀 Releasing it"

diff --git a/command/install.go b/command/install.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/pact-foundation/pact-go/installer"
+	"github.com/pact-foundation/pact-go/v2/installer"
 
 	"github.com/spf13/cobra"
 )

diff --git a/consumer/http.go b/consumer/http.go
@@ -17,10 +17,10 @@ import (
 	"path/filepath"
 	"time"
 
-	native "github.com/pact-foundation/pact-go/internal/native/mockserver"
-	logging "github.com/pact-foundation/pact-go/log"
-	"github.com/pact-foundation/pact-go/models"
-	"github.com/pact-foundation/pact-go/utils"
+	native "github.com/pact-foundation/pact-go/v2/internal/native/mockserver"
+	logging "github.com/pact-foundation/pact-go/v2/log"
+	"github.com/pact-foundation/pact-go/v2/models"
+	"github.com/pact-foundation/pact-go/v2/utils"
 )
 
 func init() {

diff --git a/consumer/http_v2.go b/consumer/http_v2.go
@@ -3,7 +3,7 @@ package consumer
 import (
 	"log"
 
-	"github.com/pact-foundation/pact-go/models"
+	"github.com/pact-foundation/pact-go/v2/models"
 )
 
 // HTTPMockProviderV2 is the entrypoint for V3 http consumer tests

diff --git a/consumer/http_v3.go b/consumer/http_v3.go
@@ -3,7 +3,7 @@ package consumer
 import (
 	"log"
 
-	"github.com/pact-foundation/pact-go/models"
+	"github.com/pact-foundation/pact-go/v2/models"
 )
 
 // HTTPMockProviderV3 is the entrypoint for V3 http consumer tests

diff --git a/consumer/interaction.go b/consumer/interaction.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"strings"
 
-	"github.com/pact-foundation/pact-go/internal/native/mockserver"
-	"github.com/pact-foundation/pact-go/matchers"
-	"github.com/pact-foundation/pact-go/models"
-	"github.com/pact-foundation/pact-go/utils"
+	"github.com/pact-foundation/pact-go/v2/internal/native/mockserver"
+	"github.com/pact-foundation/pact-go/v2/matchers"
+	"github.com/pact-foundation/pact-go/v2/models"
+	"github.com/pact-foundation/pact-go/v2/utils"
 )
 
 // Interaction is the main implementation of the Pact interface.

diff --git a/consumer/interaction_test.go b/consumer/interaction_test.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/pact-foundation/pact-go/matchers"
-	"github.com/pact-foundation/pact-go/models"
+	"github.com/pact-foundation/pact-go/v2/matchers"
+	"github.com/pact-foundation/pact-go/v2/models"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/consumer/interaction_v3.go b/consumer/interaction_v3.go
@@ -1,6 +1,6 @@
 package consumer
 
-import "github.com/pact-foundation/pact-go/models"
+import "github.com/pact-foundation/pact-go/v2/models"
 
 // InteractionV3 sets up an expected request/response on a mock server
 // and is replayed on the provider side for verification

diff --git a/doc.go b/doc.go
@@ -93,7 +93,7 @@ This example will result in a response body from the mock server that looks like
   }
 
 See the examples in the dsl package and the matcher tests
-(https://github.com/pact-foundation/pact-go/blob/master/dsl/matcher_test.go)
+(https://github.com/pact-foundation/pact-go/v2/blob/master/dsl/matcher_test.go)
 for more matching examples.
 
 NOTE: You will need to use valid Ruby regular expressions

diff --git a/examples/consumer_test.go b/examples/consumer_test.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"testing"
 
-	v3 "github.com/pact-foundation/pact-go/consumer"
-	. "github.com/pact-foundation/pact-go/sugar"
+	v3 "github.com/pact-foundation/pact-go/v2/consumer"
+	. "github.com/pact-foundation/pact-go/v2/sugar"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/examples/customTls/certs/ca.key b/examples/customTls/certs/ca.key
diff --git a/examples/customTls/certs/ca.pem b/examples/customTls/certs/ca.pem
diff --git a/examples/customTls/certs/server-cert.pem b/examples/customTls/certs/server-cert.pem
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"log"
     	"os"
-    	"github.com/pact-foundation/pact-go/installer"
+    	"github.com/pact-foundation/pact-go/v2/installer"
     	"github.com/spf13/cobra"
     )
@@ Expand Down @@