diff --git a/.busbar-ref b/.busbar-ref index a483331..9e85a74 100644 --- a/.busbar-ref +++ b/.busbar-ref @@ -1 +1 @@ -daf4c0275e734fe1988053e241486042351b8fb3 1.6.0 +7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4 1.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a0da25..635a6cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ permissions: jobs: ci: - uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4 with: service: none busbar_checkout: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1cd835e..b2643e0 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@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4 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@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4 with: version: ${{ github.ref_name }} asset_prefix: busbar-export-webhook diff --git a/.github/workflows/repin.yml b/.github/workflows/repin.yml index d537269..4480b32 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@daf4c0275e734fe1988053e241486042351b8fb3 + uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4 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 66c3a0a..e277d32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,15 +21,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - [[package]] name = "arc-swap" version = "1.9.2" @@ -210,7 +201,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "busbar-contract" version = "1.6.0" -source = "git+https://www.github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://www.github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "async-trait", "base64 0.22.1", @@ -233,7 +224,7 @@ dependencies = [ [[package]] name = "busbar-core-connector" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "busbar-kernel", @@ -282,7 +273,7 @@ dependencies = [ [[package]] name = "busbar-kernel" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "arc-swap", "async-trait", @@ -312,7 +303,6 @@ dependencies = [ "hyper-util", "indexmap", "metrics", - "metrics-exporter-prometheus", "metrics-util", "ring", "serde", @@ -324,6 +314,7 @@ dependencies = [ "tokio-util", "tower", "tracing", + "tracing-log", "tracing-subscriber", "url", "zeroize", @@ -332,7 +323,7 @@ dependencies = [ [[package]] name = "busbar-kernel-audit" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "ed25519-dalek", @@ -343,7 +334,7 @@ dependencies = [ [[package]] name = "busbar-kernel-breaker" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "httpdate", @@ -352,7 +343,7 @@ dependencies = [ [[package]] name = "busbar-kernel-egress" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "bytes", @@ -362,7 +353,7 @@ dependencies = [ [[package]] name = "busbar-kernel-identity" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "hex", @@ -374,7 +365,7 @@ dependencies = [ [[package]] name = "busbar-kernel-ledger" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "ring", @@ -384,7 +375,7 @@ dependencies = [ [[package]] name = "busbar-kernel-scope" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", ] @@ -392,7 +383,7 @@ dependencies = [ [[package]] name = "busbar-kernel-wal" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "ring", @@ -401,7 +392,7 @@ dependencies = [ [[package]] name = "busbar-plugin-loader" version = "1.5.0" -source = "git+https://github.com/GetBusbar/busbar?rev=daf4c0275e734fe1988053e241486042351b8fb3#daf4c0275e734fe1988053e241486042351b8fb3" +source = "git+https://github.com/GetBusbar/busbar?rev=7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4#7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" dependencies = [ "busbar-contract", "busbar-kernel-ledger", @@ -423,7 +414,7 @@ dependencies = [ [[package]] name = "busbar-transport-http" version = "1.6.0" -source = "git+https://github.com/GetBusbar/busbar-transport-http?rev=fc91230af97997994e9206124ee7414f3aec6eee#fc91230af97997994e9206124ee7414f3aec6eee" +source = "git+https://github.com/GetBusbar/busbar-transport-http?rev=9e0d6fee15e14d9a4b6af1f0e1b9f0e95655f03a#9e0d6fee15e14d9a4b6af1f0e1b9f0e95655f03a" dependencies = [ "busbar-contract", "bytes", @@ -653,18 +644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "evmap" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8874945f036109c72242964c1174cf99434e30cfa45bf45fedc983f50046f8" -dependencies = [ - "hashbag", - "left-right", - "smallvec", + "windows-sys 0.52.0", ] [[package]] @@ -820,21 +800,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generator" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f04ae4152da20c76fe800fa48659201d5cf627c5149ca0b707b69d7eef6cf9" -dependencies = [ - "cc", - "cfg-if", - "libc", - "log", - "rustversion", - "windows-link", - "windows-result", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -887,12 +852,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbag" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7040a10f52cba493ddb09926e15d10a9d8a28043708a405931fe4c6f19fac064" - [[package]] name = "hashbrown" version = "0.16.1" @@ -1068,17 +1027,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "left-right" -version = "0.11.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0c21e4c8ff95f487fb34e6f9182875f42c84cef966d29216bf115d9bba835a" -dependencies = [ - "crossbeam-utils", - "loom", - "slab", -] - [[package]] name = "libc" version = "0.2.189" @@ -1101,28 +1049,6 @@ version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5" -[[package]] -name = "loom" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "matchers" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" -dependencies = [ - "regex-automata", -] - [[package]] name = "matchit" version = "0.8.4" @@ -1145,21 +1071,6 @@ dependencies = [ "rapidhash", ] -[[package]] -name = "metrics-exporter-prometheus" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db0d8f1fc9e62caebd0319e11eaec5822b0186c171568f0480b46a0137f9108" -dependencies = [ - "base64 0.22.1", - "evmap", - "indexmap", - "metrics", - "metrics-util", - "quanta", - "thiserror", -] - [[package]] name = "metrics-util" version = "0.20.4" @@ -1527,23 +1438,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "regex-automata" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - [[package]] name = "rend" version = "0.5.3" @@ -1657,12 +1551,6 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "semver" version = "1.0.28" @@ -2140,14 +2028,10 @@ version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ - "matchers", "nu-ansi-term", - "once_cell", - "regex-automata", "sharded-slab", "smallvec", "thread_local", - "tracing", "tracing-core", "tracing-log", ] @@ -2359,15 +2243,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-sys" version = "0.52.0" diff --git a/Cargo.toml b/Cargo.toml index dbfcb22..1e9f7bd 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 daf4c0275e734fe1988053e241486042351b8fb3, followed by the plugin-only rows -# of busbar's `.github/fleet/deps.toml` at daf4c0275e734fe1988053e241486042351b8fb3. A member takes a crate with +# `[workspace.dependencies]` (third-party rows) at busbar 7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4, followed by the plugin-only rows +# of busbar's `.github/fleet/deps.toml` at 7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4. 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] @@ -29,15 +29,15 @@ publish = false repository = "https://github.com/GetBusbar/busbar-export-webhook" [workspace.dependencies] -busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "daf4c0275e734fe1988053e241486042351b8fb3" } -busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "daf4c0275e734fe1988053e241486042351b8fb3" } +busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" } +busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" } # 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 = "daf4c0275e734fe1988053e241486042351b8fb3", features = ["test-support"] } -busbar-transport-http = { git = "https://github.com/GetBusbar/busbar-transport-http", rev = "fc91230af97997994e9206124ee7414f3aec6eee" } +busbar-core-connector = { git = "https://github.com/GetBusbar/busbar", rev = "7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4", features = ["test-support"] } +busbar-transport-http = { git = "https://github.com/GetBusbar/busbar-transport-http", rev = "9e0d6fee15e14d9a4b6af1f0e1b9f0e95655f03a" } busbar-transport-tcp = { git = "https://github.com/GetBusbar/busbar-transport-tcp", rev = "89d08ebcb91e5b2d4001b667fba151d9bc09d22d" } -# busbar's root [workspace.dependencies], third-party rows, at daf4c0275e734fe1988053e241486042351b8fb3 +# busbar's root [workspace.dependencies], third-party rows, at 7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4 a2a-lf = "0.3.0" a2a-pb = "0.2.0" arc-swap = "1" @@ -113,7 +113,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 daf4c0275e734fe1988053e241486042351b8fb3 +# busbar .github/fleet/deps.toml [plugin-deps], at 7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4 ldap3 = { version = "0.12", default-features = false, features = ["sync"] } mysql = { version = "28", default-features = false, features = ["minimal-rust"] } mysql_common = { version = "0.35", default-features = false } @@ -128,4 +128,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 = "daf4c0275e734fe1988053e241486042351b8fb3" } +busbar-contract = { git = "https://www.github.com/GetBusbar/busbar", rev = "7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4" } diff --git a/deny.toml b/deny.toml index f931e1d..8d0f7ef 100644 --- a/deny.toml +++ b/deny.toml @@ -1,5 +1,5 @@ # RENDERED by `busbar-release plugin sync` from GetBusbar/busbar-release template/ and busbar's -# `.github/fleet/deps.toml` at daf4c0275e734fe1988053e241486042351b8fb3; a hand edit is overwritten by the next sync. CI runs +# `.github/fleet/deps.toml` at 7356bbfb6baeb0e9245a59dc74f8b4bfadb2c5a4; 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-plugin/tests/support/conformance_host.rs b/export-webhook-plugin/tests/support/conformance_host.rs index 3687e06..83f0757 100644 --- a/export-webhook-plugin/tests/support/conformance_host.rs +++ b/export-webhook-plugin/tests/support/conformance_host.rs @@ -228,6 +228,7 @@ impl Opened { name: plugin.name().to_owned(), claims: stated.claims, composes_over: stated.composes_over, + status_rows: stated.status_rows, }; Self { plugin, facts } }