Skip to content

chore: Make core crates a workspace dependency #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
May 28, 2026
Merged

chore: Make core crates a workspace dependency #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,305 changes: 906 additions & 399 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,28 @@ futures = { version = "0.3" }
futures-util = { version = "0.3" }
http-body-util = "0.1"
http = { version = "1.4" }
hyper = { version = "1.9" }
hyper = { version = "1.10" }
hyper-util = { version = "0.1" }
inventory = { version = "0.3" }
itertools = { version = "0.14" }
mockall = { version = "0.14" }
mockall_double = { version = "0.3" }
nix = { version = "0.31", default-features = false }
openidconnect = { version = "4.0" }
openraft = { version = "0.10.0-alpha.17" }
openraft = { version = "=0.10.0-alpha.20" }
openstack-keystone-api-types = { version = "0.1", features = ["openapi", "validate", "conv"], path = "crates/api-types" }
openstack-keystone-config = { version = "0.1.0", path = "crates/config"}
openstack-keystone-core = { version = "0.1.0", path = "crates/core" }
openstack-keystone-core-types = { version = "0.1.0", path = "crates/core-types" }
openstack-keystone-distributed-storage = { version = "0.1.0", path = "crates/storage"}
openstack-keystone-token-fernet = { version = "0.1.0", path = "crates/token-fernet" }
prost = { version = "0.14" }
rand = { version = "0.10" }
regex = { version = "1.12" }
reqwest = { version = "0.13" }
rcgen = "0.14.7"
rcgen = { version = "0.14" }
rmp = { version = "0.8" }
rstest = "0.26"
rstest = { version = "0.26" }
rustls = { version = "0.23" }
schemars = { version = "1.2" }
scopeguard = "1.2.0"
Expand All @@ -95,10 +100,10 @@ serde = { version = "1.0" }
serde_bytes = { version = "0.11" }
serde_json = { version = "1.0" }
serde_urlencoded = { version = "0.7" }
spiffe = { version = "0.15.0" }
spiffe = { version = "0.15" }
tempfile = { version = "3.27" }
thiserror = { version = "2.0" }
tokio = { version = "1.51", default-features = false }
tokio = { version = "1.52", default-features = false }
tokio-rustls = "0.26.4"
tokio-util = { version = "0.7" }
tonic = { version = "0.14" }
Expand Down Expand Up @@ -141,6 +146,3 @@ expect_used = "deny"
print_stdout = "deny"
unwrap_used = "deny"
doc_paragraphs_missing_punctuation = "warn"

