use correct go mod semver (#395)

Signed-off-by: Scott Nichols <snichols@vmware.com>

.circleci/config.yml

@@ -35,16 +35,16 @@ jobs:
 
       - restore_cache:
           keys:
-            - gomod-cache-{{ checksum "go.sum" }}
+            - gomod-cache-{{ checksum "v2/go.sum" }}
       - run:
           name: "Check modules via go tidy"
-          command: go mod tidy && git diff --exit-code go.{mod,sum}
+          command: pushd v2; go mod tidy && git diff --exit-code go.{mod,sum}; popd
       - run:
           name: "Enforce Go Formatted Code"
-          command: "! GO111MODULE=off go fmt ./... 2>&1 | read" # Avoid any dependency resolution
+          command: "! GO111MODULE=off go fmt ./v2/... 2>&1 | read" # Avoid any dependency resolution
       - run:
           name: "Run go vet"
-          command: go vet ./...
+          command: pushd v2; go vet ./...; popd
       - run:
           name: Run unit tests
           command: |
@@ -55,7 +55,7 @@ jobs:
             TEST_AMQP_URL=amqp://localhost/test ./hack/integration-test.sh | tee ${TEST_RESULTS}/go-integration-test.out
 
       - save_cache:
-          key: gomod-cache-{{ checksum "go.sum" }}
+          key: gomod-cache-{{ checksum "v2/go.sum" }}
           paths:
             - "/go/pkg/mod"
 

hack/integration-test.sh

@@ -4,8 +4,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# v2 only
+pushd ./v2
+
 # Run integration tests not in parallel
 go test -v -parallel 1 ./test/... -coverprofile ${TEST_RESULTS:-.}/integration_test_cover.out -timeout 60s
 
 # Remove test only deps.
 go mod tidy
+
+popd

hack/unit-test.sh

@@ -4,8 +4,16 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# Test everything in pkg and cmd, except amqp
-go test -v ./pkg/... ./cmd/... -coverprofile ${TEST_RESULTS:-.}/unit_test_cover.out -timeout 15s
+# v1
+pushd ./v1
+go test -v ./... -coverprofile ${TEST_RESULTS:-.}/unit_test_cover.out -timeout 15s
+# Remove test only deps.
+go mod tidy
+popd
 
+# v2
+pushd ./v2
+go test -v ./... -coverprofile ${TEST_RESULTS:-.}/unit_test_cover.out -timeout 15s
 # Remove test only deps.
 go mod tidy
+popd

legacy/README.md → v1/README.md

@@ -1,4 +1,4 @@
-# NOTE: The Legacy directory will be removed for v2.0.0.
+# NOTE: The v1 directory will be removed for v2.0.0.
 
 We will make a final migration release that will match the v2.0.0 release with
 the addition of this legacy directory for migration support.

legacy/alias.go → v1/alias.go

@@ -1,15 +1,15 @@
-package cloudevents
+package v1
 
 // Package cloudevents alias' common functions and types to improve discoverability and reduce
 // the number of imports for simple HTTP clients.
 
 import (
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/client"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/context"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/observability"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport/http"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/client"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/context"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/observability"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport/http"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Client

legacy/pkg/binding/buffering/acks_before_finish_message.go → v1/binding/buffering/acks_before_finish_message.go

@@ -3,7 +3,7 @@ package buffering
 import (
 	"sync/atomic"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type acksMessage struct {

legacy/pkg/binding/buffering/acks_before_finish_message_test.go → v1/binding/buffering/acks_before_finish_message_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestWithAcksBeforeFinish(t *testing.T) {

legacy/pkg/binding/buffering/binary_buffer_message.go → v1/binding/buffering/binary_buffer_message.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/valyala/bytebufferpool"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 var binaryMessagePool bytebufferpool.Pool

legacy/pkg/binding/buffering/copy_message.go → v1/binding/buffering/copy_message.go

@@ -3,7 +3,7 @@ package buffering
 import (
 	"context"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 // BufferMessage does the same than CopyMessage and it also bounds the original Message

legacy/pkg/binding/buffering/copy_message_benchmark_test.go → v1/binding/buffering/copy_message_benchmark_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 var err error

legacy/pkg/binding/buffering/copy_message_test.go → v1/binding/buffering/copy_message_test.go

@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 type copyMessageTestCase struct {

legacy/pkg/binding/buffering/struct_buffer_message.go → v1/binding/buffering/struct_buffer_message.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/valyala/bytebufferpool"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
 )
 
 var structMessagePool bytebufferpool.Pool

legacy/pkg/binding/event_message.go → v1/binding/event_message.go

@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"context"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 // EventMessage type-converts a cloudevents.Event object to implement Message.

legacy/pkg/binding/example_implementing_test.go → v1/binding/example_implementing_test.go

@@ -7,9 +7,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport"
 )
 
 // ExMessage is a json.RawMessage, a byte slice containing a JSON encoded event.

legacy/pkg/binding/example_using_test.go → v1/binding/example_using_test.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/client"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/client"
 )
 
 const count = 3 // Example ends after this many events.

legacy/pkg/binding/finish_message_test.go → v1/binding/finish_message_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestWithFinish(t *testing.T) {

legacy/pkg/binding/format/format.go → v1/binding/format/format.go

@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"strings"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 // Format marshals and unmarshals structured events to bytes.

legacy/pkg/binding/format/format_test.go → v1/binding/format/format_test.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestJSON(t *testing.T) {

legacy/pkg/binding/interfaces.go → v1/binding/interfaces.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 // Encoding enum specifies the type of encodings supported by binding interfaces

legacy/pkg/binding/spec/attributes.go → v1/binding/spec/attributes.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Kind is a version-independent identifier for a CloudEvent context attribute.

legacy/pkg/binding/spec/attributes_test.go → v1/binding/spec/attributes_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 )

legacy/pkg/binding/spec/spec.go → v1/binding/spec/spec.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Version provides meta-data for a single spec-version.

legacy/pkg/binding/spec/spec_test.go → v1/binding/spec/spec_test.go

@@ -3,8 +3,8 @@ package spec_test
 import (
 	"testing"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/stretchr/testify/assert"
 )
 

legacy/pkg/binding/test/benchmark.go → v1/binding/test/benchmark.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 // Simple send/receive benchmark.

legacy/pkg/binding/test/events.go → v1/binding/test/events.go

@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func strptr(s string) *string { return &s }

legacy/pkg/binding/test/mock_binary_message.go → v1/binding/test/mock_binary_message.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 // MockBinaryMessage implements a binary-mode message as a simple struct.

legacy/pkg/binding/test/mock_structured_message.go → v1/binding/test/mock_structured_message.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
 )
 
 // MockStructuredMessage implements a structured-mode message as a simple struct.

legacy/pkg/binding/test/test.go → v1/binding/test/test.go

@@ -12,12 +12,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // NameOf generates a string test name from x, esp. for ce.Event and ce.Message.

legacy/pkg/binding/test/test_test.go → v1/binding/test/test_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 func TestEvent(t *testing.T) {

legacy/pkg/binding/test/transcoder.go → v1/binding/test/transcoder.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type TranscoderTestArgs struct {