From 3673e23532dccb38196f600eec7e8b7090ecfb12 Mon Sep 17 00:00:00 2001
From: Scott Nichols <32305648+n3wscott@users.noreply.github.com>
Date: Thu, 30 Jan 2020 09:50:52 -0800
Subject: [PATCH] Default to use CloudEvents v1.0 for encoding. (#297)

* Defaulting to V 1.0

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* fix unit tests

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

Co-authored-by: Matthias Wessendorf <mwessend@redhat.com>
---
 pkg/binding/example_using_test.go             |  6 ++---
 pkg/cloudevents/event.go                      |  2 +-
 pkg/cloudevents/event_reader_writer_test.go   | 27 +++++++++++++++----
 ...sion_v02_test.go => conversion_v1_test.go} | 10 +++----
 4 files changed, 31 insertions(+), 14 deletions(-)
 rename test/http/{conversion_v02_test.go => conversion_v1_test.go} (89%)

diff --git a/pkg/binding/example_using_test.go b/pkg/binding/example_using_test.go
index 90d028d8d..ef430f12b 100644
--- a/pkg/binding/example_using_test.go
+++ b/pkg/binding/example_using_test.go
@@ -99,7 +99,7 @@ func Example_using() {
 	// Output:
 	// Validation: valid
 	// Context Attributes,
-	//   specversion: 0.2
+	//   specversion: 1.0
 	//   type: example.com/event
 	//   source: example.com/source
 	//   id: 0
@@ -108,7 +108,7 @@ func Example_using() {
 	//
 	// Validation: valid
 	// Context Attributes,
-	//   specversion: 0.2
+	//   specversion: 1.0
 	//   type: example.com/event
 	//   source: example.com/source
 	//   id: 1
@@ -117,7 +117,7 @@ func Example_using() {
 	//
 	// Validation: valid
 	// Context Attributes,
-	//   specversion: 0.2
+	//   specversion: 1.0
 	//   type: example.com/event
 	//   source: example.com/source
 	//   id: 2
diff --git a/pkg/cloudevents/event.go b/pkg/cloudevents/event.go
index 35c1f9c79..8e0347693 100644
--- a/pkg/cloudevents/event.go
+++ b/pkg/cloudevents/event.go
@@ -17,7 +17,7 @@ type Event struct {
 }
 
 const (
-	defaultEventVersion = CloudEventsVersionV02
+	defaultEventVersion = CloudEventsVersionV1
 )
 
 func (e *Event) fieldError(field string, err error) {
diff --git a/pkg/cloudevents/event_reader_writer_test.go b/pkg/cloudevents/event_reader_writer_test.go
index 552f1ab50..1d0a80d57 100644
--- a/pkg/cloudevents/event_reader_writer_test.go
+++ b/pkg/cloudevents/event_reader_writer_test.go
@@ -21,21 +21,27 @@ func TestEventRW_SpecVersion(t *testing.T) {
 	testCases := map[string]ReadWriteTest{
 		"empty v01": {
 			event:   ce.New(),
-			want:    "0.2",
+			want:    "1.0",
 			set:     "0.1",
 			wantErr: "invalid version",
 		},
 		"empty v02": {
-			event: ce.New(),
-			want:  "0.2",
-			set:   "0.2",
+			event:   ce.New(),
+			want:    "1.0",
+			set:     "0.2",
+			wantErr: "invalid version",
 		},
 		"empty v03": {
 			event:   ce.New(),
-			want:    "0.2",
+			want:    "1.0",
 			set:     "0.3",
 			wantErr: "invalid version",
 		},
+		"empty v1": {
+			event: ce.New(),
+			set:   "1.0",
+			want:  "1.0",
+		},
 		"v01": {
 			event: ce.New("0.1"),
 			set:   "0.1",
@@ -51,6 +57,11 @@ func TestEventRW_SpecVersion(t *testing.T) {
 			set:   "0.3",
 			want:  "0.3",
 		},
+		"v1": {
+			event: ce.New("1.0"),
+			set:   "1.0",
+			want:  "1.0",
+		},
 		"invalid v01": {
 			event:   ce.New("0.1"),
 			want:    "0.1",
@@ -69,6 +80,12 @@ func TestEventRW_SpecVersion(t *testing.T) {
 			set:     "1.3",
 			wantErr: "invalid version",
 		},
+		"invalid v1": {
+			event:   ce.New("1.0"),
+			want:    "1.0",
+			set:     "1.3",
+			wantErr: "invalid version",
+		},
 	}
 	for n, tc := range testCases {
 		t.Run(n, func(t *testing.T) {
diff --git a/test/http/conversion_v02_test.go b/test/http/conversion_v1_test.go
similarity index 89%
rename from test/http/conversion_v02_test.go
rename to test/http/conversion_v1_test.go
index 89465680e..32f09c65c 100644
--- a/test/http/conversion_v02_test.go
+++ b/test/http/conversion_v1_test.go
@@ -8,20 +8,20 @@ import (
 	"github.com/cloudevents/sdk-go"
 )
 
-func TestClientConversion_v02(t *testing.T) {
+func TestClientConversion_v1(t *testing.T) {
 	now := time.Now()
 
 	testCases := ConversionTestCases{
-		"Conversion v0.2": {
+		"Conversion v1.0": {
 			now:       now,
 			convertFn: UnitTestConvert,
 			data:      map[string]string{"hello": "unittest"},
 			want: &cloudevents.Event{
-				Context: cloudevents.EventContextV02{
+				Context: cloudevents.EventContextV1{
 					ID:     "321-CBA",
 					Type:   "io.cloudevents.conversion.http.post",
-					Source: *cloudevents.ParseURLRef("github.com/cloudevents/test/http/conversion"),
-				}.AsV02(),
+					Source: *cloudevents.ParseURIRef("github.com/cloudevents/test/http/conversion"),
+				}.AsV1(),
 				Data: map[string]string{"hello": "unittest"},
 			},
 			asSent: &TapValidation{