Make webhook endpoint an env-var

ArroyoSystems · Jan 16, 2024 · 71eee9a · 71eee9a
1 parent b0fc29f
commit 71eee9a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/arroyo-connectors/src/webhook.rs b/arroyo-connectors/src/webhook.rs
@@ -29,7 +29,7 @@ pub struct WebhookConnector {}
 impl WebhookConnector {
     fn construct_test_request(client: &Client, config: &WebhookTable) -> anyhow::Result<Request> {
         let req = client
-            .post(&config.endpoint)
+            .post(&config.endpoint.sub_env_vars()?)
             // TODO: use the schema to construct a correctly-formatted message
             .body(
                 serde_json::to_string(&json! {{
@@ -53,7 +53,7 @@ impl WebhookConnector {
             .map(|s| s.sub_env_vars())
             .transpose()?;
 
-        let client = construct_http_client(&config.endpoint, headers)?;
+        let client = construct_http_client(&config.endpoint.sub_env_vars()?, headers)?;
         let req = Self::construct_test_request(&client, config)?;
 
         tx.send(Ok(Event::default()
@@ -141,7 +141,7 @@ impl Connector for WebhookConnector {
         table: Self::TableT,
         schema: Option<&ConnectionSchema>,
     ) -> anyhow::Result<crate::Connection> {
-        let description = format!("WebhookSource<{}>", table.endpoint);
+        let description = format!("WebhookSink<{}>", table.endpoint.sub_env_vars()?);
 
         let schema = schema
             .map(|s| s.to_owned())
@@ -184,10 +184,13 @@ impl Connector for WebhookConnector {
 
         let headers = options.remove("headers").map(|s| VarStr::new(s));
 
-        let table = WebhookTable { endpoint, headers };
+        let table = WebhookTable {
+            endpoint: VarStr::new(endpoint),
+            headers,
+        };
 
         let client = construct_http_client(
-            &table.endpoint,
+            &table.endpoint.sub_env_vars()?,
             table
                 .headers
                 .as_ref()

diff --git a/arroyo-worker/src/connectors/webhook.rs b/arroyo-worker/src/connectors/webhook.rs
@@ -62,7 +62,7 @@ where
             .collect();
 
         Self {
-            url: Arc::new(table.endpoint),
+            url: Arc::new(table.endpoint.sub_env_vars().unwrap()),
             client: reqwest::ClientBuilder::new()
                 .default_headers(headers)
                 .timeout(Duration::from_secs(5))

diff --git a/connector-schemas/webhook/table.json b/connector-schemas/webhook/table.json
@@ -9,7 +9,7 @@
             "examples": [
                 "https://yourdomain.com/api/v1/webhooks"
             ],
-            "format": "uri"
+            "format": "var-str"
         },
         "headers": {
             "title": "Headers",