From c406b5af6f40437cc858010a574c02f11730c728 Mon Sep 17 00:00:00 2001 From: eraden Date: Sat, 10 Feb 2024 15:12:53 +0100 Subject: [PATCH] Rename to Squadron --- Cargo.lock | 220 +++++++++--------- Cargo.toml | 24 +- crates/{jet-api => squadron-api}/Cargo.toml | 4 +- crates/{jet-api => squadron-api}/README.md | 0 .../assets/about.html | 0 .../config/jwt-decoding.bin | Bin .../config/jwt-encoding.bin | Bin .../{jet-api => squadron-api}/src/config.rs | 6 +- .../src/config/redis_provider.rs | 6 +- .../src/events/mod.rs | 0 .../src/extractors/mod.rs | 0 .../src/extractors/require_instance.rs | 0 .../src/extractors/user.rs | 0 .../src/http/about.rs | 0 .../src/http/api/authentication.rs | 4 +- .../src/http/api/authentication/api_tokens.rs | 2 +- .../api/authentication/change_password.rs | 6 +- .../http/api/authentication/email_check.rs | 8 +- .../api/authentication/forgot_password.rs | 10 +- .../http/api/authentication/magic_generate.rs | 6 +- .../http/api/authentication/magic_sign_in.rs | 6 +- .../http/api/authentication/reset_password.rs | 6 +- .../src/http/api/authentication/sign_in.rs | 4 +- .../src/http/api/authentication/sign_out.rs | 0 .../src/http/api/authentication/sign_up.rs | 4 +- .../http/api/authentication/social_auth.rs | 4 +- .../http/api/authentication/token_refresh.rs | 0 .../src/http/api/config.rs | 0 .../src/http/api/mod.rs | 0 .../src/http/api/users.rs | 0 .../src/http/api_v1/cycles.rs | 0 .../src/http/api_v1/inbox.rs | 0 .../src/http/api_v1/issues.rs | 0 .../src/http/api_v1/mod.rs | 0 .../src/http/api_v1/modules.rs | 0 .../src/http/api_v1/projects.rs | 0 .../src/http/api_v1/states.rs | 0 .../{jet-api => squadron-api}/src/http/mod.rs | 0 crates/{jet-api => squadron-api}/src/main.rs | 10 +- .../{jet-api => squadron-api}/src/models.rs | 0 .../{jet-api => squadron-api}/src/session.rs | 0 .../src/utils/mod.rs | 0 .../{jet-space => squadron-beat}/Cargo.toml | 2 +- .../{jet-beat => squadron-beat}/src/main.rs | 0 crates/{jet-bg => squadron-bg}/Cargo.toml | 2 +- crates/{jet-bg => squadron-bg}/src/main.rs | 0 .../Cargo.toml | 2 +- .../src/event_bus/messages.rs | 0 .../src/event_bus/mod.rs | 0 .../src/lib.rs | 0 .../src/plugin/messages.rs | 0 .../src/plugin/mod.rs | 0 .../src/redis_models.rs | 0 crates/{jet-plug => squadron-plug}/Cargo.toml | 4 +- crates/{jet-plug => squadron-plug}/src/lib.rs | 4 +- .../{jet-beat => squadron-space}/Cargo.toml | 2 +- .../{jet-space => squadron-space}/src/main.rs | 0 57 files changed, 173 insertions(+), 173 deletions(-) rename crates/{jet-api => squadron-api}/Cargo.toml (97%) rename crates/{jet-api => squadron-api}/README.md (100%) rename crates/{jet-api => squadron-api}/assets/about.html (100%) rename crates/{jet-api => squadron-api}/config/jwt-decoding.bin (100%) rename crates/{jet-api => squadron-api}/config/jwt-encoding.bin (100%) rename crates/{jet-api => squadron-api}/src/config.rs (92%) rename crates/{jet-api => squadron-api}/src/config/redis_provider.rs (90%) rename crates/{jet-api => squadron-api}/src/events/mod.rs (100%) rename crates/{jet-api => squadron-api}/src/extractors/mod.rs (100%) rename crates/{jet-api => squadron-api}/src/extractors/require_instance.rs (100%) rename crates/{jet-api => squadron-api}/src/extractors/user.rs (100%) rename crates/{jet-api => squadron-api}/src/http/about.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api/authentication.rs (99%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/api_tokens.rs (97%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/change_password.rs (99%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/email_check.rs (97%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/forgot_password.rs (97%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/magic_generate.rs (92%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/magic_sign_in.rs (95%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/reset_password.rs (99%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/sign_in.rs (97%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/sign_out.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/sign_up.rs (97%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/social_auth.rs (99%) rename crates/{jet-api => squadron-api}/src/http/api/authentication/token_refresh.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api/config.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api/mod.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api/users.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api_v1/cycles.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api_v1/inbox.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api_v1/issues.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api_v1/mod.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api_v1/modules.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api_v1/projects.rs (100%) rename crates/{jet-api => squadron-api}/src/http/api_v1/states.rs (100%) rename crates/{jet-api => squadron-api}/src/http/mod.rs (100%) rename crates/{jet-api => squadron-api}/src/main.rs (91%) rename crates/{jet-api => squadron-api}/src/models.rs (100%) rename crates/{jet-api => squadron-api}/src/session.rs (100%) rename crates/{jet-api => squadron-api}/src/utils/mod.rs (100%) rename crates/{jet-space => squadron-beat}/Cargo.toml (87%) rename crates/{jet-beat => squadron-beat}/src/main.rs (100%) rename crates/{jet-bg => squadron-bg}/Cargo.toml (94%) rename crates/{jet-bg => squadron-bg}/src/main.rs (100%) rename crates/{jet-contract => squadron-contract}/Cargo.toml (96%) rename crates/{jet-contract => squadron-contract}/src/event_bus/messages.rs (100%) rename crates/{jet-contract => squadron-contract}/src/event_bus/mod.rs (100%) rename crates/{jet-contract => squadron-contract}/src/lib.rs (100%) rename crates/{jet-contract => squadron-contract}/src/plugin/messages.rs (100%) rename crates/{jet-contract => squadron-contract}/src/plugin/mod.rs (100%) rename crates/{jet-contract => squadron-contract}/src/redis_models.rs (100%) rename crates/{jet-plug => squadron-plug}/Cargo.toml (89%) rename crates/{jet-plug => squadron-plug}/src/lib.rs (97%) rename crates/{jet-beat => squadron-space}/Cargo.toml (86%) rename crates/{jet-space => squadron-space}/src/main.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 7293b08..6b780fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1895,116 +1895,6 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" -[[package]] -name = "jet-api" -version = "0.1.0" -dependencies = [ - "actix", - "actix-jwt-session", - "actix-web", - "async-trait", - "base64 0.21.7", - "basen", - "bincode", - "chrono", - "derive_more", - "dotenv", - "entities", - "figment", - "futures", - "futures-util", - "hmac", - "http-api-isahc-client", - "humantime", - "jet-contract", - "oauth2", - "oauth2-amazon", - "oauth2-client", - "oauth2-core", - "oauth2-github", - "oauth2-gitlab", - "oauth2-google", - "oauth2-signin", - "password-hash", - "rand", - "reqwest", - "rumqttc", - "rust-s3", - "sea-orm", - "sentry", - "serde", - "serde-aux", - "serde-email", - "serde_json", - "sha2", - "sqlx", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "tracing-test", - "uuid", - "validators", -] - -[[package]] -name = "jet-beat" -version = "0.1.0" - -[[package]] -name = "jet-bg" -version = "0.1.0" -dependencies = [ - "bincode", - "futures", - "futures-util", - "redis-async", - "rumqttc", - "rust-s3", - "serde", - "serde_json", - "tokio", -] - -[[package]] -name = "jet-contract" -version = "0.1.0" -dependencies = [ - "bincode", - "chrono", - "deadpool-redis", - "derive_more", - "redis", - "rumqttc", - "serde", - "serde_json", - "thiserror", - "uuid", -] - -[[package]] -name = "jet-plug" -version = "0.1.0" -dependencies = [ - "actix", - "actix-web", - "async-trait", - "bincode", - "futures", - "futures-util", - "jet-contract", - "redis-async", - "rumqttc", - "rust-s3", - "serde", - "serde_json", - "tokio", -] - -[[package]] -name = "jet-space" -version = "0.1.0" - [[package]] name = "jobserver" version = "0.1.27" @@ -4221,6 +4111,116 @@ dependencies = [ "uuid", ] +[[package]] +name = "squadron-api" +version = "0.1.0" +dependencies = [ + "actix", + "actix-jwt-session", + "actix-web", + "async-trait", + "base64 0.21.7", + "basen", + "bincode", + "chrono", + "derive_more", + "dotenv", + "entities", + "figment", + "futures", + "futures-util", + "hmac", + "http-api-isahc-client", + "humantime", + "oauth2", + "oauth2-amazon", + "oauth2-client", + "oauth2-core", + "oauth2-github", + "oauth2-gitlab", + "oauth2-google", + "oauth2-signin", + "password-hash", + "rand", + "reqwest", + "rumqttc", + "rust-s3", + "sea-orm", + "sentry", + "serde", + "serde-aux", + "serde-email", + "serde_json", + "sha2", + "sqlx", + "squadron-contract", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", + "tracing-test", + "uuid", + "validators", +] + +[[package]] +name = "squadron-beat" +version = "0.1.0" + +[[package]] +name = "squadron-bg" +version = "0.1.0" +dependencies = [ + "bincode", + "futures", + "futures-util", + "redis-async", + "rumqttc", + "rust-s3", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "squadron-contract" +version = "0.1.0" +dependencies = [ + "bincode", + "chrono", + "deadpool-redis", + "derive_more", + "redis", + "rumqttc", + "serde", + "serde_json", + "thiserror", + "uuid", +] + +[[package]] +name = "squadron-plug" +version = "0.1.0" +dependencies = [ + "actix", + "actix-web", + "async-trait", + "bincode", + "futures", + "futures-util", + "redis-async", + "rumqttc", + "rust-s3", + "serde", + "serde_json", + "squadron-contract", + "tokio", +] + +[[package]] +name = "squadron-space" +version = "0.1.0" + [[package]] name = "static_assertions" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index ccad45b..de959db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,19 +1,19 @@ [workspace] members = [ - "crates/jet-space", - "crates/jet-api", - "crates/jet-bg", - "crates/jet-beat", - "crates/jet-contract", - "crates/jet-plug", + "crates/squadron-space", + "crates/squadron-api", + "crates/squadron-bg", + "crates/squadron-beat", + "crates/squadron-contract", + "crates/squadron-plug", ] resolver = "2" [workspace.dependencies] -jet-contract = { path = "./crates/jet-contract" } -jet-api = { path = "./crates/jet-api" } -jet-bg = { path = "./crates/jet-bg" } -jet-beat = { path = "./crates/jet-beat" } -jet-space = { path = "./crates/jet-space" } -jet-plug = { path = "./crates/jet-plug" } +squadron-contract = { path = "./crates/squadron-contract" } +squadron-api = { path = "./crates/squadron-api" } +squadron-bg = { path = "./crates/squadron-bg" } +squadron-beat = { path = "./crates/squadron-beat" } +squadron-space = { path = "./crates/squadron-space" } +squadron-plug = { path = "./crates/squadron-plug" } entities = { path = "./crates/entities" } diff --git a/crates/jet-api/Cargo.toml b/crates/squadron-api/Cargo.toml similarity index 97% rename from crates/jet-api/Cargo.toml rename to crates/squadron-api/Cargo.toml index 1790a5e..3c9f476 100644 --- a/crates/jet-api/Cargo.toml +++ b/crates/squadron-api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "jet-api" +name = "squadron-api" version = "0.1.0" edition = "2021" @@ -16,7 +16,7 @@ sea-orm = { version = "0.12.11", features = ["postgres-array", "sqlx-all"] } serde = "1.0.195" serde_json = { version = "1.0.111", features = ["raw_value", "alloc"] } tokio = { version = "1.35.1", features = ["full"] } -jet-contract = { workspace = true } +squadron-contract = { workspace = true } uuid = { version = "1.7.0", features = ["v4", "serde"] } entities = { workspace = true } figment = { version = "0.10.14", features = ["env", "toml"] } diff --git a/crates/jet-api/README.md b/crates/squadron-api/README.md similarity index 100% rename from crates/jet-api/README.md rename to crates/squadron-api/README.md diff --git a/crates/jet-api/assets/about.html b/crates/squadron-api/assets/about.html similarity index 100% rename from crates/jet-api/assets/about.html rename to crates/squadron-api/assets/about.html diff --git a/crates/jet-api/config/jwt-decoding.bin b/crates/squadron-api/config/jwt-decoding.bin similarity index 100% rename from crates/jet-api/config/jwt-decoding.bin rename to crates/squadron-api/config/jwt-decoding.bin diff --git a/crates/jet-api/config/jwt-encoding.bin b/crates/squadron-api/config/jwt-encoding.bin similarity index 100% rename from crates/jet-api/config/jwt-encoding.bin rename to crates/squadron-api/config/jwt-encoding.bin diff --git a/crates/jet-api/src/config.rs b/crates/squadron-api/src/config.rs similarity index 92% rename from crates/jet-api/src/config.rs rename to crates/squadron-api/src/config.rs index e92dd90..f3edcd8 100644 --- a/crates/jet-api/src/config.rs +++ b/crates/squadron-api/src/config.rs @@ -38,7 +38,7 @@ pub struct ApplicationConfig { pub enable_magic_link_login: bool, } -pub fn load(redis_client: jet_contract::redis::Client) -> ApplicationConfig { +pub fn load(redis_client: squadron_contract::redis::Client) -> ApplicationConfig { let fields = serde_introspect::(); Figment::new() .merge(Env::raw()) @@ -49,13 +49,13 @@ pub fn load(redis_client: jet_contract::redis::Client) -> ApplicationConfig { #[cfg(test)] mod tests { - use jet_contract::redis::Commands; + use squadron_contract::redis::Commands; use super::*; #[test] fn from_redis() { - let mut client = jet_contract::redis::Client::open("redis://0.0.0.0:6379") + let mut client = squadron_contract::redis::Client::open("redis://0.0.0.0:6379") .expect("Can't connect to redis"); client .mset::<_, _, ()>(&[ diff --git a/crates/jet-api/src/config/redis_provider.rs b/crates/squadron-api/src/config/redis_provider.rs similarity index 90% rename from crates/jet-api/src/config/redis_provider.rs rename to crates/squadron-api/src/config/redis_provider.rs index 9cbdc4f..8190087 100644 --- a/crates/jet-api/src/config/redis_provider.rs +++ b/crates/squadron-api/src/config/redis_provider.rs @@ -1,11 +1,11 @@ use figment::value::{Dict, Map}; use figment::{Error, Profile, Provider}; -use jet_contract::redis; -use jet_contract::redis::Commands; +use squadron_contract::redis; +use squadron_contract::redis::Commands; use tracing::debug; pub struct Redis<'fields> { - conn: jet_contract::redis::Client, + conn: squadron_contract::redis::Client, fields: &'fields [&'fields str], } diff --git a/crates/jet-api/src/events/mod.rs b/crates/squadron-api/src/events/mod.rs similarity index 100% rename from crates/jet-api/src/events/mod.rs rename to crates/squadron-api/src/events/mod.rs diff --git a/crates/jet-api/src/extractors/mod.rs b/crates/squadron-api/src/extractors/mod.rs similarity index 100% rename from crates/jet-api/src/extractors/mod.rs rename to crates/squadron-api/src/extractors/mod.rs diff --git a/crates/jet-api/src/extractors/require_instance.rs b/crates/squadron-api/src/extractors/require_instance.rs similarity index 100% rename from crates/jet-api/src/extractors/require_instance.rs rename to crates/squadron-api/src/extractors/require_instance.rs diff --git a/crates/jet-api/src/extractors/user.rs b/crates/squadron-api/src/extractors/user.rs similarity index 100% rename from crates/jet-api/src/extractors/user.rs rename to crates/squadron-api/src/extractors/user.rs diff --git a/crates/jet-api/src/http/about.rs b/crates/squadron-api/src/http/about.rs similarity index 100% rename from crates/jet-api/src/http/about.rs rename to crates/squadron-api/src/http/about.rs diff --git a/crates/jet-api/src/http/api/authentication.rs b/crates/squadron-api/src/http/api/authentication.rs similarity index 99% rename from crates/jet-api/src/http/api/authentication.rs rename to crates/squadron-api/src/http/api/authentication.rs index 4ccfaa6..1d8c9fd 100644 --- a/crates/jet-api/src/http/api/authentication.rs +++ b/crates/squadron-api/src/http/api/authentication.rs @@ -438,7 +438,7 @@ pub mod password { pub mod magic_link { use actix_web::web::Data; - use jet_contract::*; + use squadron_contract::*; use rand::prelude::*; use redis::AsyncCommands; @@ -554,7 +554,7 @@ pub mod magic_link { #[cfg(test)] mod create_magic_link_tests { use actix_web::web::Data; - use jet_contract::deadpool_redis; + use squadron_contract::deadpool_redis; use super::*; diff --git a/crates/jet-api/src/http/api/authentication/api_tokens.rs b/crates/squadron-api/src/http/api/authentication/api_tokens.rs similarity index 97% rename from crates/jet-api/src/http/api/authentication/api_tokens.rs rename to crates/squadron-api/src/http/api/authentication/api_tokens.rs index f119b74..5707afe 100644 --- a/crates/jet-api/src/http/api/authentication/api_tokens.rs +++ b/crates/squadron-api/src/http/api/authentication/api_tokens.rs @@ -3,7 +3,7 @@ use actix_web::web::{Data, Path, ServiceConfig}; use actix_web::{get, HttpResponse}; use entities::api_tokens::*; use entities::prelude::ApiTokens; -use jet_contract::{ApiTokenId, WorkspaceSlug}; +use squadron_contract::{ApiTokenId, WorkspaceSlug}; use sea_orm::prelude::*; use sea_orm::*; use tracing::error; diff --git a/crates/jet-api/src/http/api/authentication/change_password.rs b/crates/squadron-api/src/http/api/authentication/change_password.rs similarity index 99% rename from crates/jet-api/src/http/api/authentication/change_password.rs rename to crates/squadron-api/src/http/api/authentication/change_password.rs index 82826f3..81fd30b 100644 --- a/crates/jet-api/src/http/api/authentication/change_password.rs +++ b/crates/squadron-api/src/http/api/authentication/change_password.rs @@ -103,7 +103,7 @@ mod tests { use actix_web::http::header::ContentType; use actix_web::web::Data; use actix_web::{test, App}; - use jet_contract::deadpool_redis; + use squadron_contract::deadpool_redis; use reqwest::{Method, StatusCode}; use sea_orm::Database; use tracing_test::traced_test; @@ -114,12 +114,12 @@ mod tests { macro_rules! create_app { ($app: ident, $session_storage: ident, $db: ident) => { - std::env::set_var("DATABASE_URL", "postgres://postgres@0.0.0.0:5432/jet_test"); + std::env::set_var("DATABASE_URL", "postgres://postgres@0.0.0.0:5432/squadron_test"); let redis = deadpool_redis::Config::from_url("redis://0.0.0.0:6379") .create_pool(Some(deadpool_redis::Runtime::Tokio1)) .expect("Can't connect to redis"); let $db: sea_orm::prelude::DatabaseConnection = - Database::connect("postgres://postgres@0.0.0.0:5432/jet_test") + Database::connect("postgres://postgres@0.0.0.0:5432/squadron_test") .await .expect("Failed to connect to database"); let ($session_storage, factory) = diff --git a/crates/jet-api/src/http/api/authentication/email_check.rs b/crates/squadron-api/src/http/api/authentication/email_check.rs similarity index 97% rename from crates/jet-api/src/http/api/authentication/email_check.rs rename to crates/squadron-api/src/http/api/authentication/email_check.rs index 8ee4d83..3394d6b 100644 --- a/crates/jet-api/src/http/api/authentication/email_check.rs +++ b/crates/squadron-api/src/http/api/authentication/email_check.rs @@ -3,7 +3,7 @@ use actix_web::web::{Data, Json}; use actix_web::{post, HttpRequest, HttpResponse}; use entities::prelude::WorkspaceMemberInvites; use entities::users::Model as User; -use jet_contract::event_bus::SignInMedium; +use squadron_contract::event_bus::SignInMedium; use sea_orm::prelude::*; use sea_orm::{DatabaseConnection, DatabaseTransaction, EntityTrait, QueryFilter}; use serde::{Deserialize, Serialize}; @@ -70,7 +70,7 @@ async fn handle_existing_user( event_bus: Data, redis: Data, ) -> Result { - use jet_contract::event_bus::*; + use squadron_contract::event_bus::*; let user_id = user.id; let payload = payload.into_inner(); @@ -190,7 +190,7 @@ async fn register( .await .map_err(|_| Error::DatabaseError)?; { - use jet_contract::event_bus::*; + use squadron_contract::event_bus::*; let user_id = user.id.clone().unwrap(); Msg::User(UserMsg::Created { @@ -224,7 +224,7 @@ async fn register( return Err(AuthError::AttemptExhausted.into()); } { - use jet_contract::event_bus::*; + use squadron_contract::event_bus::*; Msg::Email(EmailMsg::MagicLink { email, key, diff --git a/crates/jet-api/src/http/api/authentication/forgot_password.rs b/crates/squadron-api/src/http/api/authentication/forgot_password.rs similarity index 97% rename from crates/jet-api/src/http/api/authentication/forgot_password.rs rename to crates/squadron-api/src/http/api/authentication/forgot_password.rs index b5253b9..45f7755 100644 --- a/crates/jet-api/src/http/api/authentication/forgot_password.rs +++ b/crates/squadron-api/src/http/api/authentication/forgot_password.rs @@ -1,7 +1,7 @@ use actix_web::web::Json; use actix_web::{post, HttpRequest, HttpResponse}; use entities::users::Column; -use jet_contract::event_bus::{EmailMsg, Topic}; +use squadron_contract::event_bus::{EmailMsg, Topic}; use serde::{Deserialize, Serialize}; use serde_json::json; use tracing::*; @@ -75,7 +75,7 @@ async fn try_forgot_password( if let Err(e) = event_bus .publish( Topic::Email, - jet_contract::event_bus::Msg::Email(EmailMsg::ForgotPassword { + squadron_contract::event_bus::Msg::Email(EmailMsg::ForgotPassword { current_site, token, uidb, @@ -108,7 +108,7 @@ mod tests { use actix_web::body::to_bytes; use actix_web::web::Data; use actix_web::{test, App}; - use jet_contract::deadpool_redis; + use squadron_contract::deadpool_redis; use reqwest::{Method, StatusCode}; use sea_orm::Database; use serde_json::json; @@ -122,12 +122,12 @@ mod tests { macro_rules! create_app { ($app: ident, $session_storage: ident, $db: ident) => { - std::env::set_var("DATABASE_URL", "postgres://postgres@0.0.0.0:5432/jet_test"); + std::env::set_var("DATABASE_URL", "postgres://postgres@0.0.0.0:5432/squadron_test"); let redis = deadpool_redis::Config::from_url("redis://0.0.0.0:6379") .create_pool(Some(deadpool_redis::Runtime::Tokio1)) .expect("Can't connect to redis"); let $db: sea_orm::prelude::DatabaseConnection = - Database::connect("postgres://postgres@0.0.0.0:5432/jet_test") + Database::connect("postgres://postgres@0.0.0.0:5432/squadron_test") .await .expect("Failed to connect to database"); let ($session_storage, factory) = diff --git a/crates/jet-api/src/http/api/authentication/magic_generate.rs b/crates/squadron-api/src/http/api/authentication/magic_generate.rs similarity index 92% rename from crates/jet-api/src/http/api/authentication/magic_generate.rs rename to crates/squadron-api/src/http/api/authentication/magic_generate.rs index 53dd7cd..dc04752 100644 --- a/crates/jet-api/src/http/api/authentication/magic_generate.rs +++ b/crates/squadron-api/src/http/api/authentication/magic_generate.rs @@ -1,6 +1,6 @@ use actix_web::web::{Data, Json}; use actix_web::{post, HttpRequest, HttpResponse}; -use jet_contract::event_bus::{EmailMsg, Topic}; +use squadron_contract::event_bus::{EmailMsg, Topic}; use sea_orm::prelude::*; use sea_orm::{DatabaseConnection, DatabaseTransaction}; use serde::Deserialize; @@ -68,9 +68,9 @@ async fn try_create_magic_link( if let Err(e) = event_bus .publish( Topic::Email, - jet_contract::event_bus::Msg::Email(EmailMsg::MagicLink { + squadron_contract::event_bus::Msg::Email(EmailMsg::MagicLink { email, - key: jet_contract::MagicLinkKey::new(key.clone()), + key: squadron_contract::MagicLinkKey::new(key.clone()), token, current_site, }), diff --git a/crates/jet-api/src/http/api/authentication/magic_sign_in.rs b/crates/squadron-api/src/http/api/authentication/magic_sign_in.rs similarity index 95% rename from crates/jet-api/src/http/api/authentication/magic_sign_in.rs rename to crates/squadron-api/src/http/api/authentication/magic_sign_in.rs index 8608abd..0de2bd9 100644 --- a/crates/jet-api/src/http/api/authentication/magic_sign_in.rs +++ b/crates/squadron-api/src/http/api/authentication/magic_sign_in.rs @@ -1,8 +1,8 @@ use actix_jwt_session::SessionStorage; use actix_web::web::{Data, Json}; use actix_web::{post, HttpRequest, HttpResponse}; -use jet_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; -use jet_contract::redis::AsyncCommands; +use squadron_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; +use squadron_contract::redis::AsyncCommands; use reqwest::StatusCode; use rumqttc::QoS; use sea_orm::prelude::*; @@ -76,7 +76,7 @@ async fn try_magic_sign_in( .publish( Topic::User, Msg::User(UserMsg::SignIn { - user_id: jet_contract::UserId::new(user.id), + user_id: squadron_contract::UserId::new(user.id), email, user_agent, ip, diff --git a/crates/jet-api/src/http/api/authentication/reset_password.rs b/crates/squadron-api/src/http/api/authentication/reset_password.rs similarity index 99% rename from crates/jet-api/src/http/api/authentication/reset_password.rs rename to crates/squadron-api/src/http/api/authentication/reset_password.rs index dd00150..27e6d97 100644 --- a/crates/jet-api/src/http/api/authentication/reset_password.rs +++ b/crates/squadron-api/src/http/api/authentication/reset_password.rs @@ -121,7 +121,7 @@ mod tests { use actix_web::http::header::ContentType; use actix_web::web::Data; use actix_web::{test, App}; - use jet_contract::deadpool_redis; + use squadron_contract::deadpool_redis; use reqwest::{Method, StatusCode}; use sea_orm::Database; use tracing_test::traced_test; @@ -135,12 +135,12 @@ mod tests { macro_rules! create_app { ($app: ident, $session_storage: ident, $db: ident) => { - std::env::set_var("DATABASE_URL", "postgres://postgres@0.0.0.0:5432/jet_test"); + std::env::set_var("DATABASE_URL", "postgres://postgres@0.0.0.0:5432/squadron_test"); let redis = deadpool_redis::Config::from_url("redis://0.0.0.0:6379") .create_pool(Some(deadpool_redis::Runtime::Tokio1)) .expect("Can't connect to redis"); let $db: sea_orm::prelude::DatabaseConnection = - Database::connect("postgres://postgres@0.0.0.0:5432/jet_test") + Database::connect("postgres://postgres@0.0.0.0:5432/squadron_test") .await .expect("Failed to connect to database"); let ($session_storage, factory) = diff --git a/crates/jet-api/src/http/api/authentication/sign_in.rs b/crates/squadron-api/src/http/api/authentication/sign_in.rs similarity index 97% rename from crates/jet-api/src/http/api/authentication/sign_in.rs rename to crates/squadron-api/src/http/api/authentication/sign_in.rs index ebe1d5a..e636e10 100644 --- a/crates/jet-api/src/http/api/authentication/sign_in.rs +++ b/crates/squadron-api/src/http/api/authentication/sign_in.rs @@ -3,8 +3,8 @@ use actix_web::web::{Data, Json}; use actix_web::{post, HttpRequest, HttpResponse}; use entities::prelude::Users; use entities::users::ActiveModel as UserModel; -use jet_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; -use jet_contract::UserId; +use squadron_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; +use squadron_contract::UserId; use reqwest::StatusCode; use rumqttc::QoS; use sea_orm::*; diff --git a/crates/jet-api/src/http/api/authentication/sign_out.rs b/crates/squadron-api/src/http/api/authentication/sign_out.rs similarity index 100% rename from crates/jet-api/src/http/api/authentication/sign_out.rs rename to crates/squadron-api/src/http/api/authentication/sign_out.rs diff --git a/crates/jet-api/src/http/api/authentication/sign_up.rs b/crates/squadron-api/src/http/api/authentication/sign_up.rs similarity index 97% rename from crates/jet-api/src/http/api/authentication/sign_up.rs rename to crates/squadron-api/src/http/api/authentication/sign_up.rs index f7bc3b5..b522b3a 100644 --- a/crates/jet-api/src/http/api/authentication/sign_up.rs +++ b/crates/squadron-api/src/http/api/authentication/sign_up.rs @@ -3,8 +3,8 @@ use actix_web::web::{Data, Json}; use actix_web::{post, HttpRequest, HttpResponse, ResponseError}; use entities::prelude::Users; use entities::users::ActiveModel as UserModel; -use jet_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; -use jet_contract::UserId; +use squadron_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; +use squadron_contract::UserId; use reqwest::StatusCode; use rumqttc::QoS; use sea_orm::{DatabaseConnection, *}; diff --git a/crates/jet-api/src/http/api/authentication/social_auth.rs b/crates/squadron-api/src/http/api/authentication/social_auth.rs similarity index 99% rename from crates/jet-api/src/http/api/authentication/social_auth.rs rename to crates/squadron-api/src/http/api/authentication/social_auth.rs index 8ae684c..5640998 100644 --- a/crates/jet-api/src/http/api/authentication/social_auth.rs +++ b/crates/squadron-api/src/http/api/authentication/social_auth.rs @@ -4,8 +4,8 @@ use actix_web::web::{self, Data, ServiceConfig}; use actix_web::{get, HttpRequest, HttpResponse}; use entities::users::ActiveModel as UserModel; use http_api_isahc_client::IsahcClient; -use jet_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; -use jet_contract::UserId; +use squadron_contract::event_bus::{Msg, SignInMedium, Topic, UserMsg}; +use squadron_contract::UserId; use oauth2_amazon::{ AmazonExtensionsBuilder, AmazonProviderWithWebServices, AmazonScope, AmazonTokenUrlRegion, }; diff --git a/crates/jet-api/src/http/api/authentication/token_refresh.rs b/crates/squadron-api/src/http/api/authentication/token_refresh.rs similarity index 100% rename from crates/jet-api/src/http/api/authentication/token_refresh.rs rename to crates/squadron-api/src/http/api/authentication/token_refresh.rs diff --git a/crates/jet-api/src/http/api/config.rs b/crates/squadron-api/src/http/api/config.rs similarity index 100% rename from crates/jet-api/src/http/api/config.rs rename to crates/squadron-api/src/http/api/config.rs diff --git a/crates/jet-api/src/http/api/mod.rs b/crates/squadron-api/src/http/api/mod.rs similarity index 100% rename from crates/jet-api/src/http/api/mod.rs rename to crates/squadron-api/src/http/api/mod.rs diff --git a/crates/jet-api/src/http/api/users.rs b/crates/squadron-api/src/http/api/users.rs similarity index 100% rename from crates/jet-api/src/http/api/users.rs rename to crates/squadron-api/src/http/api/users.rs diff --git a/crates/jet-api/src/http/api_v1/cycles.rs b/crates/squadron-api/src/http/api_v1/cycles.rs similarity index 100% rename from crates/jet-api/src/http/api_v1/cycles.rs rename to crates/squadron-api/src/http/api_v1/cycles.rs diff --git a/crates/jet-api/src/http/api_v1/inbox.rs b/crates/squadron-api/src/http/api_v1/inbox.rs similarity index 100% rename from crates/jet-api/src/http/api_v1/inbox.rs rename to crates/squadron-api/src/http/api_v1/inbox.rs diff --git a/crates/jet-api/src/http/api_v1/issues.rs b/crates/squadron-api/src/http/api_v1/issues.rs similarity index 100% rename from crates/jet-api/src/http/api_v1/issues.rs rename to crates/squadron-api/src/http/api_v1/issues.rs diff --git a/crates/jet-api/src/http/api_v1/mod.rs b/crates/squadron-api/src/http/api_v1/mod.rs similarity index 100% rename from crates/jet-api/src/http/api_v1/mod.rs rename to crates/squadron-api/src/http/api_v1/mod.rs diff --git a/crates/jet-api/src/http/api_v1/modules.rs b/crates/squadron-api/src/http/api_v1/modules.rs similarity index 100% rename from crates/jet-api/src/http/api_v1/modules.rs rename to crates/squadron-api/src/http/api_v1/modules.rs diff --git a/crates/jet-api/src/http/api_v1/projects.rs b/crates/squadron-api/src/http/api_v1/projects.rs similarity index 100% rename from crates/jet-api/src/http/api_v1/projects.rs rename to crates/squadron-api/src/http/api_v1/projects.rs diff --git a/crates/jet-api/src/http/api_v1/states.rs b/crates/squadron-api/src/http/api_v1/states.rs similarity index 100% rename from crates/jet-api/src/http/api_v1/states.rs rename to crates/squadron-api/src/http/api_v1/states.rs diff --git a/crates/jet-api/src/http/mod.rs b/crates/squadron-api/src/http/mod.rs similarity index 100% rename from crates/jet-api/src/http/mod.rs rename to crates/squadron-api/src/http/mod.rs diff --git a/crates/jet-api/src/main.rs b/crates/squadron-api/src/main.rs similarity index 91% rename from crates/jet-api/src/main.rs rename to crates/squadron-api/src/main.rs index 33fd88d..c81330a 100644 --- a/crates/jet-api/src/main.rs +++ b/crates/squadron-api/src/main.rs @@ -3,8 +3,8 @@ use std::env; use actix_jwt_session::*; use actix_web::web::Data; use actix_web::{App, HttpServer}; -pub use jet_contract::event_bus::Client as EventBusClient; -pub use jet_contract::{deadpool_redis, redis, RedisClient}; +pub use squadron_contract::event_bus::Client as EventBusClient; +pub use squadron_contract::{deadpool_redis, redis, RedisClient}; use models::PasswordResetSecret; pub use sea_orm::{Database, DatabaseConnection}; @@ -16,7 +16,7 @@ pub mod models; pub mod session; pub mod utils; -pub const APPLICATION_NAME: &str = "jet-api"; +pub const APPLICATION_NAME: &str = "squadron-api"; #[actix_web::main] async fn main() { @@ -38,7 +38,7 @@ async fn main() { .create_pool(Some(deadpool_redis::Runtime::Tokio1)) .expect("Can't connect to redis"); let application_config = config::load( - jet_contract::redis::Client::open(redis_addr).expect("Can't connect to redis"), + squadron_contract::redis::Client::open(redis_addr).expect("Can't connect to redis"), ); let db: sea_orm::prelude::DatabaseConnection = Database::connect( env::var("DATABASE_URL") @@ -81,7 +81,7 @@ async fn main() { let http_client = reqwest::Client::new(); let application_config = Data::new(application_config); - let event_bus = Data::new(jet_contract::event_bus::Client::new(eb_client)); + let event_bus = Data::new(squadron_contract::event_bus::Client::new(eb_client)); let pass_reset_secret = Data::new(PasswordResetSecret::new( env::var("PASSWORD_RESET_SECRET").expect("PASSWORD_RESET_SECRET must be provided"), )); diff --git a/crates/jet-api/src/models.rs b/crates/squadron-api/src/models.rs similarity index 100% rename from crates/jet-api/src/models.rs rename to crates/squadron-api/src/models.rs diff --git a/crates/jet-api/src/session.rs b/crates/squadron-api/src/session.rs similarity index 100% rename from crates/jet-api/src/session.rs rename to crates/squadron-api/src/session.rs diff --git a/crates/jet-api/src/utils/mod.rs b/crates/squadron-api/src/utils/mod.rs similarity index 100% rename from crates/jet-api/src/utils/mod.rs rename to crates/squadron-api/src/utils/mod.rs diff --git a/crates/jet-space/Cargo.toml b/crates/squadron-beat/Cargo.toml similarity index 87% rename from crates/jet-space/Cargo.toml rename to crates/squadron-beat/Cargo.toml index 4e61ce2..a3c149d 100644 --- a/crates/jet-space/Cargo.toml +++ b/crates/squadron-beat/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "jet-space" +name = "squadron-beat" version = "0.1.0" edition = "2021" diff --git a/crates/jet-beat/src/main.rs b/crates/squadron-beat/src/main.rs similarity index 100% rename from crates/jet-beat/src/main.rs rename to crates/squadron-beat/src/main.rs diff --git a/crates/jet-bg/Cargo.toml b/crates/squadron-bg/Cargo.toml similarity index 94% rename from crates/jet-bg/Cargo.toml rename to crates/squadron-bg/Cargo.toml index e3fe7b4..b340b07 100644 --- a/crates/jet-bg/Cargo.toml +++ b/crates/squadron-bg/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "jet-bg" +name = "squadron-bg" version = "0.1.0" edition = "2021" diff --git a/crates/jet-bg/src/main.rs b/crates/squadron-bg/src/main.rs similarity index 100% rename from crates/jet-bg/src/main.rs rename to crates/squadron-bg/src/main.rs diff --git a/crates/jet-contract/Cargo.toml b/crates/squadron-contract/Cargo.toml similarity index 96% rename from crates/jet-contract/Cargo.toml rename to crates/squadron-contract/Cargo.toml index 2cebcb9..9d7b87a 100644 --- a/crates/jet-contract/Cargo.toml +++ b/crates/squadron-contract/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "jet-contract" +name = "squadron-contract" version = "0.1.0" edition = "2021" diff --git a/crates/jet-contract/src/event_bus/messages.rs b/crates/squadron-contract/src/event_bus/messages.rs similarity index 100% rename from crates/jet-contract/src/event_bus/messages.rs rename to crates/squadron-contract/src/event_bus/messages.rs diff --git a/crates/jet-contract/src/event_bus/mod.rs b/crates/squadron-contract/src/event_bus/mod.rs similarity index 100% rename from crates/jet-contract/src/event_bus/mod.rs rename to crates/squadron-contract/src/event_bus/mod.rs diff --git a/crates/jet-contract/src/lib.rs b/crates/squadron-contract/src/lib.rs similarity index 100% rename from crates/jet-contract/src/lib.rs rename to crates/squadron-contract/src/lib.rs diff --git a/crates/jet-contract/src/plugin/messages.rs b/crates/squadron-contract/src/plugin/messages.rs similarity index 100% rename from crates/jet-contract/src/plugin/messages.rs rename to crates/squadron-contract/src/plugin/messages.rs diff --git a/crates/jet-contract/src/plugin/mod.rs b/crates/squadron-contract/src/plugin/mod.rs similarity index 100% rename from crates/jet-contract/src/plugin/mod.rs rename to crates/squadron-contract/src/plugin/mod.rs diff --git a/crates/jet-contract/src/redis_models.rs b/crates/squadron-contract/src/redis_models.rs similarity index 100% rename from crates/jet-contract/src/redis_models.rs rename to crates/squadron-contract/src/redis_models.rs diff --git a/crates/jet-plug/Cargo.toml b/crates/squadron-plug/Cargo.toml similarity index 89% rename from crates/jet-plug/Cargo.toml rename to crates/squadron-plug/Cargo.toml index 60b909d..a4f6a3a 100644 --- a/crates/jet-plug/Cargo.toml +++ b/crates/squadron-plug/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "jet-plug" +name = "squadron-plug" version = "0.1.0" edition = "2021" @@ -16,4 +16,4 @@ rust-s3 = { version = "0.33.0", features = ["tokio-rustls-tls", "futures-util", serde = "1.0.195" serde_json = "1.0.111" tokio = { version = "1.35.1", features = ["full"] } -jet-contract = { workspace = true } +squadron-contract = { workspace = true } diff --git a/crates/jet-plug/src/lib.rs b/crates/squadron-plug/src/lib.rs similarity index 97% rename from crates/jet-plug/src/lib.rs rename to crates/squadron-plug/src/lib.rs index 8bb03f9..75c5eeb 100644 --- a/crates/jet-plug/src/lib.rs +++ b/crates/squadron-plug/src/lib.rs @@ -5,7 +5,7 @@ //! //! ```no_run //! // binary name = gh_issue_mirror -//! use jet_plug::*; +//! use squadron_plug::*; //! use async_trait::async_trait; //! //! #[derive(Default, Clone)] @@ -47,7 +47,7 @@ use actix_web::web::{Data, Json}; use actix_web::{post, App, HttpResponse, HttpServer}; -pub use jet_contract::plugin::*; +pub use squadron_contract::plugin::*; #[async_trait::async_trait] pub trait Plugin { diff --git a/crates/jet-beat/Cargo.toml b/crates/squadron-space/Cargo.toml similarity index 86% rename from crates/jet-beat/Cargo.toml rename to crates/squadron-space/Cargo.toml index e4cd836..3f4d4c9 100644 --- a/crates/jet-beat/Cargo.toml +++ b/crates/squadron-space/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "jet-beat" +name = "squadron-space" version = "0.1.0" edition = "2021" diff --git a/crates/jet-space/src/main.rs b/crates/squadron-space/src/main.rs similarity index 100% rename from crates/jet-space/src/main.rs rename to crates/squadron-space/src/main.rs