refactor: Replace testing HTTP client with the generic one

tomasol · tomasol · commit f66e46dec599 · 2026-01-12T13:52:25.000+01:00
diff --git a/obelisk-external.toml b/obelisk-external.toml
@@ -3,10 +3,11 @@ name = "activity_fly_http"
 location.oci = "docker.io/getobelisk/components_fly_activity_fly_http:2026-01-10@sha256:4985d2a91d1edcb2312617be37ebb8a4599c886e714b47227c69dbd15c51b2f9"
 env_vars = ["IGNORE"]
 
+# HTTP Client for health checking.
 [[activity_wasm]]
-# For health checking.
-name = "activity_http"
-location.oci = "docker.io/getobelisk/test_programs_http_get_activity:2025-09-28@sha256:8131d9cafbdf06dbaf7a3b4e629791c9cf3dc1553df9418b34f25ab900b72929"
+name = "activity_http_generic"
+location.oci = "docker.io/getobelisk/components_activity-http-generic_activity_http_generic:2026-01-12-2@sha256:230b9a90661470aadd75724ebd9c2f8c914b8fe52b850773725e64f3807a4151"
+exec.lock_expiry.seconds = 5
 
 [[activity_wasm]]
 name = "activity_obelisk_client"
diff --git a/obelisk-local-postgres.toml b/obelisk-local-postgres.toml
@@ -7,10 +7,14 @@ database.postgres.password = "${POSTGRES_PASSWORD}"
 database.postgres.db_name =  "${POSTGRES_DATABASE}"
 database.postgres.provision_policy = "auto"
 
-log.stdout.enabled = true
+[log.file]
+enabled = true
+target = true
+level="info"
+directory = "."
+prefix = "obelisk.log" # File name prefix
 
 [[activity_wasm]]
-# For health checking.
 name = "activity_fly_http"
 location.oci = "docker.io/getobelisk/components_fly_activity_fly_http:2026-01-10@sha256:4985d2a91d1edcb2312617be37ebb8a4599c886e714b47227c69dbd15c51b2f9"
 exec.lock_expiry.seconds = 15
@@ -19,12 +23,11 @@ forward_stdout = "stderr"
 forward_stderr = "stderr"
 max_retries = 6
 
+# HTTP Client for health checking.
 [[activity_wasm]]
-name = "http_activity"
-location.oci = "docker.io/getobelisk/test_programs_http_get_activity:2025-09-28@sha256:8131d9cafbdf06dbaf7a3b4e629791c9cf3dc1553df9418b34f25ab900b72929"
+name = "activity_http_generic"
+location.oci = "docker.io/getobelisk/components_activity-http-generic_activity_http_generic:2026-01-12-2@sha256:230b9a90661470aadd75724ebd9c2f8c914b8fe52b850773725e64f3807a4151"
 exec.lock_expiry.seconds = 5
-forward_stdout = "stderr"
-forward_stderr = "stderr"
 
 [[activity_wasm]]
 name = "activity_obelisk_client"
diff --git a/obelisk-local.toml b/obelisk-local.toml
@@ -1,7 +1,6 @@
 api.listening_addr = "127.0.0.1:5005"
 webui.listening_addr = "127.0.0.1:8080"
 
-log.stdout.enabled = true
 
 [log.file]
 enabled = true
@@ -19,13 +18,11 @@ forward_stdout = "stderr"
 forward_stderr = "stderr"
 max_retries = 6
 
+# HTTP Client for health checking.
 [[activity_wasm]]
-# For health checking.
-name = "activity_http"
-location.oci = "docker.io/getobelisk/test_programs_http_get_activity:2025-09-28@sha256:8131d9cafbdf06dbaf7a3b4e629791c9cf3dc1553df9418b34f25ab900b72929"
+name = "activity_http_generic"
+location.oci = "docker.io/getobelisk/components_activity-http-generic_activity_http_generic:2026-01-12-2@sha256:230b9a90661470aadd75724ebd9c2f8c914b8fe52b850773725e64f3807a4151"
 exec.lock_expiry.seconds = 5
-forward_stdout = "stderr"
-forward_stderr = "stderr"
 
 [[activity_wasm]]
 name = "activity_obelisk_client"
diff --git a/obelisk-oci.toml b/obelisk-oci.toml
@@ -1,7 +1,13 @@
 api.listening_addr = "127.0.0.1:5005"
 webui.listening_addr = "127.0.0.1:8080"
 
-log.stdout.enabled = true
+
+[log.file]
+enabled = true
+target = true
+level="info"
+directory = "."
+prefix = "obelisk.log" # File name prefix
 
 [[activity_wasm]]
 name = "activity_fly_http"
@@ -12,12 +18,11 @@ forward_stdout = "stderr"
 forward_stderr = "stderr"
 max_retries = 6
 
+# HTTP Client for health checking.
 [[activity_wasm]]
-name = "http_activity"
-location.oci = "docker.io/getobelisk/test_programs_http_get_activity:2025-09-28@sha256:8131d9cafbdf06dbaf7a3b4e629791c9cf3dc1553df9418b34f25ab900b72929"
+name = "activity_http_generic"
+location.oci = "docker.io/getobelisk/components_activity-http-generic_activity_http_generic:2026-01-12-2@sha256:230b9a90661470aadd75724ebd9c2f8c914b8fe52b850773725e64f3807a4151"
 exec.lock_expiry.seconds = 5
-forward_stdout = "stderr"
-forward_stderr = "stderr"
 
 [[activity_wasm]]
 name = "activity_obelisk_client"
