build: Migrate to Obelisk 0.41.0-rc.1

tomasol · tomasol · commit 2b0d3293d721 · 2026-08-03T21:21:30.000Z
diff --git a/.github/workflows/check-verify.yml b/.github/workflows/check-verify.yml
@@ -46,4 +46,4 @@ jobs:
 
       - name: Verify configs
         run: |
-          nix develop --command just verify --allow-unavailable-runtime-config --skip-db
+          nix develop --command just verify --allow-unavailable-runtime-config
diff --git a/.github/workflows/sync-flake-lock.yml b/.github/workflows/sync-flake-lock.yml
@@ -21,8 +21,8 @@ jobs:
 
       - name: Sync flake.lock and rust-toolchain.toml from upstream
         run: |
-          curl https://raw.githubusercontent.com/obeli-sk/obelisk/refs/heads/latest/flake.lock -o flake.lock
-          UPSTREAM=https://raw.githubusercontent.com/obeli-sk/obelisk/refs/heads/latest/rust-toolchain.toml
+          curl https://raw.githubusercontent.com/obeli-sk/obelisk/refs/heads/latest-pre/flake.lock -o flake.lock
+          UPSTREAM=https://raw.githubusercontent.com/obeli-sk/obelisk/refs/heads/latest-pre/rust-toolchain.toml
           CHANNEL=$(curl -fsSL "$UPSTREAM" | grep '^channel =')
           sed -i "s/^channel =.*/$CHANNEL/" rust-toolchain.toml
 
