From cb16825e247d5251072e860e9aaf80f9344c479a Mon Sep 17 00:00:00 2001 From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com> Date: Wed, 21 Oct 2026 08:27:56 -0700 Subject: [PATCH 1/3] busbar pin: 1.6.0 (08d4d7c501ccb9f734a8d088c242addb2e5fb444): .busbar-ref, manifests, Cargo.lock, workflow refs The pin moves to busbar dev, which carries #1449 (MacroDoor, plugin_door!'s MACRO_DOOR). --- .busbar-ref | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/repin.yml | 2 +- Cargo.lock | 21 +++++++++++---------- Cargo.toml | 6 +++--- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.busbar-ref b/.busbar-ref index 43e9780..4296788 100644 --- a/.busbar-ref +++ b/.busbar-ref @@ -1 +1 @@ -7263f4e61b7af7fdadb9079394d139547e61d1c0 1.6.0 +08d4d7c501ccb9f734a8d088c242addb2e5fb444 1.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 534f6d1..bc9b749 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ permissions: jobs: ci: - uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@7263f4e61b7af7fdadb9079394d139547e61d1c0 + uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@08d4d7c501ccb9f734a8d088c242addb2e5fb444 with: service: none busbar_checkout: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 627b9bd..bb1003e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: secrets: inherit release: needs: ci - uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@7263f4e61b7af7fdadb9079394d139547e61d1c0 + uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@08d4d7c501ccb9f734a8d088c242addb2e5fb444 with: plugin_crate: busbar-export-webhook-plugin manifest_name: busbar-export-webhook @@ -41,7 +41,7 @@ jobs: consumer-verify: needs: release if: ${{ !cancelled() }} - uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@7263f4e61b7af7fdadb9079394d139547e61d1c0 + uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@08d4d7c501ccb9f734a8d088c242addb2e5fb444 with: version: ${{ github.ref_name }} asset_prefix: busbar-export-webhook diff --git a/.github/workflows/repin.yml b/.github/workflows/repin.yml index bb62d70..75cadb9 100644 --- a/.github/workflows/repin.yml +++ b/.github/workflows/repin.yml @@ -28,7 +28,7 @@ permissions: jobs: repin: - uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@7263f4e61b7af7fdadb9079394d139547e61d1c0 + uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@08d4d7c501ccb9f734a8d088c242addb2e5fb444 with: busbar_sha: ${{ github.event.client_payload.sha || inputs.busbar_sha }} busbar_version: ${{ github.event.client_payload.version || inputs.busbar_version }} diff --git a/Cargo.lock b/Cargo.lock index 234e1fa..1bba4b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -224,7 +224,7 @@ dependencies = [ [[package]] name = "busbar-core-connector" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "arc-swap", "base64 0.22.1", @@ -244,6 +244,7 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-util", + "tracing", "url", "webpki-roots", "zeroize", @@ -279,7 +280,7 @@ dependencies = [ [[package]] name = "busbar-kernel" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "arc-swap", "async-trait", @@ -328,7 +329,7 @@ dependencies = [ [[package]] name = "busbar-kernel-audit" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", "ed25519-dalek", @@ -339,7 +340,7 @@ dependencies = [ [[package]] name = "busbar-kernel-breaker" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", "httpdate", @@ -348,7 +349,7 @@ dependencies = [ [[package]] name = "busbar-kernel-egress" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", "bytes", @@ -358,7 +359,7 @@ dependencies = [ [[package]] name = "busbar-kernel-identity" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", "hex", @@ -368,7 +369,7 @@ dependencies = [ [[package]] name = "busbar-kernel-ledger" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", "ring", @@ -378,7 +379,7 @@ dependencies = [ [[package]] name = "busbar-kernel-scope" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", ] @@ -386,7 +387,7 @@ dependencies = [ [[package]] name = "busbar-kernel-wal" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", "ring", @@ -395,7 +396,7 @@ dependencies = [ [[package]] name = "busbar-plugin-loader" version = "1.5.0" -source = "git+https://github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "busbar-contract", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index 33e1d36..13b0561 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,12 +35,12 @@ repository = "https://github.com/GetBusbar/busbar-export-webhook" needless_update = "allow" [workspace.dependencies] -busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "7263f4e61b7af7fdadb9079394d139547e61d1c0" } -busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "7263f4e61b7af7fdadb9079394d139547e61d1c0" } +busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "08d4d7c501ccb9f734a8d088c242addb2e5fb444" } +busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "08d4d7c501ccb9f734a8d088c242addb2e5fb444" } # THE SUITE'S HOST CONNECTOR (dev-only; export-webhook-plugin/tests/support/conformance_host.rs, # rendered because the declares file states network needs): busbar's connector and its TLS # test kit at the pin, and the transport framers those needs name, at the revs busbar links. -busbar-core-connector = { git = "https://github.com/GetBusbar/busbar", rev = "7263f4e61b7af7fdadb9079394d139547e61d1c0", features = ["test-support"] } +busbar-core-connector = { git = "https://github.com/GetBusbar/busbar", rev = "08d4d7c501ccb9f734a8d088c242addb2e5fb444", features = ["test-support"] } busbar-transport-http = { git = "https://github.com/GetBusbar/busbar-transport-http", rev = "12b078389496d4c1fd81b730f5d9d0887537c3b0" } busbar-transport-tcp = { git = "https://github.com/GetBusbar/busbar-transport-tcp", rev = "223ec3f02000de94089a1752635b9e206f7492e5" } # busbar's root [workspace.dependencies], third-party rows, at 7263f4e61b7af7fdadb9079394d139547e61d1c0 From 23a00191a4f06d57d09147f735e94c144859538d Mon Sep 17 00:00:00 2001 From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com> Date: Wed, 21 Oct 2026 08:27:57 -0700 Subject: [PATCH 2/3] row 159: re-export MACRO_DOOR beside door (busbar #1469 A1) busbar's generated linked tables name ::MACRO_DOOR for every linked row; plugin_door! emits it only in the module that invokes it, so the entry module re-exports it beside door. --- export-webhook/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export-webhook/src/lib.rs b/export-webhook/src/lib.rs index 3f9c284..91bc065 100644 --- a/export-webhook/src/lib.rs +++ b/export-webhook/src/lib.rs @@ -701,7 +701,7 @@ mod table { } /// This plugin's door: the one a compiled-in build links and the dropped-in image exports. -pub use table::door; +pub use table::{door, MACRO_DOOR}; #[cfg(test)] #[path = "tests.rs"] From 602e28c09c218065a716f4c35c38e9086405dd1a Mon Sep 17 00:00:00 2001 From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com> Date: Wed, 21 Oct 2026 08:44:41 -0700 Subject: [PATCH 3/3] busbar pin 08d4d7c501: the rendered files follow it - [patch] busbar-contract (the www.github.com spelling) moves to 08d4d7c501 with its Cargo.lock source line; it was still at the old pin. - declares.json drops the contract_abi range, as busbar-release plugin render at 08d4d7c501 writes it (busbar plugin-gates declares refuses a stated range). - The Cargo.toml / deny.toml comments name the new pin. --- Cargo.lock | 2 +- Cargo.toml | 10 +++++----- deny.toml | 2 +- export-webhook/declares.json | 4 ---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1bba4b8..626b0e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "busbar-contract" version = "1.6.0" -source = "git+https://www.github.com/GetBusbar/busbar?rev=7263f4e61b7af7fdadb9079394d139547e61d1c0#7263f4e61b7af7fdadb9079394d139547e61d1c0" +source = "git+https://www.github.com/GetBusbar/busbar?rev=08d4d7c501ccb9f734a8d088c242addb2e5fb444#08d4d7c501ccb9f734a8d088c242addb2e5fb444" dependencies = [ "async-trait", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index 13b0561..9518f66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,8 @@ # `.busbar-ref`; no sibling-checkout path dependency ships in any manifest. # # THIRD-PARTY VERSIONS ARE THE FLEET'S, NOT THIS REPO'S. The table below is busbar's own root -# `[workspace.dependencies]` (third-party rows) at busbar 7263f4e61b7af7fdadb9079394d139547e61d1c0, followed by the plugin-only rows -# of busbar's `.github/fleet/deps.toml` at 7263f4e61b7af7fdadb9079394d139547e61d1c0. A member takes a crate with +# `[workspace.dependencies]` (third-party rows) at busbar 08d4d7c501ccb9f734a8d088c242addb2e5fb444, followed by the plugin-only rows +# of busbar's `.github/fleet/deps.toml` at 08d4d7c501ccb9f734a8d088c242addb2e5fb444. A member takes a crate with # `{ workspace = true }` (adding features if it needs them); a crate in neither table is a new # `deps.toml` row in busbar first. CI holds this repo's Cargo.lock to busbar's lock at the pin. [workspace] @@ -43,7 +43,7 @@ busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "08d busbar-core-connector = { git = "https://github.com/GetBusbar/busbar", rev = "08d4d7c501ccb9f734a8d088c242addb2e5fb444", features = ["test-support"] } busbar-transport-http = { git = "https://github.com/GetBusbar/busbar-transport-http", rev = "12b078389496d4c1fd81b730f5d9d0887537c3b0" } busbar-transport-tcp = { git = "https://github.com/GetBusbar/busbar-transport-tcp", rev = "223ec3f02000de94089a1752635b9e206f7492e5" } -# busbar's root [workspace.dependencies], third-party rows, at 7263f4e61b7af7fdadb9079394d139547e61d1c0 +# busbar's root [workspace.dependencies], third-party rows, at 08d4d7c501ccb9f734a8d088c242addb2e5fb444 arc-swap = "1" async-trait = "0.1" axum = "0.8" @@ -114,7 +114,7 @@ url = "2" webpki = { package = "rustls-webpki", version = "0.103", default-features = false, features = ["std", "ring"] } webpki-roots = "1" zeroize = "1" -# busbar .github/fleet/deps.toml [plugin-deps], at 7263f4e61b7af7fdadb9079394d139547e61d1c0 +# busbar .github/fleet/deps.toml [plugin-deps], at 08d4d7c501ccb9f734a8d088c242addb2e5fb444 fallible-iterator = "0.2" ldap3 = { version = "0.12", default-features = false, features = ["sync"] } mysql = { version = "28", default-features = false, features = ["minimal-rust"] } @@ -136,4 +136,4 @@ ulid = "1" # patches them to its own tree. The source is busbar spelled through www.github.com: Cargo # refuses a patch that names the source it patches. [patch."https://github.com/GetBusbar/busbar"] -busbar-contract = { git = "https://www.github.com/GetBusbar/busbar", rev = "7263f4e61b7af7fdadb9079394d139547e61d1c0" } +busbar-contract = { git = "https://www.github.com/GetBusbar/busbar", rev = "08d4d7c501ccb9f734a8d088c242addb2e5fb444" } diff --git a/deny.toml b/deny.toml index 5758759..2dd00f7 100644 --- a/deny.toml +++ b/deny.toml @@ -1,5 +1,5 @@ # RENDERED by `busbar-release plugin heal` from GetBusbar/busbar-release template/ and busbar's -# `.github/fleet/deps.toml` at 7263f4e61b7af7fdadb9079394d139547e61d1c0; a hand edit is overwritten by the next sync. CI runs +# `.github/fleet/deps.toml` at 08d4d7c501ccb9f734a8d088c242addb2e5fb444; a hand edit is overwritten by the next sync. CI runs # `cargo deny check` on it (busbar's plugin-ci.yml at the pin). The license allowlist is busbar's own; # the one reviewed git source is busbar itself, at the pin. [graph] diff --git a/export-webhook/declares.json b/export-webhook/declares.json index 4c2cf0c..53be5ba 100644 --- a/export-webhook/declares.json +++ b/export-webhook/declares.json @@ -1,8 +1,4 @@ { - "contract_abi": { - "min": 3, - "max": 3 - }, "metrics": [ { "name": "busbar_webhook_logs_dropped_total",