examples correction

Signed-off-by: sadath-12 <[email protected]>

Author: sadath-12

examples/pubsub/README.md

@@ -18,6 +18,7 @@ This folder contains two Go files that use the Go SDK to invoke the Dapr Pub/Sub
 name: Run Subscriber Server
 output_match_mode: substring
 expected_stdout_lines:
+  - 'event - PubsubName: messages, Topic: newbulkorder'
   - 'event - PubsubName: messages, Topic: neworder'
 background: true
 sleep: 15
@@ -49,9 +50,6 @@ sleep: 15
 #### Note: pub/pub.go contains both PublishEvents (used for publish of messages) and PublishEvent (used for bulkPublish of messages) 
 
 ```bash
-export DAPR_PUBSUB_NAME=messages
-
-
 dapr run --app-id pub \
          --log-level debug \
          --resources-path ./config \
@@ -80,6 +78,6 @@ dapr stop --app-id sub
 
 ```shell
 == APP == 2023/03/29 21:36:07 event - PubsubName: messages, Topic: neworder, ID: 82427280-1c18-4fab-b901-c7e68d295d31, Data: ping
-== APP == 2023/03/29 21:36:07 event - PubsubName: messages, Topic: neworder, ID: cc13829c-af77-4303-a4d7-55cdc0b0fa7d, Data: multi-pong
-== APP == 2023/03/29 21:36:07 event - PubsubName: messages, Topic: neworder, ID: 0147f10a-d6c3-4b16-ad5a-6776956757dd, Data: multi-ping
+== APP == 2023/03/29 21:36:07 event - PubsubName: messages, Topic: newbulkorder, ID: cc13829c-af77-4303-a4d7-55cdc0b0fa7d, Data: multi-pong
+== APP == 2023/03/29 21:36:07 event - PubsubName: messages, Topic: newbulkorder, ID: 0147f10a-d6c3-4b16-ad5a-6776956757dd, Data: multi-ping
 ```

examples/pubsub/pub/pub.go

@@ -16,16 +16,16 @@ package main
 import (
 	"context"
 	"fmt"
-	"os"
 
 	dapr "github.com/dapr/go-sdk/client"
 )
 
 var (
 	// set the environment as instructions.
-	pubsubName    = os.Getenv("DAPR_PUBSUB_NAME")
-	topicName     = "neworder"
-	bulkTopicName = "newbulkorder"
+	pubsubName     = "messages"
+	bulkpubsubName = "bulkmessages"
+	topicName      = "neworder"
+	bulkTopicName  = "newbulkorder"
 )
 
 func main() {

examples/pubsub/sub/sub.go

@@ -36,31 +36,22 @@ var defaultSubscription = &common.Subscription{
 }
 
 var bulkSubscription = &common.Subscription{
-	PubsubName: "bulkmessages",
+	PubsubName: "messages",
 	Topic:      "newbulkorder",
 	Route:      "/bulkorders",
 }
 
-var importantSubscription = &common.Subscription{
-	PubsubName: "messages",
-	Topic:      "neworder",
-	Route:      "/important",
-	Match:      `event.type == "important"`,
-	Priority:   1,
-}
-
 func main() {
 	s := daprd.NewService(":8080")
 
-	// use this for bulk subscription
-	// if err := s.AddBulkTopicEventHandler(defaultSubscription, eventHandler, 10, 100); err != nil {
-	// 	log.Fatalf("error adding topic subscription: %v", err)
-	// }
-
 	if err := s.AddTopicEventHandler(defaultSubscription, eventHandler); err != nil {
 		log.Fatalf("error adding topic subscription: %v", err)
 	}
 
+	if err := s.AddBulkTopicEventHandler(bulkSubscription, eventHandler, 10, 100); err != nil {
+		log.Fatalf("error adding topic subscription: %v", err)
+	}
+
 	if err := s.Start(); err != nil && err != http.ErrServerClosed {
 		log.Fatalf("error listenning: %v", err)
 	}
@@ -70,8 +61,3 @@ func eventHandler(ctx context.Context, e *common.TopicEvent) (retry bool, err er
 	log.Printf("event - PubsubName: %s, Topic: %s, ID: %s, Data: %s", e.PubsubName, e.Topic, e.ID, e.Data)
 	return false, nil
 }
-
-func importantEventHandler(ctx context.Context, e *common.TopicEvent) (retry bool, err error) {
-	log.Printf("important event - PubsubName: %s, Topic: %s, ID: %s, Data: %s", e.PubsubName, e.Topic, e.ID, e.Data)
-	return false, nil
-}