@@ -79,4 +79,3 @@ jobs:
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PR_RW }}
-
diff --git a/Justfile b/Justfile
@@ -12,9 +12,9 @@ test-integration:
 	(cd activity/obelisk-&& TEST_ENDPOINT_URL=http://localhost:5005 cargo nextest run -- --ignored)
 
 verify *params:
-	obelisk server verify --server-config server.toml --deployment obelisk-local.toml {{params}}
-	obelisk server verify --server-config server-postgres.toml --deployment obelisk-local-postgres.toml {{params}}
-	obelisk server verify --server-config server.toml --deployment obelisk-oci.toml {{params}}
+	obelisk deployment verify --server-config server.toml --deployment obelisk-local.toml {{params}}
+	obelisk deployment verify --server-config server-postgres.toml --deployment obelisk-local-postgres.toml {{params}}
+	obelisk deployment verify --server-config server.toml --deployment obelisk-oci.toml {{params}}
 
 serve:
 	obelisk server run --server-config server.toml --deployment ${CONFIG:-obelisk-local.toml}
diff --git a/dev-deps.txt b/dev-deps.txt
@@ -1,11 +1,11 @@
-cargo-edit-upgrade 0.13.11
-cargo-expand 1.0.123
+cargo-edit-upgrade 0.13.13
+cargo-expand 1.0.124
 cargo generate 0.23.9
-cargo-insta 1.47.2
+cargo-insta 1.48.0
 cargo-nextest 0.9.140
-just 1.55.1
-obelisk 0.40.0
+just 1.57.0
+obelisk 0.41.0-rc.1
 pkg-config 0.29.2
 rustc 1.96.0 (ac68faa20 2026-05-25)
-wasm-tools 1.253.0
+wasm-tools 1.254.0
 ldd (GNU libc) 2.42
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,7 +9,7 @@
       };
     };
     obelisk = {
-      url = "github:obeli-sk/obelisk/latest";
+      url = "github:obeli-sk/obelisk/latest-pre";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
diff --git a/obelisk-local-postgres.toml b/obelisk-local-postgres.toml
@@ -6,8 +6,7 @@ max_retries = 6
 [[activity_wasm.allowed_host]]
 pattern = "https://api.machines.dev"
 methods = "*"
-[activity_wasm.allowed_host.secrets]
-env_vars = ["FLY_API_TOKEN"]
+secrets = ["FLY_API_TOKEN"]
 replace_in = ["headers"]
 
 # HTTP Client for health checking.
diff --git a/obelisk-local.toml b/obelisk-local.toml
@@ -6,8 +6,7 @@ max_retries = 6
 [[activity_wasm.allowed_host]]
 pattern = "https://api.machines.dev"
 methods = "*"
-[activity_wasm.allowed_host.secrets]
-env_vars = ["FLY_API_TOKEN"]
+secrets = ["FLY_API_TOKEN"]
 replace_in = ["headers"]
 
 # HTTP Client for health checking.
diff --git a/obelisk-oci.toml b/obelisk-oci.toml
@@ -6,8 +6,7 @@ max_retries = 6
 [[activity_wasm.allowed_host]]
 pattern = "https://api.machines.dev"
 methods = "*"
-[activity_wasm.allowed_host.secrets]
-env_vars = ["FLY_API_TOKEN"]
+secrets = ["FLY_API_TOKEN"]
 replace_in = ["headers"]
 
 # HTTP Client for health checking.
diff --git a/server-postgres.toml b/server-postgres.toml
@@ -4,6 +4,23 @@ database.postgres.password = "${POSTGRES_PASSWORD}"
 database.postgres.db_name =  "${POSTGRES_DATABASE}"
 database.postgres.provision_policy = "auto"
 
+[secrets]
+FLY_API_TOKEN = { env = "FLY_API_TOKEN" }
+
+[[outbound_http.allowed_host]]
+pattern = "https://api.machines.dev"
+methods = "*"
+secrets = ["FLY_API_TOKEN"]
+replace_in = ["headers"]
+
+[[outbound_http.allowed_host]]
+pattern = "https://*.fly.dev:444"
+methods = "*"
+
+[[outbound_http.allowed_host]]
+pattern = "https://*.fly.dev"
+methods = ["GET", "POST"]
+
 [log.file]
 enabled = true
 target = true
diff --git a/server.toml b/server.toml
@@ -1,3 +1,20 @@
+[secrets]
+FLY_API_TOKEN = { env = "FLY_API_TOKEN" }
+
+[[outbound_http.allowed_host]]
+pattern = "https://api.machines.dev"
+methods = "*"
+secrets = ["FLY_API_TOKEN"]
+replace_in = ["headers"]
+
+[[outbound_http.allowed_host]]
+pattern = "https://*.fly.dev:444"
+methods = "*"
+
+[[outbound_http.allowed_host]]
+pattern = "https://*.fly.dev"
+methods = ["GET", "POST"]
+
 [log.file]
 enabled = true
 target = true
diff --git a/wit/deps/obelisk_types@5.0.0/obelisk_types@5.0.0.wit b/wit/deps/obelisk_types@5.0.0/obelisk_types@5.0.0.wit
@@ -1,4 +1,4 @@
-// Generated by Obelisk 0.40.0
+// Generated by Obelisk 0.41.0-rc.1
 package obelisk:types@5.0.0;
 
 @since(version = 3.0.0)
diff --git a/workflow/deployer-workflow/src/lib.rs b/workflow/deployer-workflow/src/lib.rs
@@ -215,7 +215,7 @@ fn setup_volume(
         &temp_vm_id,
         &[
             OBELISK_BIN_PATH.to_string(),
-            "server".to_string(),
+            "deployment".to_string(),
             "verify".to_string(),
             "--allow-unavailable-runtime-config".to_string(),
             "--server-config".to_string(),
diff --git a/workflow/deployer-workflow/src/snapshots/obelisk_deployer_flyio__toml__tests__server_toml.snap b/workflow/deployer-workflow/src/snapshots/obelisk_deployer_flyio__toml__tests__server_toml.snap
@@ -2,7 +2,6 @@
 source: workflow/deployer-workflow/src/toml.rs
 expression: server_toml
 ---
-
 [database.sqlite]
 directory = "/volume/obelisk-sqlite"
 
@@ -19,6 +18,10 @@ enabled = true
 prefix = "obelisk.log"
 target = true
 
+[[outbound_http.allowed_host]]
+methods = "*"
+pattern = "*://*:*"
+
 [wasm]
 cache_directory = "/volume/wasm"
 parallel_compilation = false
diff --git a/workflow/deployer-workflow/src/toml.rs b/workflow/deployer-workflow/src/toml.rs
@@ -44,6 +44,10 @@ target = true
 directory = "/var/log"
 prefix = "obelisk.log"
 
+[[outbound_http.allowed_host]]
+pattern = "*://*:*"
+methods = "*"
+
 [[http_server]]
 name = "{HEALTHCHECK_SERVER_NAME}"
 listening_addr = "[::]:{HEALTHCHECK_INTERNAL_PORT}"
diff --git a/workflow/deployer-workflow/wit/obelisk-flyio_workflow@1.0.0-beta/types.wit b/workflow/deployer-workflow/wit/obelisk-flyio_workflow@1.0.0-beta/types.wit
@@ -64,7 +64,7 @@ interface types {
         temp-vm-error(string),
         /// Cannot place files on the volume.
         volume-write-error(string),
-        /// Error running `obelisk server verify --allow-unavailable-runtime-config`
+        /// Error running `obelisk deployment verify --allow-unavailable-runtime-config`
         verify-error(string),
         /// Waiting for secrets was interrupted by deleting the app.
         app-deleted,
