Skip to content

feat(toolkit-macros): compile-time gear dependency linking via re-exports #4146

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

Open
maurolacy wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat(toolkit-macros): compile-time gear dependency linking via re-exports #4146

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd80d80
Add reexports for gears deps generation to gears macro
Jun 26, 2026
345ade3
Add system gears decls to Cargo.toml
Jun 26, 2026
e985b1f
Add full crates for deps exporting
Jun 26, 2026
b91b379
Fix: Don't add reexports on tests
Jun 26, 2026
8aa9b1f
Update lock file
Jun 26, 2026
7a7822c
Anchor re-export path with leading :: to avoid module-scope shadowing
Jun 26, 2026
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
38 changes: 38 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,14 @@ cf-gears-system-sdk-directory = { version = "0.1.36", path = "libs/system-sdks/s

# System gears
types-registry = { package = "cf-gears-types-registry", version = "0.1.23", path = "gears/system/types-registry/types-registry" }
authn-resolver = { package = "cf-gears-authn-resolver", version = "0.2.17", path = "gears/system/authn-resolver/authn-resolver" }
authz-resolver = { package = "cf-gears-authz-resolver", version = "0.1.24", path = "gears/system/authz-resolver/authz-resolver" }
tenant-resolver = { package = "cf-gears-tenant-resolver", version = "0.1.22", path = "gears/system/tenant-resolver/tenant-resolver" }
resource-group = { package = "cf-gears-resource-group", version = "0.1.4", path = "gears/system/resource-group/resource-group" }
credstore = { package = "cf-gears-credstore", version = "0.1.23", path = "gears/credstore/credstore" }
oagw = { package = "cf-gears-oagw", version = "0.2.26", path = "gears/system/oagw/oagw" }
account-management = { package = "cf-gears-account-management", version = "0.1.3", path = "gears/system/account-management/account-management" }
usage-collector = { package = "cf-gears-usage-collector", version = "0.1.0", path = "gears/system/usage-collector/usage-collector" }

# System gears SDKs
account-management-sdk = { package = "cf-gears-account-management-sdk", version = "0.1.3", path = "gears/system/account-management/account-management-sdk" }
Expand Down
1 change: 1 addition & 0 deletions examples/oop-gears/calculator-gateway/calculator-gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ description = "Calculator gateway module - example in-process REST service"
[dependencies]
# External SDKs (dependencies on other modules)
calculator-sdk = { path = "../../calculator/calculator-sdk" }
calculator = { path = "../../calculator/calculator" }

# ToolKit
toolkit = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions examples/toolkit/users-info/users-info/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ users-info-sdk = { path = "../users-info-sdk", features = ["odata"] }

# AuthZ resolver for authorization (PEP flow)
authz-resolver-sdk = { package = "cf-gears-authz-resolver-sdk", path = "../../../../gears/system/authz-resolver/authz-resolver-sdk" }
authz-resolver = { workspace = true }

# Core dependencies
anyhow = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions gears/credstore/credstore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ workspace = true
toolkit-canonical-errors = { workspace = true }
credstore-sdk = { workspace = true }
types-registry-sdk = { workspace = true }
types-registry = { workspace = true }

anyhow = { workspace = true }
async-trait = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions gears/credstore/plugins/static-credstore-plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ workspace = true
# Local dependencies
credstore-sdk = { package = "cf-gears-credstore-sdk", version = "0.1.25", path = "../../credstore-sdk" }
types-registry-sdk = { package = "cf-gears-types-registry-sdk", version = "0.2.3", path = "../../../system/types-registry/types-registry-sdk" }
types-registry = { workspace = true }

# ToolKit dependencies
toolkit = { workspace = true }
Expand Down
4 changes: 4 additions & 0 deletions gears/mini-chat/mini-chat/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ oagw-sdk = { workspace = true }

# Types registry for plugin discovery
types-registry-sdk = { workspace = true }
types-registry = { workspace = true }
authn-resolver = { workspace = true }
authz-resolver = { workspace = true }
oagw = { workspace = true }

# Core dependencies
anyhow = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions gears/simple-user-settings/simple-user-settings/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ simple-user-settings-sdk = { package = "cf-gears-simple-user-settings-sdk", vers

# AuthZ resolver for authorization (PEP flow)
authz-resolver-sdk = { package = "cf-gears-authz-resolver-sdk", path = "../../../gears/system/authz-resolver/authz-resolver-sdk" }
authz-resolver = { workspace = true }

anyhow = { workspace = true }
async-trait = { workspace = true }
Expand Down
4 changes: 4 additions & 0 deletions gears/system/account-management/account-management/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ axum = { workspace = true, features = ["macros"] }
http = { workspace = true }
utoipa = { workspace = true, features = ["time"] }
resource-group-sdk = { workspace = true }
resource-group = { workspace = true }
tenant-resolver-sdk = { workspace = true }
tenant-resolver = { workspace = true }
types-registry-sdk = { workspace = true }
types-registry = { workspace = true }
gts = { workspace = true }

uuid = { workspace = true, features = ["v4", "serde"] }
Expand Down Expand Up @@ -76,6 +79,7 @@ tokio-util = { workspace = true }
anyhow = { workspace = true }

authz-resolver-sdk = { workspace = true }
authz-resolver = { workspace = true }

[features]
# Gates the Postgres-backed real-DB integration tests. Disabled by
Expand Down
1 change: 1 addition & 0 deletions gears/system/account-management/plugins/static-idp-plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ toolkit-canonical-errors = { workspace = true }
# Local dependencies
account-management-sdk = { package = "cf-gears-account-management-sdk", version = "0.1.3", path = "../../account-management-sdk" }
types-registry-sdk = { package = "cf-gears-types-registry-sdk", version = "0.2.3", path = "../../../types-registry/types-registry-sdk" }
types-registry = { workspace = true }

# ToolKit dependencies
toolkit = { workspace = true }
Expand Down
2 changes: 2 additions & 0 deletions gears/system/api-gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ toolkit-http = { workspace = true }
toolkit-security = { workspace = true }
toolkit-canonical-errors = { workspace = true, features = ["axum"] }
authn-resolver-sdk = { package = "cf-gears-authn-resolver-sdk", version = "0.3.17", path = "../authn-resolver/authn-resolver-sdk" }
grpc_hub = { workspace = true }
authn-resolver = { workspace = true }
toolkit-macros = { workspace = true }
inventory = { workspace = true }
anyhow = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions gears/system/authn-resolver/authn-resolver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ toolkit-canonical-errors = { workspace = true }
# Local dependencies
authn-resolver-sdk = { package = "cf-gears-authn-resolver-sdk", version = "0.3.17", path = "../authn-resolver-sdk" }
types-registry-sdk = { package = "cf-gears-types-registry-sdk", version = "0.2.3", path = "../../types-registry/types-registry-sdk" }
types-registry = { workspace = true }

# ToolKit dependencies
toolkit = { workspace = true }
Expand Down
2 changes: 2 additions & 0 deletions gears/system/authn-resolver/plugins/oidc-authn-plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ types-registry-sdk = {
version = "0.2",
path = "../../../types-registry/types-registry-sdk"
}
types-registry = { workspace = true }
authn-resolver = { workspace = true }

# ToolKit dependencies
toolkit.workspace = true
Expand Down
1 change: 1 addition & 0 deletions gears/system/authn-resolver/plugins/static-authn-plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ workspace = true
# Local dependencies
authn-resolver-sdk = { package = "cf-gears-authn-resolver-sdk", version = "0.3.17", path = "../../authn-resolver-sdk" }
types-registry-sdk = { package = "cf-gears-types-registry-sdk", version = "0.2.3", path = "../../../types-registry/types-registry-sdk" }
types-registry = { workspace = true }

# ToolKit dependencies
toolkit = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions gears/system/authz-resolver/authz-resolver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ toolkit-canonical-errors = { workspace = true }
# Local dependencies
authz-resolver-sdk = { package = "cf-gears-authz-resolver-sdk", version = "0.3.8", path = "../authz-resolver-sdk" }
types-registry-sdk = { package = "cf-gears-types-registry-sdk", version = "0.2.3", path = "../../types-registry/types-registry-sdk" }
types-registry = { workspace = true }

# ToolKit dependencies
toolkit = { workspace = true }
Expand Down
Loading
Loading