refactor(s2n-events): Move s2n-quic event generation program out of s2n-events (#2789)

goatgoose · web-flow · commit d35c22fa7cc9 · 2025-09-09T14:00:36.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -711,11 +711,11 @@ jobs:
 
       - name: Run events codegen
         run: |
-          cargo run --manifest-path ./tools/s2n-events/Cargo.toml
+          cargo run --manifest-path ./tools/event-generator/Cargo.toml
 
       - name: Check to make sure the generated events are up-to-date
         run: |
-          # If this fails you need to run `cargo run --manifest-path ./tools/s2n-events/Cargo.toml`
+          # If this fails you need to run `cargo run --manifest-path ./tools/event-generator/Cargo.toml`
           git diff --exit-code
 
   # ensures there are no unused snapshots
diff --git a/tools/event-generator/Cargo.toml b/tools/event-generator/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "event-generator"
+version = "0.1.0"
+edition = "2024"
+publish = false
+
+[dependencies]
+s2n-events = { path = "../s2n-events" }
+proc-macro2 = "1.0.101"
+quote = "1.0.40"
+glob = "0.3.3"
+
+[workspace]
+members = ["."]
diff --git a/tools/event-generator/src/main.rs b/tools/event-generator/src/main.rs
@@ -3,17 +3,7 @@
 
 use proc_macro2::TokenStream;
 use quote::quote;
-
-type Error = Box<dyn std::error::Error + Send + Sync>;
-type Result<T, E = Error> = core::result::Result<T, E>;
-
-mod output;
-mod output_mode;
-mod parser;
-mod validation;
-
-use output::Output;
-use output_mode::OutputMode;
+use s2n_events::{Output, OutputMode, Result, parser, validation};
 
 struct EventInfo<'a> {
     input_path: &'a str,
diff --git a/tools/s2n-events/src/lib.rs b/tools/s2n-events/src/lib.rs
@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+mod output;
+mod output_mode;
+
+pub mod parser;
+pub mod validation;
+
+pub use output::Output;
+pub use output_mode::OutputMode;
+
+pub type Error = Box<dyn std::error::Error + Send + Sync>;
+pub type Result<T, E = Error> = core::result::Result<T, E>;
