Libs: replace beta "events public" with the new "message poller"

bridge/svix-bridge.example.receivers.yaml

@@ -25,6 +25,9 @@ opentelemetry:
 # Inputs types are "webhook" which allows you to configure a verification scheme
 # (either "svix" or "none") or "svix-webhook" which is a shorthand version.
 #
+# There is also a "svix-message-poller" input type which will poll a polling endpoint
+# rather than waiting for incoming messages.
+#
 # ```
 #   input:
 #     type: "webhook"
@@ -125,3 +128,17 @@ receivers:
       # Only for SASL
       kafka_sasl_username: "user"
       kafka_sasl_password: "pass"
+
+  - name: "msg-poller-to-rabbitmq-example"
+    input:
+      type: "svix-message-poller"
+      consumer_id: "example-consumer"
+      # The app and sink ids can be seen in the URL for the corresponding Polling Endpoint.
+      app_id: "my-app-uid"
+      sink_id: "poll_XXXX"
+      token: "${POLLING_ENDPOINT_TOKEN}"
+    output:
+      type: "rabbitmq"
+      uri: "${QUEUE_URI}"
+      exchange: ""
+      routing_key: "my_queue"

bridge/svix-bridge/src/config/mod.rs

@@ -242,7 +242,7 @@ impl WebhookReceiverConfig {
 #[derive(Clone, Deserialize)]
 #[serde(tag = "type", rename_all = "kebab-case")]
 pub enum PollerInputOpts {
-    SvixPollingEndpoint {
+    SvixMessagePoller {
         /// Identifies this client, allowing the server to track progress during iteration.
         /// Processes should not share a consumer id. Only exclusive access is permitted.
         consumer_id: String,
@@ -260,7 +260,7 @@ pub enum PollerInputOpts {
 impl PollerInputOpts {
     pub fn svix_client(&self) -> Option<Svix> {
         match self {
-            PollerInputOpts::SvixPollingEndpoint {
+            PollerInputOpts::SvixMessagePoller {
                 token,
                 svix_options,
                 ..

bridge/svix-bridge/src/config/tests.rs

@@ -618,7 +618,7 @@ fn test_pollers_parse_ok() {
     receivers:
       - name: "poller-to-rabbitmq-example"
         input:
-          type: "svix-polling-endpoint"
+          type: "svix-message-poller"
           consumer_id: "my-consumer"
           app_id: "app_AbCd"
           sink_id: "poll_aBcD"

bridge/svix-bridge/src/webhook_receiver/mod.rs

@@ -9,7 +9,7 @@ use axum::{
 use svix_bridge_types::{
     async_trait,
     svix::{
-        api::{EventsPublicConsumerOptions, Svix},
+        api::{MessagePollerConsumerPollOptions, Svix},
         error::Error,
     },
     ForwardRequest, PollerInput, ReceiverOutput, TransformationConfig, TransformerInput,
@@ -258,7 +258,7 @@ async fn run_inner(poller: &SvixEventsPoller) -> ! {
     const NO_SLEEP: Duration = Duration::ZERO;
     let mut sleep_time = NO_SLEEP;
 
-    let PollerInputOpts::SvixPollingEndpoint {
+    let PollerInputOpts::SvixMessagePoller {
         consumer_id,
         token: _,
         app_id,
@@ -269,19 +269,18 @@ async fn run_inner(poller: &SvixEventsPoller) -> ! {
     let mut iterator = None;
 
     'outer: loop {
-        tracing::trace!(app_id, sink_id, "polling endpoint");
+        tracing::trace!(app_id, sink_id, "polling poller");
         match poller
             .svix_client
-            .events_public()
-            .consumer(
+            .message()
+            .poller()
+            .consumer_poll(
                 app_id.clone(),
                 sink_id.clone(),
                 consumer_id.clone(),
-                Some(EventsPublicConsumerOptions {
+                Some(MessagePollerConsumerPollOptions {
                     limit: None,
                     iterator: iterator.clone(),
-                    event_type: None,
-                    channel: None,
                 }),
             )
             .await

csharp/Svix/MessagePoller.cs

@@ -32,19 +32,11 @@ public class MessagePollerConsumerPollOptions : SvixOptionsBase
     {
         public ulong? Limit { get; set; }
         public string? Iterator { get; set; }
-        public string? EventType { get; set; }
-        public string? Channel { get; set; }
 
         public new Dictionary<string, string> QueryParams()
         {
             return SerializeParams(
-                new Dictionary<string, object?>
-                {
-                    { "limit", Limit },
-                    { "iterator", Iterator },
-                    { "event_type", EventType },
-                    { "channel", Channel },
-                }
+                new Dictionary<string, object?> { { "limit", Limit }, { "iterator", Iterator } }
             );
         }
     }

go/message_poller.go

@@ -36,10 +36,6 @@ type MessagePollerConsumerPollOptions struct {
 	Limit *uint64
 	// The iterator returned from a prior invocation
 	Iterator *string
-	// Filters messages sent with this event type (optional).
-	EventType *string
-	// Filters messages sent with this channel (optional).
-	Channel *string
 }
 
 type MessagePollerConsumerSeekOptions struct {
@@ -100,8 +96,6 @@ func (messagePoller *MessagePoller) ConsumerPoll(
 	if o != nil {
 		internal.SerializeParamToMap("limit", o.Limit, queryMap, &err)
 		internal.SerializeParamToMap("iterator", o.Iterator, queryMap, &err)
-		internal.SerializeParamToMap("event_type", o.EventType, queryMap, &err)
-		internal.SerializeParamToMap("channel", o.Channel, queryMap, &err)
 		if err != nil {
 			return nil, err
 		}

go/models/api_token_out.go

@@ -6,7 +6,7 @@ import "time"
 type ApiTokenOut struct {
 	CreatedAt time.Time  `json:"createdAt"`
 	ExpiresAt *time.Time `json:"expiresAt,omitempty"`
-	Id        string     `json:"id"` // The ApplicationToken's ID.
+	Id        string     `json:"id"` // The GlobalApplicationToken's ID.
 	Name      *string    `json:"name,omitempty"`
 	Scopes    []string   `json:"scopes,omitempty"`
 	Token     string     `json:"token"`