Upgrading to CloudEvents 1.0

pkg/adapter/apiserver/events/events.go

@@ -106,7 +106,7 @@ func makeEvent(source, eventType string, obj *unstructured.Unstructured, data in
 		Namespace:  obj.GetNamespace(),
 	})
 
-	event := cloudevents.NewEvent(cloudevents.VersionV03)
+	event := cloudevents.NewEvent(cloudevents.VersionV1)
 	event.SetType(eventType)
 	event.SetSource(source)
 	event.SetSubject(subject)

pkg/adapter/apiserver/events/events_test.go

@@ -91,7 +91,7 @@ func TestMakeAddEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/unit",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`,
 		},
@@ -129,7 +129,7 @@ func TestMakeUpdateEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/unit",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`,
 		},
@@ -167,7 +167,7 @@ func TestMakeDeleteEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/unit",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"apiVersion":"v1","kind":"Pod","metadata":{"name":"unit","namespace":"test"}}`,
 		},
@@ -206,7 +206,7 @@ func TestMakeAddRefEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/unit",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`,
 		},
@@ -222,7 +222,7 @@ func TestMakeAddRefEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/owned",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"kind":"ReplicaSet","namespace":"test","name":"unit","apiVersion":"apps/v1"}`,
 		},
@@ -261,7 +261,7 @@ func TestMakeUpdateRefEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/unit",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`,
 		},
@@ -277,7 +277,7 @@ func TestMakeUpdateRefEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/owned",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"kind":"ReplicaSet","namespace":"test","name":"unit","apiVersion":"apps/v1"}`,
 		},
@@ -316,7 +316,7 @@ func TestMakeDeleteRefEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/unit",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"kind":"Pod","namespace":"test","name":"unit","apiVersion":"v1"}`,
 		},
@@ -332,7 +332,7 @@ func TestMakeDeleteRefEvent(t *testing.T) {
 					Extensions: map[string]interface{}{
 						"subject": "/apis/v1/namespaces/test/pods/owned",
 					},
-				}.AsV03(),
+				}.AsV1(),
 			},
 			wantData: `{"kind":"ReplicaSet","namespace":"test","name":"unit","apiVersion":"apps/v1"}`,
 		},

pkg/adapter/cronjobevents/adapter.go

@@ -101,7 +101,7 @@ func (a *cronJobAdapter) Start(stopCh <-chan struct{}) error {
 func (a *cronJobAdapter) cronTick() {
 	logger := logging.FromContext(context.TODO())
 
-	event := cloudevents.NewEvent(cloudevents.VersionV03)
+	event := cloudevents.NewEvent(cloudevents.VersionV1)
 	event.SetType(sourcesv1alpha1.CronJobEventType)
 	event.SetSource(sourcesv1alpha1.CronJobEventSource(a.Namespace, a.Name))
 	event.SetData(message(a.Data))

pkg/broker/filter/filter_handler.go

@@ -171,7 +171,7 @@ func (r *Handler) serveHTTP(ctx context.Context, event cloudevents.Event, resp *
 	}
 
 	// Remove the TTL attribute that is used by the Broker.
-	originalV3 := event.Context.AsV03()
+	originalV1 := event.Context.AsV1()
 	ttl, ttlKey := broker.GetTTL(event.Context)
 	if ttl == nil {
 		// Only messages sent by the Broker should be here. If the attribute isn't here, then the
@@ -182,8 +182,8 @@ func (r *Handler) serveHTTP(ctx context.Context, event cloudevents.Event, resp *
 		// framework returns a 500 to the caller, so the Channel would send this repeatedly.
 		return nil
 	}
-	delete(originalV3.Extensions, ttlKey)
-	event.Context = originalV3
+	delete(originalV1.Extensions, ttlKey)
+	event.Context = originalV1
 
 	r.logger.Debug("Received message", zap.Any("triggerRef", triggerRef))
 

pkg/broker/filter/filter_handler_test.go

@@ -379,7 +379,7 @@ func TestReceiver(t *testing.T) {
 
 			// The TTL will be added again.
 			expectedResponseEvent := addTTLToEvent(*tc.returnedEvent)
-			if diff := cmp.Diff(expectedResponseEvent.Context.AsV03(), resp.Event.Context.AsV03()); diff != "" {
+			if diff := cmp.Diff(expectedResponseEvent.Context.AsV1(), resp.Event.Context.AsV1()); diff != "" {
 				t.Errorf("Incorrect response event context (-want +got): %s", diff)
 			}
 			if diff := cmp.Diff(expectedResponseEvent.Data, resp.Event.Data); diff != "" {
@@ -422,7 +422,7 @@ func (h *fakeHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	h.requestReceived = true
 
 	for n, v := range h.headers {
-		if strings.Contains(strings.ToLower(n), strings.ToLower(broker.V03TTLAttribute)) {
+		if strings.Contains(strings.ToLower(n), strings.ToLower(broker.V1TTLAttribute)) {
 			h.t.Errorf("Broker TTL should not be seen by the subscriber: %s", n)
 		}
 		if diff := cmp.Diff(v, req.Header[n]); diff != "" {
@@ -439,7 +439,7 @@ func (h *fakeHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	c := &cehttp.CodecV03{}
+	c := &cehttp.CodecV1{}
 	m, err := c.Encode(context.Background(), *h.returnedEvent)
 	if err != nil {
 		h.t.Fatalf("Could not encode message: %v", err)
@@ -555,7 +555,7 @@ func makeEventWithoutTTL() *cloudevents.Event {
 				},
 			},
 			ContentType: cloudevents.StringOfApplicationJSON(),
-		}.AsV03(),
+		}.AsV1(),
 	}
 }
 
@@ -580,7 +580,7 @@ func makeDifferentEvent() *cloudevents.Event {
 				},
 			},
 			ContentType: cloudevents.StringOfApplicationJSON(),
-		}.AsV03(),
+		}.AsV1(),
 	}
 }
 
@@ -597,7 +597,7 @@ func makeEventWithExtension(extName, extValue string) *cloudevents.Event {
 			Extensions: map[string]interface{}{
 				extName: extValue,
 			},
-		}.AsV03(),
+		}.AsV1(),
 	}
 	e := addTTLToEvent(*noTTL)
 	return &e