#[patch.crates-io]
#openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.13" }
6 changes: 3 additions & 3 deletions crates/appcred-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ exclude.workspace = true
async-trait.workspace = true
chrono.workspace = true
inventory.workspace = true
openstack-keystone-config = { version = "0.1", path = "../config" }
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-config.workspace = true
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
secrecy.workspace = true
sea-orm.workspace = true
tokio = { workspace = true, features = ["macros"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/assignment-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-config = { version = "0.1", path = "../config" }
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-config.workspace = true
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
tokio = { workspace = true, features = ["macros"] }
tracing.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/catalog-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
serde_json.workspace = true
tracing.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/federation-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ exclude.workspace = true
async-trait.workspace = true
chrono = { workspace = true, features = ["now"] }
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
serde_json.workspace = true
tracing.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/identity-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ exclude.workspace = true
async-trait.workspace = true
chrono = { workspace = true, features = ["now"] }
inventory.workspace = true
openstack-keystone-config = { version = "0.1", path = "../config" }
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-config.workspace = true
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
serde.workspace = true
serde_json.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/idmapping-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
tracing.workspace = true

[dev-dependencies]
chrono = { workspace = true, features = ["now"] }
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-core = { workspace = true, features = ["mock"] }
sea-orm = { workspace = true, features = ["mock", "sqlx-sqlite" ]}
tokio = { workspace = true, features = ["macros"] }

Expand Down
6 changes: 3 additions & 3 deletions crates/k8s-auth-raft/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types/" }
openstack-keystone-distributed-storage = { version = "0.1", path = "../storage/"}
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
openstack-keystone-distributed-storage.workspace = true
tracing.workspace = true
uuid.workspace = true

Expand Down
6 changes: 3 additions & 3 deletions crates/k8s-auth-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
tracing.workspace = true
uuid = { workspace = true, features = ["v4"] }

[dev-dependencies]
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-core = { workspace = true, features = ["mock"] }
sea-orm = { workspace = true, features = ["mock", "sqlx-sqlite" ]}
tokio = { workspace = true, features = ["macros"] }
uuid = { workspace = true, features = ["v4"] }
Expand Down
14 changes: 7 additions & 7 deletions crates/keystone/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ eyre.workspace = true
futures-util.workspace = true
hyper-util.workspace = true
hyper.workspace = true
openstack-keystone-api-types = { version = "0.1", features = ["openapi", "validate", "conv"], path = "../api-types/"}
openstack-keystone-api-types = { workspace = true, features = ["openapi", "validate", "conv"]}
openstack-keystone-appcred-sql = { version = "0.1", path = "../appcred-sql/" }
openstack-keystone-assignment-sql = { version = "0.1", path = "../assignment-sql/" }
openstack-keystone-catalog-sql = { version = "0.1", path = "../catalog-sql/" }
openstack-keystone-config = { version = "0.1", path = "../config" }
openstack-keystone-core = { version = "0.1", path = "../core", features = ["api"] }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-distributed-storage = { version = "0.1", path = "../storage/"}
openstack-keystone-config.workspace = true
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
openstack-keystone-distributed-storage.workspace = true
openstack-keystone-federation-sql = { version = "0.1", path = "../federation-sql" }
openstack-keystone-k8s-auth-sql = { version = "0.1", path = "../k8s-auth-sql/" }
openstack-keystone-k8s-auth-raft = { version = "0.1", path = "../k8s-auth-raft/" }
Expand All @@ -48,7 +48,7 @@ openstack-keystone-resource-sql = { version = "0.1", path = "../resource-sql/" }
openstack-keystone-revoke-sql = { version = "0.1", path = "../revoke-sql/" }
openstack-keystone-role-sql = { version = "0.1", path = "../role-sql/" }
openstack-keystone-spiffe-raft = { version = "0.1", path = "../spiffe-raft/" }
openstack-keystone-token-fernet = { version = "0.1", path = "../token-fernet/" }
openstack-keystone-token-fernet.workspace = true
openstack-keystone-token-restriction-sql = { version = "0.1", path = "../token-restriction-sql/" }
openstack-keystone-trust-sql = { version = "0.1", path = "../trust-sql/" }
openstack-keystone-webauthn = { version = "0.1", path = "../webauthn/"}
Expand All @@ -62,7 +62,7 @@ serde.workspace = true
serde_json.workspace = true
serde_urlencoded.workspace = true
spiffe = { workspace = true, features = ["x509-source"] }
spiffe-rustls = "0.6.0"
spiffe-rustls = "0.6.1"
spiffe-rustls-tokio = "0.3"
thiserror.workspace = true
tokio = { workspace = true, features = ["fs", "macros", "signal", "rt-multi-thread"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/resource-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
serde_json.workspace = true
tracing.workspace = true
uuid = { workspace = true, features = ["v4"] }

[dev-dependencies]
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-core = { workspace = true, features = ["mock"] }
sea-orm = { workspace = true, features = ["mock", "sqlx-sqlite" ]}
tokio = { workspace = true, features = ["macros"] }

Expand Down
6 changes: 3 additions & 3 deletions crates/revoke-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ exclude.workspace = true
async-trait.workspace = true
chrono.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
serde_json.workspace = true
tracing.workspace = true

[dev-dependencies]
chrono.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-core = { workspace = true, features = ["mock"] }
sea-orm = { workspace = true, features = ["mock", "sqlx-sqlite" ]}
serde_json.workspace = true
tokio = { workspace = true, features = ["macros"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/role-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
serde_json.workspace = true
tracing.workspace = true
uuid = { workspace = true, features = ["v4"] }

[dev-dependencies]
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-core = { workspace = true, features = ["mock"] }
sea-orm = { workspace = true, features = ["mock", "sqlx-sqlite" ]}
serde_json.workspace = true
tokio = { workspace = true, features = ["macros"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/spiffe-raft/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types/" }
openstack-keystone-distributed-storage = { version = "0.1", path = "../storage/"}
openstack-keystone-distributed-storage.workspace = true
tracing.workspace = true
uuid.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion crates/storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ futures.workspace = true
http.workspace = true
mockall.workspace = true
openraft = { workspace = true, features = ["serde", "type-alias"] }
openstack-keystone-config = { version = "0.1", path = "../config/" }
openstack-keystone-config.workspace = true
prost.workspace = true
rand.workspace = true
rmp.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/storage/src/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ impl NetSnapshot<TypeConfig> for NetworkConnection {
}

impl NetBackoff<TypeConfig> for NetworkConnection {
fn backoff(&self) -> Backoff {
Backoff::new(std::iter::repeat(Duration::from_millis(200)))
fn backoff(&self) -> Option<Backoff> {
Some(Backoff::new(std::iter::repeat(Duration::from_millis(200))))
}
}

Expand Down
6 changes: 3 additions & 3 deletions crates/token-fernet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ bytes.workspace = true
chrono.workspace = true
fernet = { workspace = true, features = ["rustcrypto"] }
itertools.workspace = true
openstack-keystone-config = { version = "0.1", path = "../config" }
openstack-keystone-core = { version = "0.1", path = "../core/"}
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-config.workspace = true
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
nix = { workspace = true, features = ["fs", "user"] }
rmp.workspace = true
scopeguard.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/token-restriction-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ exclude.workspace = true
[dependencies]
async-trait.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
tokio = { workspace = true, features = ["macros"] }
tracing.workspace = true

[dev-dependencies]
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-core = { workspace = true, features = ["mock"] }
sea-orm = { workspace = true, features = ["mock", "sqlx-sqlite" ]}
tokio = { workspace = true, features = ["macros"] }

Expand Down
6 changes: 3 additions & 3 deletions crates/trust-sql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ exclude.workspace = true
async-trait.workspace = true
chrono.workspace = true
inventory.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core" }
openstack-keystone-core-types = { version = "0.1", path = "../core-types" }
openstack-keystone-core.workspace = true
openstack-keystone-core-types.workspace = true
sea-orm.workspace = true
serde_json.workspace = true
tokio = { workspace = true, features = ["macros"] }
tracing.workspace = true

[dev-dependencies]
chrono.workspace = true
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-core = { workspace = true, features = ["mock"] }
sea-orm = { workspace = true, features = ["mock", "sqlx-sqlite" ]}
serde_json.workspace = true
tokio = { workspace = true, features = ["macros"] }
Expand Down
14 changes: 7 additions & 7 deletions crates/webauthn/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ chrono.workspace = true
derive_builder.workspace = true
eyre.workspace = true
inventory.workspace = true
openstack-keystone-api-types = { version = "0.1", features = ["openapi", "validate", "conv"], path = "../api-types/" }
openstack-keystone-core = { version = "0.1", path = "../core", features = ["api"] }
openstack-keystone-core-types = { version = "0.1", path = "../core-types/" }
openstack-keystone-distributed-storage = { version = "0.1", path = "../storage/"}
openstack-keystone-api-types = { workspace = true, features = ["openapi", "validate", "conv"] }
openstack-keystone-core = { workspace = true, features = ["api"] }
openstack-keystone-core-types.workspace = true
openstack-keystone-distributed-storage.workspace = true
sea-orm = { workspace = true }
serde.workspace = true
serde_json.workspace = true
Expand All @@ -37,9 +37,9 @@ webauthn-rs = { workspace = true, features = ["danger-allow-state-serialisation"
axum = { workspace = true, features = ["http2", "tokio"] }
base64urlsafedata.workspace = true
mockall.workspace = true
openstack-keystone-config = { version = "0.1", path = "../config" }
openstack-keystone-core = { version = "0.1", path = "../core", features = ["mock"] }
openstack-keystone-token-fernet = { version = "0.1", path = "../token-fernet/" }
openstack-keystone-config.workspace = true
openstack-keystone-core = { workspace = true, features = ["mock"] }
openstack-keystone-token-fernet.workspace = true
rcgen.workspace = true
reqwest.workspace = true
reserve-port = "2.4"
Expand Down
4 changes: 2 additions & 2 deletions tests/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ bytes.workspace = true
eyre.workspace = true
derive_builder.workspace = true
http.workspace = true
openstack-keystone-api-types = { version = "0.1", features = ["builder"], path = "../../crates/api-types" }
openstack_sdk_core = { version = "0.22" }
openstack-keystone-api-types = { workspace = true, features = ["builder"] }
openstack_sdk = { version = "0.22" }
reqwest = { workspace = true, features = ["json", "http2", "multipart", "gzip", "deflate"] }
secrecy = { workspace = true, features = ["serde"] }
serde.workspace = true
Expand Down
Loading
Loading