diff --git a/wit/deps/obelisk-components_generic-http-obelisk-ext@0.1.0/obelisk-components_generic-http-obelisk-ext@0.1.0.wit b/wit/deps/obelisk-components_generic-http-obelisk-ext@0.1.0/obelisk-components_generic-http-obelisk-ext@0.1.0.wit
@@ -0,0 +1,14 @@
+package obelisk-components:generic-http-obelisk-ext@0.1.0;
+
+interface http {
+  use obelisk-components:generic-http/http@0.1.0.{method, headers, request-body, response-body, response, request-error};
+  use obelisk:types/execution@4.0.0.{execution-id};
+  use obelisk:types/join-set@4.0.0.{join-set};
+  use obelisk:types/execution@4.0.0.{await-next-extension-error, get-extension-error};
+
+  request-submit: func(join-set: borrow<join-set>, method: method, url: string, headers: headers, body: option<request-body>) -> execution-id;
+
+  request-await-next: func(join-set: borrow<join-set>) -> result<tuple<execution-id, result<response, request-error>>, await-next-extension-error>;
+
+  request-get: func(execution-id: execution-id) -> result<result<response, request-error>, get-extension-error>;
+}
diff --git a/wit/deps/obelisk-components_generic-http-obelisk-schedule@0.1.0/obelisk-components_generic-http-obelisk-schedule@0.1.0.wit b/wit/deps/obelisk-components_generic-http-obelisk-schedule@0.1.0/obelisk-components_generic-http-obelisk-schedule@0.1.0.wit
@@ -0,0 +1,9 @@
+package obelisk-components:generic-http-obelisk-schedule@0.1.0;
+
+interface http {
+  use obelisk-components:generic-http/http@0.1.0.{method, headers, request-body, response-body, response, request-error};
+  use obelisk:types/execution@4.0.0.{execution-id};
+  use obelisk:types/time@4.0.0.{schedule-at};
+
+  request-schedule: func(schedule-at: schedule-at, method: method, url: string, headers: headers, body: option<request-body>) -> execution-id;
+}
diff --git a/wit/deps/obelisk-components_generic-http@0.1.0/obelisk-components_generic-http@0.1.0.wit b/wit/deps/obelisk-components_generic-http@0.1.0/obelisk-components_generic-http@0.1.0.wit
@@ -0,0 +1,40 @@
+package obelisk-components:generic-http@0.1.0;
+
+interface http {
+  enum method {
+    get,
+    post,
+    put,
+    delete,
+    patch,
+    head,
+    options,
+  }
+
+  type headers = list<tuple<string, string>>;
+
+  variant request-body {
+    text(string),
+    binary(list<u8>),
+  }
+
+  variant response-body {
+    text(string),
+    binary(list<u8>),
+  }
+
+  record response {
+    status-code: u16,
+    headers: headers,
+    body: option<response-body>,
+  }
+
+  variant request-error {
+    execution-failed,
+    invalid-url(string),
+    network-error(string),
+    io-error(string),
+  }
+
+  request: func(method: method, url: string, headers: headers, body: option<request-body>) -> result<response, request-error>;
+}
diff --git a/wit/deps/testing_http-obelisk-ext/testing_http-obelisk-ext.wit b/wit/deps/testing_http-obelisk-ext/testing_http-obelisk-ext.wit
diff --git a/wit/deps/testing_http-obelisk-schedule/testing_http-obelisk-schedule.wit b/wit/deps/testing_http-obelisk-schedule/testing_http-obelisk-schedule.wit
diff --git a/wit/deps/testing_http/testing_http.wit b/wit/deps/testing_http/testing_http.wit
diff --git a/workflow/deployer-workflow/src/lib.rs b/workflow/deployer-workflow/src/lib.rs
@@ -13,6 +13,7 @@ use generated::{
         types::time::{Duration as SchedulingDuration, ScheduleAt},
         workflow::workflow_support,
     },
+    obelisk_components::generic_http::http,
     obelisk_flyio::{
         activity_fly_http::{
             self,
@@ -29,7 +30,6 @@ use generated::{
             workflow::{self as workflow_import, AppInitError, ObeliskConfig},
         },
     },
-    testing::http::http_get,
 };
 use hashbrown::{HashMap, HashSet};
 use std::time::Duration;
@@ -532,7 +532,7 @@ fn check_health(app_name: &str, health_check_deadline_secs: u16) -> Result<(), A
 
     let mut join_sets = HashMap::new();
     loop {
-        let resp = http_get::get_resp(&url).map(|resp| resp.status_code);
+        let resp = http::request(http::Method::Get, &url, &[], None).map(|resp| resp.status_code);
         let reason = match resp {
             Ok(200..300) => return Ok(()),
             Ok(other) => format!("wrong status code: {other}"),
diff --git a/workflow/deployer-workflow/wit/deps/obelisk-components_generic-http@0.1.0 b/workflow/deployer-workflow/wit/deps/obelisk-components_generic-http@0.1.0
@@ -0,0 +1 @@
+../../../../wit/deps/obelisk-components_generic-http@0.1.0
diff --git a/workflow/deployer-workflow/wit/deps/testing_http b/workflow/deployer-workflow/wit/deps/testing_http
diff --git a/workflow/deployer-workflow/wit/impl.wit b/workflow/deployer-workflow/wit/impl.wit
@@ -15,7 +15,7 @@ world any {
     import obelisk-flyio:activity-fly-http/volumes@1.0.0-beta;
     import obelisk-flyio:activity-fly-http/secrets@1.0.0-beta;
 
-    import testing:http/http-get;
+    import obelisk-components:generic-http/http@0.1.0;
 
     import obelisk:workflow/workflow-support@4.0.0;
     import obelisk:log/log@1.0.0;
