From 8621d7e4fb68c16b6d89354fff3b389a90959be9 Mon Sep 17 00:00:00 2001 From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com> Date: Thu, 15 Oct 2026 06:46:07 +0000 Subject: [PATCH] fleet: render the busbar-release plugin template (f6c22cb4160c) busbar-release plugin heal busbar-auth-github: template/ at f6c22cb4160c14fc3958dee4f022daa7a6298f96, busbar pin 179abf2c10cf1406778300ef1f1b3964cc229727 (moved from 276a156148703ed720f133ec8791df317a9c44dd), dependency policy at busbar 179abf2c10cf1406778300ef1f1b3964cc229727, plugins.yaml at busbar 179abf2c10cf1406778300ef1f1b3964cc229727. --- .busbar-ref | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/consumer-verify.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/repin.yml | 2 +- Cargo.lock | 8 ++++---- Cargo.toml | 28 +++++++++++++-------------- deny.toml | 22 ++++++++++----------- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.busbar-ref b/.busbar-ref index b060b1a..2191601 100644 --- a/.busbar-ref +++ b/.busbar-ref @@ -1 +1 @@ -276a156148703ed720f133ec8791df317a9c44dd 1.6.0 +179abf2c10cf1406778300ef1f1b3964cc229727 1.6.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1b93a9..c1d9f1a 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@276a156148703ed720f133ec8791df317a9c44dd + uses: GetBusbar/busbar/.github/workflows/plugin-ci.yml@179abf2c10cf1406778300ef1f1b3964cc229727 with: service: wiremock busbar_checkout: true diff --git a/.github/workflows/consumer-verify.yml b/.github/workflows/consumer-verify.yml index 01602c5..4b15ad5 100644 --- a/.github/workflows/consumer-verify.yml +++ b/.github/workflows/consumer-verify.yml @@ -21,7 +21,7 @@ permissions: jobs: consumer: - uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@276a156148703ed720f133ec8791df317a9c44dd + uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@179abf2c10cf1406778300ef1f1b3964cc229727 with: version: ${{ inputs.version || '' }} asset_prefix: busbar-auth-github diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f106e50..bcb84db 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@276a156148703ed720f133ec8791df317a9c44dd + uses: GetBusbar/busbar/.github/workflows/plugin-release.yml@179abf2c10cf1406778300ef1f1b3964cc229727 with: plugin_crate: busbar-auth-github-plugin manifest_name: busbar-auth-github @@ -42,7 +42,7 @@ jobs: consumer-verify: needs: release if: ${{ !cancelled() }} - uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@276a156148703ed720f133ec8791df317a9c44dd + uses: GetBusbar/busbar/.github/workflows/plugin-consumer-verify.yml@179abf2c10cf1406778300ef1f1b3964cc229727 with: version: ${{ github.ref_name }} asset_prefix: busbar-auth-github diff --git a/.github/workflows/repin.yml b/.github/workflows/repin.yml index 8dac433..c60ca3c 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@276a156148703ed720f133ec8791df317a9c44dd + uses: GetBusbar/busbar/.github/workflows/plugin-repin.yml@179abf2c10cf1406778300ef1f1b3964cc229727 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 d8fd73d..776ffc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "busbar-contract" version = "1.6.0" -source = "git+https://www.github.com/GetBusbar/busbar?rev=276a156148703ed720f133ec8791df317a9c44dd#276a156148703ed720f133ec8791df317a9c44dd" +source = "git+https://www.github.com/GetBusbar/busbar?rev=179abf2c10cf1406778300ef1f1b3964cc229727#179abf2c10cf1406778300ef1f1b3964cc229727" dependencies = [ "async-trait", "base64", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "busbar-plugin-loader" version = "1.5.0" -source = "git+https://github.com/GetBusbar/busbar?rev=276a156148703ed720f133ec8791df317a9c44dd#276a156148703ed720f133ec8791df317a9c44dd" +source = "git+https://github.com/GetBusbar/busbar?rev=179abf2c10cf1406778300ef1f1b3964cc229727#179abf2c10cf1406778300ef1f1b3964cc229727" dependencies = [ "busbar-contract", "ed25519-dalek", @@ -913,9 +913,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "once_cell", "ring", diff --git a/Cargo.toml b/Cargo.toml index 5ffb6d6..ac0a85c 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 276a156148703ed720f133ec8791df317a9c44dd, followed by the plugin-only rows -# of busbar's `.github/fleet/deps.toml` at 276a156148703ed720f133ec8791df317a9c44dd. A member takes a crate with +# `[workspace.dependencies]` (third-party rows) at busbar 179abf2c10cf1406778300ef1f1b3964cc229727, followed by the plugin-only rows +# of busbar's `.github/fleet/deps.toml` at 179abf2c10cf1406778300ef1f1b3964cc229727. 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,17 +29,15 @@ publish = false repository = "https://github.com/GetBusbar/busbar-auth-github" [workspace.dependencies] -busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "276a156148703ed720f133ec8791df317a9c44dd" } -busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "276a156148703ed720f133ec8791df317a9c44dd" } +busbar-contract = { git = "https://github.com/GetBusbar/busbar", rev = "179abf2c10cf1406778300ef1f1b3964cc229727" } +busbar-plugin-loader = { git = "https://github.com/GetBusbar/busbar", rev = "179abf2c10cf1406778300ef1f1b3964cc229727" } # THE SUITE'S HOST CONNECTOR (dev-only; auth-github-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 = "276a156148703ed720f133ec8791df317a9c44dd", features = ["test-support"] } -busbar-transport-http = { git = "https://github.com/GetBusbar/busbar-transport-http", rev = "a715d1ab57dcec469930563da0c0509a4fb75289" } -busbar-transport-tcp = { git = "https://github.com/GetBusbar/busbar-transport-tcp", rev = "eb334dd6e9d3dcd62ae1616f77a5ed56311b255a" } -# busbar's root [workspace.dependencies], third-party rows, at 276a156148703ed720f133ec8791df317a9c44dd -a2a-lf = "0.3.0" -a2a-pb = "0.2.0" +busbar-core-connector = { git = "https://github.com/GetBusbar/busbar", rev = "179abf2c10cf1406778300ef1f1b3964cc229727", features = ["test-support"] } +busbar-transport-http = { git = "https://github.com/GetBusbar/busbar-transport-http", rev = "af1a352e7df829e3a4b42539f0cb02ca77639d70" } +busbar-transport-tcp = { git = "https://github.com/GetBusbar/busbar-transport-tcp", rev = "9cb4a0dd92a4a03622754a112b74746114e2126a" } +# busbar's root [workspace.dependencies], third-party rows, at 179abf2c10cf1406778300ef1f1b3964cc229727 aes = { version = "0.8", default-features = false } arc-swap = "1" async-trait = "0.1" @@ -76,9 +74,13 @@ metrics-exporter-prometheus = { version = "0.18.3", default-features = false } metrics-util = { version = "0.20.4", default-features = false } oauth-as = { version = "1.0.0", features = ["http", "jwt", "consent", "resource-metadata", "par", "dpop", "client-assertion"] } opentelemetry-proto = { version = "0.32", default-features = false, features = ["gen-tonic-messages", "trace"] } +pbjson = "0.9" +pbjson-build = "0.9" proc-macro2 = { version = "1", features = ["span-locations"] } proptest = "1" prost = { version = "0.14", default-features = false, features = ["std"] } +prost-build = "0.14" +protoc-bin-vendored = "3" rcgen = { version = "0.14", default-features = false, features = ["crypto", "ring"] } reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream"] } ring = "0.17" @@ -102,8 +104,6 @@ tokio = "1" tokio-rustls = { version = "0.26", default-features = false, features = ["ring"] } tokio-tungstenite = { version = "0.29", default-features = false, features = ["handshake"] } tokio-util = { version = "0.7", default-features = false, features = ["compat"] } -tonic = { version = "0.14", default-features = false } -tonic-types = "0.14" tower = "0.5" tracing = "0.1.44" tracing-core = "0.1" @@ -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 276a156148703ed720f133ec8791df317a9c44dd +# busbar .github/fleet/deps.toml [plugin-deps], at 179abf2c10cf1406778300ef1f1b3964cc229727 fallible-iterator = "0.2" ldap3 = { version = "0.12", default-features = false, features = ["sync"] } mysql = { version = "28", default-features = false, features = ["minimal-rust"] } @@ -132,4 +132,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 = "276a156148703ed720f133ec8791df317a9c44dd" } +busbar-contract = { git = "https://www.github.com/GetBusbar/busbar", rev = "179abf2c10cf1406778300ef1f1b3964cc229727" } diff --git a/deny.toml b/deny.toml index 10c7528..734386a 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 276a156148703ed720f133ec8791df317a9c44dd; a hand edit is overwritten by the next sync. CI runs +# `.github/fleet/deps.toml` at 179abf2c10cf1406778300ef1f1b3964cc229727; 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] @@ -61,10 +61,6 @@ deny = [ { crate = "rustls:<0.23", reason = "one rustls major (0.23) fleet-wide" }, { crate = "ring:<0.17", reason = "one ring major (0.17) fleet-wide" }, { crate = "serde_yaml", reason = "unmaintained; busbar uses serde_yaml_ng" }, - { crate = "a2a-lf:<0.3.0", reason = "busbar resolves a2a-lf to 0.3.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "a2a-lf:>=0.4.0", reason = "busbar resolves a2a-lf to 0.3.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "a2a-pb:<0.2.0", reason = "busbar resolves a2a-pb to 0.2.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "a2a-pb:>=0.3.0", reason = "busbar resolves a2a-pb to 0.2.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "aes:<0.8.0", reason = "busbar resolves aes to 0.8.4; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "aes:>=0.9.0", reason = "busbar resolves aes to 0.8.4; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "arc-swap:<1.0.0", reason = "busbar resolves arc-swap to 1.9.2; a plugin may not pull a second version (OWNER 2026-10-02)" }, @@ -137,20 +133,28 @@ deny = [ { crate = "oauth-as:>=2.0.0", reason = "busbar resolves oauth-as to 1.0.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "opentelemetry-proto:<0.32.0", reason = "busbar resolves opentelemetry-proto to 0.32.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "opentelemetry-proto:>=0.33.0", reason = "busbar resolves opentelemetry-proto to 0.32.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "pbjson:<0.9.0", reason = "busbar resolves pbjson to 0.9.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "pbjson:>=0.10.0", reason = "busbar resolves pbjson to 0.9.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "pbjson-build:<0.9.0", reason = "busbar resolves pbjson-build to 0.9.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "pbjson-build:>=0.10.0", reason = "busbar resolves pbjson-build to 0.9.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "proc-macro2:<1.0.0", reason = "busbar resolves proc-macro2 to 1.0.106; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "proc-macro2:>=2.0.0", reason = "busbar resolves proc-macro2 to 1.0.106; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "proptest:<1.0.0", reason = "busbar resolves proptest to 1.11.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "proptest:>=2.0.0", reason = "busbar resolves proptest to 1.11.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "prost:<0.14.0", reason = "busbar resolves prost to 0.14.3; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "prost:>=0.15.0", reason = "busbar resolves prost to 0.14.3; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "prost-build:<0.14.0", reason = "busbar resolves prost-build to 0.14.3; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "prost-build:>=0.15.0", reason = "busbar resolves prost-build to 0.14.3; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "protoc-bin-vendored:<3.0.0", reason = "busbar resolves protoc-bin-vendored to 3.2.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "protoc-bin-vendored:>=4.0.0", reason = "busbar resolves protoc-bin-vendored to 3.2.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "rcgen:<0.14.0", reason = "busbar resolves rcgen to 0.14.10; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "rcgen:>=0.15.0", reason = "busbar resolves rcgen to 0.14.10; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "reqwest:<0.12.0", reason = "busbar resolves reqwest to 0.12.28; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "reqwest:>=0.13.0", reason = "busbar resolves reqwest to 0.12.28; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "ring:<0.17.0", reason = "busbar resolves ring to 0.17.14; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "ring:>=0.18.0", reason = "busbar resolves ring to 0.17.14; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "rustls:<0.23.0", reason = "busbar resolves rustls to 0.23.45; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "rustls:>=0.24.0", reason = "busbar resolves rustls to 0.23.45; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "rustls:<0.23.0", reason = "busbar resolves rustls to 0.23.46; a plugin may not pull a second version (OWNER 2026-10-02)" }, + { crate = "rustls:>=0.24.0", reason = "busbar resolves rustls to 0.23.46; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "rustls-pki-types:<1.0.0", reason = "busbar resolves rustls-pki-types to 1.15.1; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "rustls-pki-types:>=2.0.0", reason = "busbar resolves rustls-pki-types to 1.15.1; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "schemars:<1.0.0", reason = "busbar resolves schemars to 1.2.2; a plugin may not pull a second version (OWNER 2026-10-02)" }, @@ -189,10 +193,6 @@ deny = [ { crate = "tokio-tungstenite:>=0.30.0", reason = "busbar resolves tokio-tungstenite to 0.29.0; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "tokio-util:<0.7.0", reason = "busbar resolves tokio-util to 0.7.18; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "tokio-util:>=0.8.0", reason = "busbar resolves tokio-util to 0.7.18; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "tonic:<0.14.0", reason = "busbar resolves tonic to 0.14.6; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "tonic:>=0.15.0", reason = "busbar resolves tonic to 0.14.6; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "tonic-types:<0.14.0", reason = "busbar resolves tonic-types to 0.14.6; a plugin may not pull a second version (OWNER 2026-10-02)" }, - { crate = "tonic-types:>=0.15.0", reason = "busbar resolves tonic-types to 0.14.6; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "tower:<0.5.0", reason = "busbar resolves tower to 0.5.3; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "tower:>=0.6.0", reason = "busbar resolves tower to 0.5.3; a plugin may not pull a second version (OWNER 2026-10-02)" }, { crate = "tracing:<0.1.0", reason = "busbar resolves tracing to 0.1.44; a plugin may not pull a second version (OWNER 2026-10-02)" },