chore: Split the openstack-keystone-core crate

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
   "crates/api-types",
+  "crates/core",
   "crates/keystone",
   "crates/storage",
   "tests/api",
@@ -36,7 +37,7 @@ bcrypt = { version = "0.19" }
 byteorder = { version = "1.5" }
 bytes = { version = "1.11" }
 chrono = { version = "0.4", default-features = false }
-clap = { version = "4.5" }
+clap = { version = "4.6" }
 color-eyre = { version = "0.6" }
 config = { version = "0.15" }
 criterion = { version = "0.8" }
@@ -71,7 +72,7 @@ serde = { version = "1.0" }
 serde_bytes = { version = "0.11" }
 serde_json = { version = "1.0" }
 serde_urlencoded = { version = "0.7" }
-tempfile = { version = "3.26" }
+tempfile = { version = "3.27" }
 thiserror = { version = "2.0" }
 tokio = { version = "1.50" }
 tokio-util = { version = "0.7" }

Dockerfile

@@ -15,8 +15,9 @@ RUN USER=root cargo new keystone
 
 # We want dependencies cached, so copy those first.
 COPY Cargo.toml Cargo.lock /usr/src/keystone/
-COPY crates/keystone/Cargo.toml /usr/src/keystone/crates/keystone/
 COPY crates/api-types/Cargo.toml /usr/src/keystone/crates/api-types/
+COPY crates/core/Cargo.toml /usr/src/keystone/crates/core/
+COPY crates/keystone/Cargo.toml /usr/src/keystone/crates/keystone/
 COPY crates/storage/Cargo.toml /usr/src/keystone/crates/storage/
 COPY tests/federation/Cargo.toml /usr/src/keystone/tests/federation/
 COPY tests/integration/Cargo.toml /usr/src/keystone/tests/integration/
@@ -25,12 +26,11 @@ COPY tests/loadtest/Cargo.toml /usr/src/keystone/tests/loadtest/
 RUN mkdir -p keystone/crates/keystone/src/bin && touch keystone/crates/keystone/src/lib.rs &&\
   cp keystone/src/main.rs keystone/crates/keystone/src/bin/keystone.rs &&\
   cp keystone/src/main.rs keystone/crates/keystone/src/bin/keystone_db.rs &&\
-  mkdir keystone/tests/loadtest/src &&\
+  mkdir -p keystone/tests/loadtest/src &&\
   cp keystone/src/main.rs keystone/tests/loadtest/src/main.rs &&\
-  mkdir keystone/crates/api-types/src &&\
-  touch keystone/crates/api-types/src/lib.rs &&\
-  mkdir keystone/crates/storage/src &&\
-  touch keystone/crates/storage/src/lib.rs
+  mkdir -p keystone/crates/api-types/src && touch keystone/crates/api-types/src/lib.rs &&\
+  mkdir -p keystone/crates/core/src && touch keystone/crates/core/src/lib.rs &&\
+  mkdir -p keystone/crates/storage/src && touch keystone/crates/storage/src/lib.rs
 
 # Set the working directory
 WORKDIR /usr/src/keystone
@@ -41,6 +41,7 @@ RUN cargo build -p openstack-keystone --release
 
 # Now copy in the rest of the sources
 COPY crates/keystone/ /usr/src/keystone/crates/keystone
+COPY crates/core/ /usr/src/keystone/crates/core
 COPY crates/api-types/ /usr/src/keystone/crates/api-types
 COPY crates/storage/ /usr/src/keystone/crates/storage
 

crates/api-types/Cargo.toml

@@ -24,5 +24,3 @@ thiserror.workspace = true
 utoipa = { workspace = true, features = ["chrono"] }
 validator = { workspace = true, features = ["derive"] }
 webauthn-rs-proto.workspace = true
-
-[dev-dependencies]

crates/core/Cargo.toml

@@ -0,0 +1,62 @@
+[package]
+name = "openstack-keystone-core"
+description = "OpenStack Keystone service"
+version = "0.1.1"
+rust-version.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]
+async-trait.workspace = true
+axum = { workspace = true }
+base64.workspace = true
+bcrypt = { workspace = true, features = ["alloc"] }
+byteorder.workspace = true
+bytes.workspace = true
+chrono.workspace = true
+config = { workspace = true, features = ["async", "ini"] }
+derive_builder.workspace = true
+eyre.workspace = true
+fernet = { workspace = true, features = ["rustcrypto"] }
+futures-util.workspace = true
+itertools.workspace = true
+jsonwebtoken = { version = "10.3", features = ["rust_crypto"] }
+openstack-keystone-api-types = { version = "0.1", path = "../api-types/"}
+mockall = { workspace = true, optional = true }
+nix = { workspace = true, features = ["fs", "user"] }
+rand.workspace = true
+regex.workspace = true
+reqwest = { workspace = true, features = ["json", "http2", "gzip", "deflate"] }
+rmp.workspace = true
+schemars.workspace = true
+scopeguard.workspace = true
+sea-orm.workspace = true
+secrecy = { workspace = true, features = ["serde"] }
+serde.workspace = true
+serde_json.workspace = true
+serde_urlencoded.workspace = true
+tempfile.workspace = true
+thiserror.workspace = true
+tokio = { workspace = true , features = ["fs"]}
+tracing.workspace = true
+url = { workspace = true, features = ["serde"] }
+url-macro.workspace = true
+uuid = { workspace = true, features = ["v4"] }
+validator = { workspace = true, features = ["derive"] }
+
+[dev-dependencies]
+base64urlsafedata.workspace = true
+httpmock = { version = "0.8", features = ["http2"] }
+mockall.workspace = true
+rstest.workspace = true
+sea-orm = { workspace = true, features = ["mock" ]}
+tempfile.workspace = true
+tracing-test = { workspace = true, features = ["no-env-filter"] }
+url.workspace = true
+
+[features]
+default = []
+bench_internals = []
+mock = ["dep:mockall"]