From 65aef0018cc1fc047b783a4104e826d49ac2b8f9 Mon Sep 17 00:00:00 2001 From: core Date: Thu, 30 Nov 2023 14:50:49 -0500 Subject: [PATCH] rename API to backplane --- .drone.yml | 28 ++++++++--------- .gitignore | 2 +- Cargo.lock | 31 +------------------ Cargo.toml | 2 +- .../down.sql | 1 - .../up.sql | 5 --- .../down.sql | 1 - .../up.sql | 1 - starkingdoms-api/src/schema.rs | 21 ------------- .../.env | 0 .../Cargo.toml | 8 ++--- .../build.rs | 0 .../diesel.toml | 0 .../migrations/.keep | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../src/auth.rs | 0 .../src/config.rs | 0 .../src/error.rs | 0 .../src/main.rs | 0 .../src/models.rs | 13 +------- .../src/response.rs | 0 .../src/routes/login.rs | 0 .../src/routes/mod.rs | 0 .../src/routes/signup.rs | 1 - starkingdoms-backplane/src/schema.rs | 10 ++++++ .../src/tokens.rs | 0 starkingdoms-client/src/config.json | 3 +- 30 files changed, 33 insertions(+), 94 deletions(-) delete mode 100644 starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/down.sql delete mode 100644 starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/up.sql delete mode 100644 starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/down.sql delete mode 100644 starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/up.sql delete mode 100644 starkingdoms-api/src/schema.rs rename {starkingdoms-api => starkingdoms-backplane}/.env (100%) rename {starkingdoms-api => starkingdoms-backplane}/Cargo.toml (77%) rename {starkingdoms-api => starkingdoms-backplane}/build.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/diesel.toml (100%) rename {starkingdoms-api => starkingdoms-backplane}/migrations/.keep (100%) rename {starkingdoms-api => starkingdoms-backplane}/migrations/00000000000000_diesel_initial_setup/down.sql (100%) rename {starkingdoms-api => starkingdoms-backplane}/migrations/00000000000000_diesel_initial_setup/up.sql (100%) rename {starkingdoms-api => starkingdoms-backplane}/migrations/2023-11-30-013338_create_table_users/down.sql (100%) rename {starkingdoms-api => starkingdoms-backplane}/migrations/2023-11-30-013338_create_table_users/up.sql (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/auth.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/config.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/error.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/main.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/models.rs (78%) rename {starkingdoms-api => starkingdoms-backplane}/src/response.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/routes/login.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/routes/mod.rs (100%) rename {starkingdoms-api => starkingdoms-backplane}/src/routes/signup.rs (98%) create mode 100644 starkingdoms-backplane/src/schema.rs rename {starkingdoms-api => starkingdoms-backplane}/src/tokens.rs (100%) diff --git a/.drone.yml b/.drone.yml index e23964fcd9d9ecf9e09d84e4e4267bce26f82675..1ebe9e518a1107457f8be073a709c8b3faa1f968 100644 --- a/.drone.yml +++ b/.drone.yml @@ -129,7 +129,7 @@ steps: --- kind: pipeline type: docker -name: api_ci +name: backplane_ci trigger: event: exclude: @@ -137,10 +137,10 @@ trigger: - rollback steps: - - name: api_fmt + - name: backplane_fmt image: coresdev/stk_build_env commands: - - cd starkingdoms-api + - cd starkingdoms-backplane - rustfmt **/*.rs --check --edition 2021 --color always environment: SCCACHE_REGION: us-east-1 @@ -155,10 +155,10 @@ steps: RUSTC_WRAPPER: sccache SCCACHE_USE_SSL: "true" CARGO_INCREMENTAL: "0" - - name: api_clippy + - name: backplane_clippy image: coresdev/stk_build_env commands: - - cd starkingdoms-api + - cd starkingdoms-backplane - cargo clippy --color always environment: SCCACHE_REGION: us-east-1 @@ -173,10 +173,10 @@ steps: RUSTC_WRAPPER: sccache SCCACHE_USE_SSL: "true" CARGO_INCREMENTAL: "0" - - name: api_build + - name: backplane_build image: coresdev/stk_build_env commands: - - cd starkingdoms-api + - cd starkingdoms-backplane - cargo build --release --color always environment: SCCACHE_REGION: us-east-1 @@ -191,12 +191,12 @@ steps: RUSTC_WRAPPER: sccache SCCACHE_USE_SSL: "true" CARGO_INCREMENTAL: "0" - - name: upload_api + - name: upload_backplane image: plugins/s3 depends_on: - - api_build - - api_fmt - - api_clippy + - backplane_build + - backplane_fmt + - backplane_clippy settings: bucket: from_secret: s3_bucket @@ -206,8 +206,8 @@ steps: from_secret: s3_access_key secret_key: from_secret: s3_secret_key - source: target/release/starkingdoms-api - target: builds/${DRONE_COMMIT_SHA}/starkingdoms-api + source: target/release/starkingdoms-backplane + target: builds/${DRONE_COMMIT_SHA}/starkingdoms-backplane path_style: true --- @@ -217,7 +217,7 @@ name: trigger_deploy depends_on: - client_ci - server_ci - - api_ci + - backplane_ci trigger: event: exclude: diff --git a/.gitignore b/.gitignore index 4f6a0d2b6c31ae39b7973ab5aef5b93ab214f0ab..c60dce425c14341f0801a0ecd6c28b71e5c2f03b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ assets/final starkingdoms-client/node_modules starkingdoms-client/dist client/node_modules -starkingdoms-api/config.toml \ No newline at end of file +starkingdoms-backplane/config.toml \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 1bc0d4580a2c16108e5879bf0c53d1bb47614911..c639bab1cdc72902cd597b2d3728b4752fbe8f1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1594,7 +1594,6 @@ dependencies = [ "byteorder", "diesel_derives", "itoa", - "pq-sys", "serde_json", ] @@ -1625,17 +1624,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "diesel_json" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc50de1d729b55dfbb03e2d2db846684e3ab585f4ee9cfc3c675d236f951888" -dependencies = [ - "diesel", - "serde", - "serde_json", -] - [[package]] name = "diesel_migrations" version = "2.1.0" @@ -3017,15 +3005,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pq-sys" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd" -dependencies = [ - "vcpkg", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -3489,7 +3468,7 @@ dependencies = [ ] [[package]] -name = "starkingdoms-api" +name = "starkingdoms-backplane" version = "0.0.1" dependencies = [ "actix-cors", @@ -3498,7 +3477,6 @@ dependencies = [ "bb8", "diesel", "diesel-async", - "diesel_json", "diesel_migrations", "env_logger", "hmac", @@ -3510,7 +3488,6 @@ dependencies = [ "serde", "serde_json", "sha2", - "starkingdoms-common", "toml 0.8.8", ] @@ -3971,12 +3948,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 6c7e6c39f8cd41333aa2baa574347ce6accf92b8..a9193b9fc444964e1c85c526544bc0b2ba17456a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "server", - "starkingdoms-api", + "starkingdoms-backplane", "starkingdoms-common" ] resolver = "2" diff --git a/starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/down.sql b/starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/down.sql deleted file mode 100644 index 9ad8a2b56caee7821ec714aca911fe4428fdcca6..0000000000000000000000000000000000000000 --- a/starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/down.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE savefiles; \ No newline at end of file diff --git a/starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/up.sql b/starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/up.sql deleted file mode 100644 index 43676080b2c6b234dce38b43581b68b8792b618a..0000000000000000000000000000000000000000 --- a/starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/up.sql +++ /dev/null @@ -1,5 +0,0 @@ -CREATE TABLE savefiles ( - id BIGINT NOT NULL PRIMARY KEY, - user_id BIGINT NOT NULL REFERENCES users(id), - save_data jsonb NOT NULL -); \ No newline at end of file diff --git a/starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/down.sql b/starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/down.sql deleted file mode 100644 index 98a37d280ffbfade2a254de585f502744913d865..0000000000000000000000000000000000000000 --- a/starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/down.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE users DROP COLUMN latest_savefile; \ No newline at end of file diff --git a/starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/up.sql b/starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/up.sql deleted file mode 100644 index d38c80ae7edc97e95d77bfd309758c9ab4bdd407..0000000000000000000000000000000000000000 --- a/starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/up.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE users ADD COLUMN latest_savefile BIGINT NULL REFERENCES savefiles(id); \ No newline at end of file diff --git a/starkingdoms-api/src/schema.rs b/starkingdoms-api/src/schema.rs deleted file mode 100644 index 15f2b0bc1b5f9a346f9c1beed7dfdbaf967037cc..0000000000000000000000000000000000000000 --- a/starkingdoms-api/src/schema.rs +++ /dev/null @@ -1,21 +0,0 @@ -// @generated automatically by Diesel CLI. - -diesel::table! { - savefiles (id) { - id -> Int8, - user_id -> Int8, - save_data -> Jsonb, - } -} - -diesel::table! { - users (id) { - id -> Int8, - username -> Varchar, - password_hash -> Varchar, - permission_level -> Int4, - latest_savefile -> Nullable, - } -} - -diesel::allow_tables_to_appear_in_same_query!(savefiles, users,); diff --git a/starkingdoms-api/.env b/starkingdoms-backplane/.env similarity index 100% rename from starkingdoms-api/.env rename to starkingdoms-backplane/.env diff --git a/starkingdoms-api/Cargo.toml b/starkingdoms-backplane/Cargo.toml similarity index 77% rename from starkingdoms-api/Cargo.toml rename to starkingdoms-backplane/Cargo.toml index 5228de1a48fa3829ffa9387ee5388a46591f8774..3b1135ec81db615fe5bda7c29bf41ab22f622e73 100644 --- a/starkingdoms-api/Cargo.toml +++ b/starkingdoms-backplane/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "starkingdoms-api" +name = "starkingdoms-backplane" version = "0.0.1" authors = ["core "] edition = "2021" -description = "The API server that powers StarKingdoms" +description = "The backplane (auth) server that powers StarKingdoms" license = "AGPL-3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -26,6 +26,4 @@ password-hash = "0.5" rs-snowflake = "0.6" jwt = "0.16" sha2 = "0.10" -hmac = "0.12" -starkingdoms-common = { version = "0.1", path = "../starkingdoms-common" } -diesel_json = "0.2" \ No newline at end of file +hmac = "0.12" \ No newline at end of file diff --git a/starkingdoms-api/build.rs b/starkingdoms-backplane/build.rs similarity index 100% rename from starkingdoms-api/build.rs rename to starkingdoms-backplane/build.rs diff --git a/starkingdoms-api/diesel.toml b/starkingdoms-backplane/diesel.toml similarity index 100% rename from starkingdoms-api/diesel.toml rename to starkingdoms-backplane/diesel.toml diff --git a/starkingdoms-api/migrations/.keep b/starkingdoms-backplane/migrations/.keep similarity index 100% rename from starkingdoms-api/migrations/.keep rename to starkingdoms-backplane/migrations/.keep diff --git a/starkingdoms-api/migrations/00000000000000_diesel_initial_setup/down.sql b/starkingdoms-backplane/migrations/00000000000000_diesel_initial_setup/down.sql similarity index 100% rename from starkingdoms-api/migrations/00000000000000_diesel_initial_setup/down.sql rename to starkingdoms-backplane/migrations/00000000000000_diesel_initial_setup/down.sql diff --git a/starkingdoms-api/migrations/00000000000000_diesel_initial_setup/up.sql b/starkingdoms-backplane/migrations/00000000000000_diesel_initial_setup/up.sql similarity index 100% rename from starkingdoms-api/migrations/00000000000000_diesel_initial_setup/up.sql rename to starkingdoms-backplane/migrations/00000000000000_diesel_initial_setup/up.sql diff --git a/starkingdoms-api/migrations/2023-11-30-013338_create_table_users/down.sql b/starkingdoms-backplane/migrations/2023-11-30-013338_create_table_users/down.sql similarity index 100% rename from starkingdoms-api/migrations/2023-11-30-013338_create_table_users/down.sql rename to starkingdoms-backplane/migrations/2023-11-30-013338_create_table_users/down.sql diff --git a/starkingdoms-api/migrations/2023-11-30-013338_create_table_users/up.sql b/starkingdoms-backplane/migrations/2023-11-30-013338_create_table_users/up.sql similarity index 100% rename from starkingdoms-api/migrations/2023-11-30-013338_create_table_users/up.sql rename to starkingdoms-backplane/migrations/2023-11-30-013338_create_table_users/up.sql diff --git a/starkingdoms-api/src/auth.rs b/starkingdoms-backplane/src/auth.rs similarity index 100% rename from starkingdoms-api/src/auth.rs rename to starkingdoms-backplane/src/auth.rs diff --git a/starkingdoms-api/src/config.rs b/starkingdoms-backplane/src/config.rs similarity index 100% rename from starkingdoms-api/src/config.rs rename to starkingdoms-backplane/src/config.rs diff --git a/starkingdoms-api/src/error.rs b/starkingdoms-backplane/src/error.rs similarity index 100% rename from starkingdoms-api/src/error.rs rename to starkingdoms-backplane/src/error.rs diff --git a/starkingdoms-api/src/main.rs b/starkingdoms-backplane/src/main.rs similarity index 100% rename from starkingdoms-api/src/main.rs rename to starkingdoms-backplane/src/main.rs diff --git a/starkingdoms-api/src/models.rs b/starkingdoms-backplane/src/models.rs similarity index 78% rename from starkingdoms-api/src/models.rs rename to starkingdoms-backplane/src/models.rs index f60660b3dfe72a991238a07112773e391a6a59ad..da5b2cc4ac3500284f731af3cd18a5f4ebd320e9 100644 --- a/starkingdoms-api/src/models.rs +++ b/starkingdoms-backplane/src/models.rs @@ -26,15 +26,4 @@ pub struct User { pub username: String, pub password_hash: String, pub permission_level: i32, - pub latest_savefile: Option, -} - -#[derive(Queryable, Selectable, Insertable, Identifiable, Debug, PartialEq, Clone)] -#[diesel(table_name = crate::schema::savefiles)] -#[diesel(check_for_backend(diesel::pg::Pg))] -#[diesel(belongs_to(User))] -pub struct Savefile { - pub id: i64, - pub user_id: i64, - pub save_data: Json, -} +} \ No newline at end of file diff --git a/starkingdoms-api/src/response.rs b/starkingdoms-backplane/src/response.rs similarity index 100% rename from starkingdoms-api/src/response.rs rename to starkingdoms-backplane/src/response.rs diff --git a/starkingdoms-api/src/routes/login.rs b/starkingdoms-backplane/src/routes/login.rs similarity index 100% rename from starkingdoms-api/src/routes/login.rs rename to starkingdoms-backplane/src/routes/login.rs diff --git a/starkingdoms-api/src/routes/mod.rs b/starkingdoms-backplane/src/routes/mod.rs similarity index 100% rename from starkingdoms-api/src/routes/mod.rs rename to starkingdoms-backplane/src/routes/mod.rs diff --git a/starkingdoms-api/src/routes/signup.rs b/starkingdoms-backplane/src/routes/signup.rs similarity index 98% rename from starkingdoms-api/src/routes/signup.rs rename to starkingdoms-backplane/src/routes/signup.rs index 0df341ce73c5e235f1879699824db1eb6dba25ab..476fc34c03810c15402b8d9aff1c726e3be6cf81 100644 --- a/starkingdoms-api/src/routes/signup.rs +++ b/starkingdoms-backplane/src/routes/signup.rs @@ -56,7 +56,6 @@ pub async fn signup_req( username: req.username.to_string(), password_hash: hash.to_string(), permission_level: 0, - latest_savefile: None, }; handle_error!( diff --git a/starkingdoms-backplane/src/schema.rs b/starkingdoms-backplane/src/schema.rs new file mode 100644 index 0000000000000000000000000000000000000000..9bf297e9a77766a3c0e7c2eecbfc798cde3bc635 --- /dev/null +++ b/starkingdoms-backplane/src/schema.rs @@ -0,0 +1,10 @@ +// @generated automatically by Diesel CLI. + +diesel::table! { + users (id) { + id -> Int8, + username -> Varchar, + password_hash -> Varchar, + permission_level -> Int4, + } +} diff --git a/starkingdoms-api/src/tokens.rs b/starkingdoms-backplane/src/tokens.rs similarity index 100% rename from starkingdoms-api/src/tokens.rs rename to starkingdoms-backplane/src/tokens.rs diff --git a/starkingdoms-client/src/config.json b/starkingdoms-client/src/config.json index eb1515fed7746cb12319760fc347b6626689d60e..d45a8c17f981febca4bdec5b70cec44a6b60fdcd 100644 --- a/starkingdoms-client/src/config.json +++ b/starkingdoms-client/src/config.json @@ -32,5 +32,6 @@ "isDevelopment": true, "isPrimary": false } - } + }, + "backplane": "https://backplane.starkingdoms.io" }