Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for publishSettings #1027

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions protocol/pubsub/v2/internal/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"time"

"cloud.google.com/go/pubsub"

pscontext "github.com/cloudevents/sdk-go/protocol/pubsub/v2/context"
"github.com/cloudevents/sdk-go/v2/binding"
)
Expand Down Expand Up @@ -62,6 +63,9 @@ type Connection struct {
// ReceiveSettings is used to configure Pubsub pull subscription.
ReceiveSettings *pubsub.ReceiveSettings

// PublishSettings is used to configure Publishing to a topic
PublishSettings *pubsub.PublishSettings

// AckDeadline is Pub/Sub AckDeadline.
// Default is 30 seconds.
// This can only be set prior to first call of any function.
Expand Down Expand Up @@ -128,6 +132,12 @@ func (c *Connection) getOrCreateTopicInfo(ctx context.Context, getAlreadyOpenOnl
}
ti.wasCreated = true
}

// if publishSettings have been provided use them otherwise pubsub will use default settings
if c.PublishSettings != nil {
topic.PublishSettings = *c.PublishSettings
}

// Success.
ti.topic = topic

Expand Down
54 changes: 54 additions & 0 deletions protocol/pubsub/v2/internal/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,60 @@ func TestPublishCreateTopic(t *testing.T) {
verifyTopicDeleteWorks(t, client, psconn, topicID)
}

// Test that publishing to an already created topic works and doesn't allow topic deletion
func TestPublishWithCustomPublishSettings(t *testing.T) {
t.Run("create topic and publish to it with custom settings", func(t *testing.T) {
ctx := context.Background()
pc := &testPubsubClient{}
defer pc.Close()

projectID, topicID, subID := "test-project", "test-topic", "test-sub"

client, err := pc.New(ctx, projectID, nil)
if err != nil {
t.Fatalf("failed to create pubsub client: %v", err)
}
defer client.Close()

psconn := &Connection{
AllowCreateSubscription: true,
AllowCreateTopic: true,
Client: client,
ProjectID: projectID,
TopicID: topicID,
SubscriptionID: subID,
PublishSettings: &pubsub.PublishSettings{
DelayThreshold: 100 * time.Millisecond,
CountThreshold: 00,
ByteThreshold: 2e6,
Timeout: 120 * time.Second,
BufferedByteLimit: 20 * pubsub.MaxPublishRequestBytes,
FlowControlSettings: pubsub.FlowControlSettings{
MaxOutstandingMessages: 10,
MaxOutstandingBytes: 0,
LimitExceededBehavior: pubsub.FlowControlBlock,
},
},
}

topic, err := client.CreateTopic(ctx, topicID)
if err != nil {
t.Fatalf("failed to pre-create topic: %v", err)
}
topic.Stop()

msg := &pubsub.Message{
ID: "msg-id-1",
Data: []byte("msg-data-1"),
}
if _, err := psconn.Publish(ctx, msg); err != nil {
t.Errorf("failed to publish message: %v", err)
}

verifyTopicDeleteFails(t, client, psconn, topicID)
})
}

// Test that publishing to an already created topic works and doesn't allow topic deletion
func TestPublishExistingTopic(t *testing.T) {
for _, allowCreate := range []bool{true, false} {
Expand Down