From 88c673dd44eec0eb889546c758a07db22b6d01d8 Mon Sep 17 00:00:00 2001 From: Yordis Prieto Date: Thu, 2 Apr 2026 19:57:02 -0400 Subject: [PATCH] refactor: rename trogon-sink-github to trogon-source-github Signed-off-by: Yordis Prieto --- devops/docker/compose/compose.yml | 8 ++++---- rsworkspace/Cargo.lock | 10 +++++----- rsworkspace/crates/acp-telemetry/src/service_name.rs | 10 +++++----- .../Cargo.toml | 4 ++-- .../Dockerfile | 10 +++++----- .../src/config.rs | 0 .../src/constants.rs | 0 .../src/lib.rs | 2 +- .../src/main.rs | 8 ++++---- .../src/server.rs | 0 .../src/signature.rs | 0 11 files changed, 26 insertions(+), 26 deletions(-) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/Cargo.toml (93%) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/Dockerfile (82%) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/src/config.rs (100%) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/src/constants.rs (100%) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/src/lib.rs (98%) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/src/main.rs (78%) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/src/server.rs (100%) rename rsworkspace/crates/{trogon-sink-github => trogon-source-github}/src/signature.rs (100%) diff --git a/devops/docker/compose/compose.yml b/devops/docker/compose/compose.yml index 3e227982e..c10ad43d3 100644 --- a/devops/docker/compose/compose.yml +++ b/devops/docker/compose/compose.yml @@ -20,10 +20,10 @@ services: start_period: 5s retries: 3 - trogon-sink-github: + trogon-source-github: build: context: ../../../rsworkspace - dockerfile: crates/trogon-sink-github/Dockerfile + dockerfile: crates/trogon-source-github/Dockerfile ports: - "${GITHUB_WEBHOOK_PORT:-8080}:${GITHUB_WEBHOOK_PORT:-8080}" environment: @@ -55,9 +55,9 @@ services: - --url - "${SMEE_URL:?SMEE_URL is required — create a channel at https://smee.io}" - --target - - "http://trogon-sink-github:${GITHUB_WEBHOOK_PORT:-8080}/webhook" + - "http://trogon-source-github:${GITHUB_WEBHOOK_PORT:-8080}/webhook" depends_on: - trogon-sink-github: + trogon-source-github: condition: service_healthy restart: unless-stopped profiles: diff --git a/rsworkspace/Cargo.lock b/rsworkspace/Cargo.lock index 1b62a7563..8bb559453 100644 --- a/rsworkspace/Cargo.lock +++ b/rsworkspace/Cargo.lock @@ -1115,9 +1115,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -2641,7 +2641,7 @@ dependencies = [ ] [[package]] -name = "trogon-sink-github" +name = "trogon-source-github" version = "0.1.0" dependencies = [ "acp-telemetry", @@ -3220,9 +3220,9 @@ dependencies = [ [[package]] name = "writeable" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "yoke" diff --git a/rsworkspace/crates/acp-telemetry/src/service_name.rs b/rsworkspace/crates/acp-telemetry/src/service_name.rs index 4d3eb701b..1b4770f98 100644 --- a/rsworkspace/crates/acp-telemetry/src/service_name.rs +++ b/rsworkspace/crates/acp-telemetry/src/service_name.rs @@ -5,7 +5,7 @@ pub enum ServiceName { AcpNatsStdio, AcpNatsWs, - TrogonSinkGithub, + TrogonSourceGithub, } impl ServiceName { @@ -13,7 +13,7 @@ impl ServiceName { match self { Self::AcpNatsStdio => "acp-nats-stdio", Self::AcpNatsWs => "acp-nats-ws", - Self::TrogonSinkGithub => "trogon-sink-github", + Self::TrogonSourceGithub => "trogon-source-github", } } } @@ -32,7 +32,7 @@ mod tests { fn as_str_returns_expected_values() { assert_eq!(ServiceName::AcpNatsStdio.as_str(), "acp-nats-stdio"); assert_eq!(ServiceName::AcpNatsWs.as_str(), "acp-nats-ws"); - assert_eq!(ServiceName::TrogonSinkGithub.as_str(), "trogon-sink-github"); + assert_eq!(ServiceName::TrogonSourceGithub.as_str(), "trogon-source-github"); } #[test] @@ -40,8 +40,8 @@ mod tests { assert_eq!(format!("{}", ServiceName::AcpNatsStdio), "acp-nats-stdio"); assert_eq!(format!("{}", ServiceName::AcpNatsWs), "acp-nats-ws"); assert_eq!( - format!("{}", ServiceName::TrogonSinkGithub), - "trogon-sink-github" + format!("{}", ServiceName::TrogonSourceGithub), + "trogon-source-github" ); } } diff --git a/rsworkspace/crates/trogon-sink-github/Cargo.toml b/rsworkspace/crates/trogon-source-github/Cargo.toml similarity index 93% rename from rsworkspace/crates/trogon-sink-github/Cargo.toml rename to rsworkspace/crates/trogon-source-github/Cargo.toml index 70cb24030..96af9a487 100644 --- a/rsworkspace/crates/trogon-sink-github/Cargo.toml +++ b/rsworkspace/crates/trogon-source-github/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "trogon-sink-github" +name = "trogon-source-github" version = "0.1.0" edition = "2024" @@ -7,7 +7,7 @@ edition = "2024" workspace = true [[bin]] -name = "trogon-sink-github" +name = "trogon-source-github" path = "src/main.rs" [dependencies] diff --git a/rsworkspace/crates/trogon-sink-github/Dockerfile b/rsworkspace/crates/trogon-source-github/Dockerfile similarity index 82% rename from rsworkspace/crates/trogon-sink-github/Dockerfile rename to rsworkspace/crates/trogon-source-github/Dockerfile index 384593caa..ca5b988e6 100644 --- a/rsworkspace/crates/trogon-sink-github/Dockerfile +++ b/rsworkspace/crates/trogon-source-github/Dockerfile @@ -17,13 +17,13 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder COPY --from=planner /build/recipe.json recipe.json -RUN cargo chef cook --release --recipe-path recipe.json -p trogon-sink-github +RUN cargo chef cook --release --recipe-path recipe.json -p trogon-source-github COPY Cargo.toml Cargo.lock ./ COPY crates/ crates/ -RUN cargo build --release -p trogon-sink-github && \ - strip target/release/trogon-sink-github +RUN cargo build --release -p trogon-source-github && \ + strip target/release/trogon-source-github # ── Stage 4: runtime ──────────────────────────────────────────────────────── FROM debian:bookworm-20250317-slim AS runtime @@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN useradd --no-create-home --shell /usr/sbin/nologin trogon -COPY --from=builder /build/target/release/trogon-sink-github /usr/local/bin/trogon-sink-github +COPY --from=builder /build/target/release/trogon-source-github /usr/local/bin/trogon-source-github USER trogon @@ -42,4 +42,4 @@ EXPOSE 8080 STOPSIGNAL SIGTERM -ENTRYPOINT ["/usr/local/bin/trogon-sink-github"] +ENTRYPOINT ["/usr/local/bin/trogon-source-github"] diff --git a/rsworkspace/crates/trogon-sink-github/src/config.rs b/rsworkspace/crates/trogon-source-github/src/config.rs similarity index 100% rename from rsworkspace/crates/trogon-sink-github/src/config.rs rename to rsworkspace/crates/trogon-source-github/src/config.rs diff --git a/rsworkspace/crates/trogon-sink-github/src/constants.rs b/rsworkspace/crates/trogon-source-github/src/constants.rs similarity index 100% rename from rsworkspace/crates/trogon-sink-github/src/constants.rs rename to rsworkspace/crates/trogon-source-github/src/constants.rs diff --git a/rsworkspace/crates/trogon-sink-github/src/lib.rs b/rsworkspace/crates/trogon-source-github/src/lib.rs similarity index 98% rename from rsworkspace/crates/trogon-sink-github/src/lib.rs rename to rsworkspace/crates/trogon-source-github/src/lib.rs index 863dd9506..1e2577908 100644 --- a/rsworkspace/crates/trogon-sink-github/src/lib.rs +++ b/rsworkspace/crates/trogon-source-github/src/lib.rs @@ -1,4 +1,4 @@ -//! # trogon-sink-github +//! # trogon-source-github //! //! GitHub webhook receiver that publishes events to NATS JetStream. //! diff --git a/rsworkspace/crates/trogon-sink-github/src/main.rs b/rsworkspace/crates/trogon-source-github/src/main.rs similarity index 78% rename from rsworkspace/crates/trogon-sink-github/src/main.rs rename to rsworkspace/crates/trogon-source-github/src/main.rs index 12c3e2989..fb39dc701 100644 --- a/rsworkspace/crates/trogon-sink-github/src/main.rs +++ b/rsworkspace/crates/trogon-source-github/src/main.rs @@ -1,8 +1,8 @@ #[cfg(not(coverage))] use { acp_telemetry::ServiceName, tracing::error, tracing::info, trogon_nats::connect, - trogon_nats::jetstream::NatsJetStreamClient, trogon_sink_github::GithubConfig, - trogon_sink_github::constants::DEFAULT_NATS_CONNECT_TIMEOUT, trogon_std::env::SystemEnv, + trogon_nats::jetstream::NatsJetStreamClient, trogon_source_github::GithubConfig, + trogon_source_github::constants::DEFAULT_NATS_CONNECT_TIMEOUT, trogon_std::env::SystemEnv, trogon_std::fs::SystemFs, }; @@ -12,7 +12,7 @@ async fn main() -> Result<(), Box> { let config = GithubConfig::from_env(&SystemEnv); acp_telemetry::init_logger( - ServiceName::TrogonSinkGithub, + ServiceName::TrogonSourceGithub, &config.subject_prefix, &SystemEnv, &SystemFs, @@ -22,7 +22,7 @@ async fn main() -> Result<(), Box> { let nats = connect(&config.nats, DEFAULT_NATS_CONNECT_TIMEOUT).await?; let js = NatsJetStreamClient::new(async_nats::jetstream::new(nats)); - let result = trogon_sink_github::serve(js, config).await; + let result = trogon_source_github::serve(js, config).await; if let Err(ref e) = result { error!(error = %e, "GitHub webhook server stopped with error"); diff --git a/rsworkspace/crates/trogon-sink-github/src/server.rs b/rsworkspace/crates/trogon-source-github/src/server.rs similarity index 100% rename from rsworkspace/crates/trogon-sink-github/src/server.rs rename to rsworkspace/crates/trogon-source-github/src/server.rs diff --git a/rsworkspace/crates/trogon-sink-github/src/signature.rs b/rsworkspace/crates/trogon-source-github/src/signature.rs similarity index 100% rename from rsworkspace/crates/trogon-sink-github/src/signature.rs rename to rsworkspace/crates/trogon-source-github/src/signature.rs