pkg/broker/ingress/ingress_handler_test.go

@@ -84,7 +84,7 @@ func TestIngressHandler_ServeHTTP_FAIL(t *testing.T) {
 				Namespace:  namespace,
 				Reporter:   reporter,
 			}
-			event := cloudevents.NewEvent()
+			event := cloudevents.NewEvent(cloudevents.VersionV1)
 			resp := new(cloudevents.EventResponse)
 			tctx := http.TransportContext{Header: nethttp.Header{}, Method: tc.httpmethod, URI: tc.URI}
 			ctx := http.WithTransportContext(context.Background(), tctx)
@@ -117,7 +117,7 @@ func TestIngressHandler_ServeHTTP_Succeed(t *testing.T) {
 		Namespace:  namespace,
 		Reporter:   reporter,
 	}
-	event := cloudevents.NewEvent()
+	event := cloudevents.NewEvent(cloudevents.VersionV1)
 	resp := new(cloudevents.EventResponse)
 	tctx := http.TransportContext{Header: nethttp.Header{}, Method: validHTTPMethod, URI: validURI}
 	ctx := http.WithTransportContext(context.Background(), tctx)

pkg/broker/ttl.go

@@ -23,26 +23,26 @@ import (
 )
 
 const (
-	// V03TTLAttribute is the name of the CloudEvents 0.3 extension attribute used to store the
+	// V1TTLAttribute is the name of the CloudEvents 1.0 extension attribute used to store the
 	// Broker's TTL (number of times a single event can reply through a Broker continuously). All
 	// interactions with the attribute should be done through the GetTTL and SetTTL functions.
-	V03TTLAttribute = "knativebrokerttl"
+	V1TTLAttribute = "knativebrokerttl"
 )
 
 // GetTTL finds the TTL in the EventContext using a case insensitive comparison
 // for the key. The second return param, is the case preserved key that matched.
 // Depending on the encoding/transport, the extension case could be changed.
 func GetTTL(ctx cloudevents.EventContext) (interface{}, string) {
-	for k, v := range ctx.AsV03().Extensions {
-		if lower := strings.ToLower(k); lower == V03TTLAttribute {
+	for k, v := range ctx.AsV1().Extensions {
+		if lower := strings.ToLower(k); lower == V1TTLAttribute {
 			return v, k
 		}
 	}
-	return nil, V03TTLAttribute
+	return nil, V1TTLAttribute
 }
 
 // SetTTL sets the TTL into the EventContext. ttl should be a positive integer.
 func SetTTL(ctx cloudevents.EventContext, ttl interface{}) (cloudevents.EventContext, error) {
-	err := ctx.SetExtension(V03TTLAttribute, ttl)
+	err := ctx.SetExtension(V1TTLAttribute, ttl)
 	return ctx, err
 }