From 7165aed53534869ff00841122e10b5e1e7ea2629 Mon Sep 17 00:00:00 2001 From: MasterPtato <23087326+MasterPtato@users.noreply.github.com> Date: Fri, 2 Aug 2024 03:29:40 +0000 Subject: [PATCH] chore(workflows): remove foo pkg (#964) ## Changes --- svc/Cargo.toml | 1 - svc/pkg/foo/worker/Cargo.toml | 12 ----- svc/pkg/foo/worker/Service.toml | 7 --- svc/pkg/foo/worker/src/lib.rs | 12 ----- svc/pkg/foo/worker/src/workflows/mod.rs | 1 - svc/pkg/foo/worker/src/workflows/test.rs | 50 ------------------- svc/pkg/foo/worker/tests/test.rs | 27 ---------- .../standalone/workflow-worker/Cargo.toml | 2 - .../standalone/workflow-worker/src/lib.rs | 2 +- 9 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 svc/pkg/foo/worker/Cargo.toml delete mode 100644 svc/pkg/foo/worker/Service.toml delete mode 100644 svc/pkg/foo/worker/src/lib.rs delete mode 100644 svc/pkg/foo/worker/src/workflows/mod.rs delete mode 100644 svc/pkg/foo/worker/src/workflows/test.rs delete mode 100644 svc/pkg/foo/worker/tests/test.rs diff --git a/svc/Cargo.toml b/svc/Cargo.toml index a89a0578a3..d644ac3502 100644 --- a/svc/Cargo.toml +++ b/svc/Cargo.toml @@ -107,7 +107,6 @@ members = [ "pkg/faker/ops/region", "pkg/faker/ops/team", "pkg/faker/ops/user", - "pkg/foo/worker", "pkg/game-user/ops/create", "pkg/game-user/ops/get", "pkg/game-user/ops/link-create", diff --git a/svc/pkg/foo/worker/Cargo.toml b/svc/pkg/foo/worker/Cargo.toml deleted file mode 100644 index e04e8d501e..0000000000 --- a/svc/pkg/foo/worker/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "foo-worker" -version = "0.0.1" -edition = "2021" -authors = ["Rivet Gaming, LLC "] -license = "Apache-2.0" - -[dependencies] -chirp-workflow = { path = "../../../../lib/chirp-workflow/core" } -serde = { version = "1.0.198", features = ["derive"] } - -user-get = { path = "../../user/ops/get" } diff --git a/svc/pkg/foo/worker/Service.toml b/svc/pkg/foo/worker/Service.toml deleted file mode 100644 index ab2c1e56de..0000000000 --- a/svc/pkg/foo/worker/Service.toml +++ /dev/null @@ -1,7 +0,0 @@ -[service] -name = "foo-worker" - -[runtime] -kind = "rust" - -[consumer] diff --git a/svc/pkg/foo/worker/src/lib.rs b/svc/pkg/foo/worker/src/lib.rs deleted file mode 100644 index a7d563adc9..0000000000 --- a/svc/pkg/foo/worker/src/lib.rs +++ /dev/null @@ -1,12 +0,0 @@ -use chirp_workflow::prelude::*; - -pub mod workflows; - -pub fn registry() -> Registry { - use workflows::*; - - let mut registry = Registry::new(); - registry.register_workflow::(); - - registry -} diff --git a/svc/pkg/foo/worker/src/workflows/mod.rs b/svc/pkg/foo/worker/src/workflows/mod.rs deleted file mode 100644 index 7b788c207b..0000000000 --- a/svc/pkg/foo/worker/src/workflows/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod test; diff --git a/svc/pkg/foo/worker/src/workflows/test.rs b/svc/pkg/foo/worker/src/workflows/test.rs deleted file mode 100644 index 0d7646ea14..0000000000 --- a/svc/pkg/foo/worker/src/workflows/test.rs +++ /dev/null @@ -1,50 +0,0 @@ -use chirp_workflow::prelude::*; - -#[derive(Debug, Serialize, Deserialize)] -pub struct TestInput { - pub x: i64, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct TestOutput { - pub y: i64, -} - -#[workflow(Test)] -pub async fn test(ctx: &mut WorkflowCtx, input: &TestInput) -> GlobalResult { - ctx.activity(FooInput {}).await?; - - let sig = ctx.listen::().await?; - - Ok(TestOutput { y: input.x + sig.x }) -} - -#[signal("foo-bar")] -pub struct FooBarSignal { - pub x: i64, -} - -#[derive(Debug, Serialize, Deserialize, Hash)] -struct FooInput {} - -#[derive(Debug, Serialize, Deserialize, Hash)] -struct FooOutput { - ids: Vec, -} - -#[activity(Foo)] -async fn foo(ctx: &ActivityCtx, input: &FooInput) -> GlobalResult { - let ids = sql_fetch_all!( - [ctx, (Uuid,)] - " - SELECT datacenter_id - FROM db_cluster.datacenters - ", - ) - .await? - .into_iter() - .map(|(id,)| id) - .collect(); - - Ok(FooOutput { ids }) -} diff --git a/svc/pkg/foo/worker/tests/test.rs b/svc/pkg/foo/worker/tests/test.rs deleted file mode 100644 index 5a6f4a8898..0000000000 --- a/svc/pkg/foo/worker/tests/test.rs +++ /dev/null @@ -1,27 +0,0 @@ -use chirp_workflow::prelude::*; -use serde_json::json; - -#[workflow_test] -async fn empty(ctx: TestCtx) { - let tags = json!({ - "amog": "us", - }); - - let id = ctx - .dispatch_tagged_workflow(&tags, foo_worker::workflows::test::TestInput { x: -2 }) - .await - .unwrap(); - - tokio::time::sleep(std::time::Duration::from_secs(12)).await; - - ctx.tagged_signal(&tags, foo_worker::workflows::test::FooBarSignal { x: 400 }) - .await - .unwrap(); - - let res = ctx - .wait_for_workflow::(id) - .await - .unwrap(); - - tracing::info!(?res); -} diff --git a/svc/pkg/monolith/standalone/workflow-worker/Cargo.toml b/svc/pkg/monolith/standalone/workflow-worker/Cargo.toml index 63602ff782..ff6ef48e96 100644 --- a/svc/pkg/monolith/standalone/workflow-worker/Cargo.toml +++ b/svc/pkg/monolith/standalone/workflow-worker/Cargo.toml @@ -10,5 +10,3 @@ chirp-workflow = { path = "../../../../../lib/chirp-workflow/core" } rivet-health-checks = { path = "../../../../../lib/health-checks" } rivet-metrics = { path = "../../../../../lib/metrics" } rivet-runtime = { path = "../../../../../lib/runtime" } - -foo-worker = { path = "../../../foo/worker" } diff --git a/svc/pkg/monolith/standalone/workflow-worker/src/lib.rs b/svc/pkg/monolith/standalone/workflow-worker/src/lib.rs index e4dda933d0..a3efab952d 100644 --- a/svc/pkg/monolith/standalone/workflow-worker/src/lib.rs +++ b/svc/pkg/monolith/standalone/workflow-worker/src/lib.rs @@ -2,7 +2,7 @@ use chirp_workflow::prelude::*; #[tracing::instrument(skip_all)] pub async fn run_from_env(pools: rivet_pools::Pools) -> GlobalResult<()> { - let reg = foo_worker::registry(); + let reg = Registry::new(); let db = db::DatabasePostgres::from_pool(pools.crdb().unwrap()); let worker = Worker::new(reg.handle(), db.clone());