remove the sender options from context

Signed-off-by: myan <[email protected]>
cloudevents · Jul 28, 2023 · d3ae386 · d3ae386
1 parent 188a389
commit d3ae386
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 36 deletions.
diff --git a/protocol/mqtt_paho/v2/context.go b/protocol/mqtt_paho/v2/context.go
diff --git a/protocol/mqtt_paho/v2/protocol.go b/protocol/mqtt_paho/v2/protocol.go
@@ -73,11 +73,6 @@ func (t *Protocol) Send(ctx context.Context, m binding.Message, transformers ...
 		cecontext.WithTopic(ctx, "")
 	}
 
-	if PublishOptionFrom(ctx) != nil {
-		msg = PublishOptionFrom(ctx)
-		ctx = WithPublishOption(ctx, nil)
-	}
-
 	err = WritePubMessage(ctx, m, msg, transformers...)
 	if err != nil {
 		return err

diff --git a/samples/mqtt/sender/main.go b/samples/mqtt/sender/main.go
@@ -16,6 +16,7 @@ import (
 	"github.com/google/uuid"
 
 	mqtt_paho "github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2"
+	cecontext "github.com/cloudevents/sdk-go/v2/context"
 )
 
 const (
@@ -63,7 +64,7 @@ func main() {
 			log.Printf("failed to set data: %v", err)
 		}
 		if result := c.Send(
-			mqtt_paho.WithPublishOption(ctx, &paho.Publish{Topic: "test-topic", QoS: 0, Retain: false}),
+			cecontext.WithTopic(ctx, "test-topic"),
 			e,
 		); cloudevents.IsUndelivered(result) {
 			log.Printf("failed to send: %v", result)

diff --git a/test/integration/mqtt_paho/mqtt_test.go b/test/integration/mqtt_paho/mqtt_test.go
@@ -17,6 +17,7 @@ import (
 
 	mqtt_paho "github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2"
 	cloudevents "github.com/cloudevents/sdk-go/v2"
+	cecontext "github.com/cloudevents/sdk-go/v2/context"
 	"github.com/cloudevents/sdk-go/v2/event"
 	"github.com/cloudevents/sdk-go/v2/test"
 )
@@ -68,7 +69,7 @@ func TestSendEvent(t *testing.T) {
 				return
 			case <-timer.C:
 				result := client.Send(
-					mqtt_paho.WithPublishOption(ctx, &paho.Publish{Topic: topicName, QoS: 0, Retain: false}),
+					cecontext.WithTopic(ctx, topicName),
 					inEvent,
 				)
 				require.NoError(t, result)