refactor(api-keys): extract es-entity-rs boilerplate (#3808)

* chore: notifications boilerplate

* chore: es-entity-rs boilerplate

* chore(es-entity): add EntityError w deps

* chore: use es-entity in api-keys

* fix(api-keys): add es-entity dep to test

.github/labeler.yml

@@ -31,3 +31,9 @@ api-keys:
   - core/api-keys/*
   - flake.lock
   - Cargo.lock
+
+notifications:
+  - third-party/rust/*
+  - core/notifications/*
+  - flake.lock
+  - Cargo.lock

.github/workflows/buck2-test.yaml

@@ -23,7 +23,7 @@ jobs:
           ${{ toJSON(github.event.pull_request.labels.*.name) }}
           EOF
 
-          DEFAULT_LABELS=("dashboard" "consent" "pay" "core", "api-keys")
+          DEFAULT_LABELS=("dashboard" "consent" "pay" "core", "api-keys", "notfications")
           LABELS=($(jq -r '.[]' < labels.json))
           if [ ${#LABELS[@]} -eq 0 ]; then
               LABELS=("${DEFAULT_LABELS[@]}")
@@ -37,7 +37,7 @@ jobs:
               core)
                 ARGS+=" //core/api:test"
                 ;;
-              api-keys)
+              api-keys|notifications)
                 ARGS+=" //core/$LABEL:test"
                 ;;
             esac

Cargo.toml

@@ -5,7 +5,9 @@ debug = true
 resolver = "2"
 members = [
     "core/api-keys",
+    "core/notifications",
     "lib/tracing-rs",
+    "lib/es-entity-rs",
 ]
 
 [workspace.dependencies]
@@ -15,6 +17,7 @@ async-graphql-axum = "6.0.9"
 axum = { version = "0.6.20", features = ["headers", "macros"] }
 jsonwebtoken = "9.2.0"
 clap = { version = "4.4", features = ["derive", "env"] }
+derive_builder = "0.12.0"
 serde = { version = "1.0.158", features = ["derive"] }
 tokio = { version = "1.33.0", features = ["full"] }
 reqwest = { version = "0.11.23", default-features = false, features = ["json", "rustls-tls"] }

core/api-keys/BUCK

@@ -46,6 +46,7 @@ rust_library(
     edition = "2021",
     deps = [
         "//lib/tracing-rs:tracing",
+        "//lib/es-entity-rs:es-entity",
         "//third-party/rust:tokio",
         "//third-party/rust:anyhow",
         "//third-party/rust:async-graphql",
@@ -88,6 +89,7 @@ rust_test(
     crate_root = "src/lib.rs",
     deps = [
         "//lib/tracing-rs:tracing",
+        "//lib/es-entity-rs:es-entity",
         "//third-party/rust:tokio",
         "//third-party/rust:anyhow",
         "//third-party/rust:async-graphql",

core/api-keys/Cargo.toml

@@ -16,6 +16,7 @@ fail-on-warnings = []
 
 [dependencies]
 tracing = { path = "../../lib/tracing-rs" }
+es-entity = { path = "../../lib/es-entity-rs" }
 
 anyhow = { workspace = true }
 async-graphql = { workspace = true }

core/api-keys/src/identity/mod.rs

@@ -7,8 +7,8 @@ use std::sync::Arc;
 
 pub use error::*;
 
-crate::entity_id! { IdentityApiKeyId }
-crate::entity_id! { IdentityId }
+es_entity::entity_id! { IdentityApiKeyId }
+es_entity::entity_id! { IdentityId }
 
 #[derive(Debug)]
 pub struct IdentityApiKey {

core/api-keys/src/lib.rs

@@ -3,7 +3,6 @@
 
 pub mod app;
 pub mod cli;
-mod entity;
 pub mod graphql;
 pub mod identity;
 pub mod scope;