Hotfix for MessageWrapper (#449)

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>
cloudevents · Apr 8, 2020 · 3638af8 · 3638af8
1 parent 4a880eb
commit 3638af8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/v2/binding/buffering/acks_before_finish_message.go b/v2/binding/buffering/acks_before_finish_message.go
@@ -13,11 +13,11 @@ type acksMessage struct {
 }
 
 func (m *acksMessage) GetAttribute(k spec.Kind) (spec.Attribute, interface{}) {
-	return binding.MessageMetadataReader(m).GetAttribute(k)
+	return m.Message.(binding.MessageMetadataReader).GetAttribute(k)
 }
 
 func (m *acksMessage) GetExtension(s string) interface{} {
-	return binding.MessageMetadataReader(m).GetExtension(s)
+	return m.Message.(binding.MessageMetadataReader).GetExtension(s)
 }
 
 func (m *acksMessage) GetWrappedMessage() binding.Message {

diff --git a/v2/binding/buffering/acks_before_finish_message_test.go b/v2/binding/buffering/acks_before_finish_message_test.go
@@ -9,6 +9,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/cloudevents/sdk-go/v2/binding"
+	"github.com/cloudevents/sdk-go/v2/binding/spec"
+	"github.com/cloudevents/sdk-go/v2/binding/test"
 	"github.com/cloudevents/sdk-go/v2/event"
 	"github.com/cloudevents/sdk-go/v2/types"
 )
@@ -77,3 +79,12 @@ func TestCopyAndWithAcksBeforeFinish(t *testing.T) {
 	wg.Wait()
 	require.True(t, finishCalled)
 }
+
+func TestMessageMetadataHandler(t *testing.T) {
+	var testEvent = test.FullEvent()
+	finishMessage := WithAcksBeforeFinish((*binding.EventMessage)(&testEvent), 3)
+
+	_, ty := finishMessage.(binding.MessageMetadataReader).GetAttribute(spec.Type)
+	require.Equal(t, testEvent.Type(), ty)
+	require.Equal(t, testEvent.Extensions()["exstring"], finishMessage.(binding.MessageMetadataReader).GetExtension("exstring"))
+}
diff --git a/v2/binding/finish_message.go b/v2/binding/finish_message.go
@@ -8,11 +8,11 @@ type finishMessage struct {
 }
 
 func (m *finishMessage) GetAttribute(k spec.Kind) (spec.Attribute, interface{}) {
-	return MessageMetadataReader(m).GetAttribute(k)
+	return m.Message.(MessageMetadataReader).GetAttribute(k)
 }
 
 func (m *finishMessage) GetExtension(s string) interface{} {
-	return MessageMetadataReader(m).GetExtension(s)
+	return m.Message.(MessageMetadataReader).GetExtension(s)
 }
 
 func (m *finishMessage) GetWrappedMessage() Message {

diff --git a/v2/binding/finish_message_test.go b/v2/binding/finish_message_test.go
@@ -5,8 +5,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/cloudevents/sdk-go/v2/binding"
+	"github.com/cloudevents/sdk-go/v2/binding/spec"
+	"github.com/cloudevents/sdk-go/v2/binding/test"
 	"github.com/cloudevents/sdk-go/v2/event"
 	"github.com/cloudevents/sdk-go/v2/types"
 )
@@ -33,3 +36,12 @@ func TestWithFinish(t *testing.T) {
 	assert.NoError(t, m.Finish(nil))
 	assert.NoError(t, <-done)
 }
+
+func TestMessageMetadataHandler(t *testing.T) {
+	var testEvent = test.FullEvent()
+	finishMessage := binding.WithFinish((*binding.EventMessage)(&testEvent), func(err error) {})
+
+	_, ty := finishMessage.(binding.MessageMetadataReader).GetAttribute(spec.Type)
+	require.Equal(t, testEvent.Type(), ty)
+	require.Equal(t, testEvent.Extensions()["exstring"], finishMessage.(binding.MessageMetadataReader).GetExtension("exstring"))
+}