Skip to content
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.

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

unify workspace dependencies #11

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
377 changes: 203 additions & 174 deletions Cargo.lock

Large diffs are not rendered by default.

40 changes: 40 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,43 @@ default-members = [
"drive-deposits-lambda-dynamodb-reader",
]
resolver = "2"

[workspace.dependencies]
anyhow = "1.0.95"
assert_cmd = "2.0.16"
async-trait = "0.1.85"
aws-config = "1.5.13"
aws-sdk-dynamodb = "1.58.0"
aws-sdk-eventbridge = "1.56.0"
aws_lambda_events = "0.16.0"
axum = "0.8.1"
chrono = "0.4.39"
chrono-tz = "0.10.0"
clap = "4.5.24"
heck = "0.5.0"
lambda_http = "0.14.0"
lambda_runtime = "0.13.0"
log = "0.4.22"
mockall = "0.13.1"
once_cell = "1.20.2"
predicates = "3.1.3"
pretty_assertions = "1.4.1"
prost = "0.13.4"
rust_decimal = "1.36.0"
rust_decimal_macros = "1.36.0"
serde = "1.0.217"
serde_json = "1.0.135"
strum = "0.26"
strum_macros = "0.26"
thiserror = "2.0.9"
tokio = "1.42.0"
tonic = "0.12.3"
tonic-build = "0.12.3"
tonic-reflection = "0.12.3"
tonic-types = "0.12.3"
tower = "0.5.2"
tower-http = "0.6.2"
tracing = "0.1.41"
tracing-subscriber = "0.3.19"
uuid = "1.11.0"
validator = "0.19.0"
30 changes: 15 additions & 15 deletions drive-deposits-cal-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ version = "0.60.0"
edition = "2021"

[dependencies]
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
tracing = "0.1.41"
chrono = { version = "0.4.39", features = ["serde"] }
chrono-tz = { version = "0.10.0", features = ["serde"] }
rust_decimal = { version = "1.36.0", features = ["maths"] }
rust_decimal_macros = "1.36.0"
uuid = { version = "1.11.0", features = ["v4", "fast-rng", "macro-diagnostics", "serde"] }
once_cell = "1.20.2"
thiserror = "2.0.9"
tokio = { version = "1.42.0", features = ["full"] }
heck = "0.5.0"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tracing = { workspace = true }
chrono = { workspace = true, features = ["serde"] }
chrono-tz = { workspace = true, features = ["serde"] }
rust_decimal = { workspace = true, features = ["maths"] }
rust_decimal_macros = { workspace = true }
uuid = { workspace = true, features = ["v4", "fast-rng", "macro-diagnostics", "serde"] }
once_cell = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["full"] }
heck = { workspace = true }
# workspace member depdenencies
# proto generated dependency here the drive-deposits-proto-grpc-types is still package
# name so with dashes
drive-deposits-proto-grpc-types = { path = "../drive-deposits-proto-grpc-types" }
drive-deposits-event-source = { path = "../drive-deposits-event-source" }

[dev-dependencies]
pretty_assertions = "1.4.1"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
anyhow = "1.0.95"
pretty_assertions = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
anyhow = { workspace = true }
25 changes: 12 additions & 13 deletions drive-deposits-check-cmd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ version = "0.60.0"
edition = "2021"

[dependencies]
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
thiserror = "2.0.9"
anyhow = "1.0.95"
tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
clap = { version = "4.5.24", features = ["derive"] }
rust_decimal = { version = "1.36.0", features = ["maths"] }
once_cell = "1.20.2"
validator = { version = "0.19.0", features = ["derive"] }
tokio = { version = "1.42.0", features = ["full"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
anyhow = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
clap = { workspace = true, features = ["derive"] }
once_cell = { workspace = true }
validator = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["full"] }

# workspace member depdenencies
drive-deposits-rest-types = { path = "../drive-deposits-rest-types" }
Expand All @@ -27,8 +26,8 @@ drive-deposits-event-source = { path = "../drive-deposits-event-source" }


[dev-dependencies]
assert_cmd = "2.0.16"
predicates = "3.1.3"
assert_cmd = { workspace = true }
predicates = { workspace = true }
#pretty_assertions = "1.4.0"

[features]
Expand Down
19 changes: 8 additions & 11 deletions drive-deposits-event-source/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@ edition = "2021"


[dependencies]
aws-config = { version = "1.5.13", features = ["behavior-version-latest"] }
aws-sdk-eventbridge = "1.56.0"
tokio = { version = "1.42.0", features = ["full"] }
tracing = "0.1.41"
thiserror = "2.0.9"
serde_json = "1.0.135"
serde = { version = "1.0.217", features = ["derive"] }
aws-config = { workspace = true, features = ["behavior-version-latest"] }
aws-sdk-eventbridge = { workspace = true }
tracing = { workspace = true }
thiserror = { workspace = true }
# workspace member depdenencies
drive-deposits-rest-types = { path = "../drive-deposits-rest-types" }
log = "0.4.22"
log = { workspace = true }

[dev-dependencies]
pretty_assertions = "1.4.1"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
anyhow = "1.0.95"
pretty_assertions = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
anyhow = { workspace = true }
12 changes: 6 additions & 6 deletions drive-deposits-grpc-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ version = "0.60.0"
edition = "2021"

[dependencies]
tonic = "0.12.3"
tonic-reflection = "0.12.3"
tonic-types = "0.12.3"
tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
tokio = { version = "1.42.0", features = ["full"] }
tonic = { workspace = true }
tonic-reflection = { workspace = true }
tonic-types = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
tokio = { workspace = true, features = ["full"] }

# workspace member depdenencies
drive-deposits-rest-types = { path = "../drive-deposits-rest-types" }
Expand Down
12 changes: 6 additions & 6 deletions drive-deposits-lambda-db-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ version = "0.60.0"
edition = "2021"

[dependencies]
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
thiserror = "2.0.9"
rust_decimal = { version = "1.36.0", features = ["maths"] }
aws-sdk-dynamodb = "1.58.0"
tracing = "0.1.41"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
rust_decimal = { workspace = true, features = ["maths"] }
aws-sdk-dynamodb = { workspace = true }
tracing = { workspace = true }
# workspace member depdenencies
drive-deposits-rest-types = { path = "../drive-deposits-rest-types" }
24 changes: 10 additions & 14 deletions drive-deposits-lambda-dynamodb-reader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,18 @@ version = "0.60.0"
edition = "2021"

[dependencies]
aws-config = { version = "1.5.13", features = ["behavior-version-latest"] }
aws-sdk-dynamodb = "1.58.0"
lambda_http = "0.14.0"
thiserror = "2.0.9"
tracing = "0.1.41"
axum = { version = "0.8.1", features = ["macros"] }
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
tokio = { version = "1", features = ["macros"] }
aws-config = { workspace = true, features = ["behavior-version-latest"] }
aws-sdk-dynamodb = { workspace = true }
lambda_http = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
axum = { workspace = true, features = ["macros"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
# workspace member depdenencies
drive-deposits-lambda-db-types = { path = "../drive-deposits-lambda-db-types" }

# uuid added in different style
[dependencies.uuid]
version = "1.11.0"
features = ["v4"]
uuid = { workspace = true, features = ["v4"] }

[[bin]]
name = "by_level_lambda_reader"
Expand Down
18 changes: 9 additions & 9 deletions drive-deposits-logs-lambda-target/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ version = "0.60.0"
edition = "2021"

[dependencies]
aws-config = { version = "1.5.13", features = ["behavior-version-latest"] }
aws-sdk-dynamodb = "1.58.0"
aws_lambda_events = "0.16.0"
lambda_runtime = "0.13.0"
tokio = { version = "1", features = ["macros"] }
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
thiserror = "2.0.9"
tracing = "0.1.41"
aws-config = { workspace = true, features = ["behavior-version-latest"] }
aws-sdk-dynamodb = { workspace = true }
aws_lambda_events = { workspace = true }
lambda_runtime = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
# workspace member depdenencies
drive-deposits-rest-types = { path = "../drive-deposits-rest-types" }
drive-deposits-lambda-db-types = { path = "../drive-deposits-lambda-db-types" }
Expand Down
10 changes: 5 additions & 5 deletions drive-deposits-proto-grpc-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ version = "0.60.0"
edition = "2021"

[dependencies]
prost = "0.13.4"
tonic = "0.12.3"
tracing = "0.1.41"
heck = "0.5.0"
prost = { workspace = true }
tonic = { workspace = true }
tracing = { workspace = true }
heck = { workspace = true }

# workspace member depdenencies
drive-deposits-rest-types = { path = "../drive-deposits-rest-types" }

[build-dependencies]
tonic-build = "0.12.3"
tonic-build = { workspace = true }
27 changes: 13 additions & 14 deletions drive-deposits-rest-gateway-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,19 @@ version = "0.60.0"
edition = "2021"

[dependencies]
axum = { version = "0.8.1", features = ["macros"] }
tokio = { version = "1.42.0", features = ["full"] }
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
thiserror = "2.0.9"
validator = { version = "0.19.0", features = ["derive"] }
tonic = "0.12.3"
tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
axum = { workspace = true, features = ["macros"] }
tokio = { workspace = true, features = ["full"] }
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
validator = { workspace = true, features = ["derive"] }
tonic = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
# tower and tower-http
tower = { version = "0.5.2", features = ["full"] }
tower-http = { version = "0.6.2", features = ["full"] }
mockall = "0.13.1"
async-trait = "0.1.85"
tower = { workspace = true, features = ["full"] }
tower-http = { workspace = true, features = ["full"] }
mockall = { workspace = true }
async-trait = { workspace = true }

# workspace member depdenencies
drive-deposits-rest-types = { path = "../drive-deposits-rest-types" }
Expand All @@ -27,4 +26,4 @@ drive-deposits-proto-grpc-types = { path = "../drive-deposits-proto-grpc-types"


[dev-dependencies]
pretty_assertions = "1.4.1"
pretty_assertions = { workspace = true }
15 changes: 7 additions & 8 deletions drive-deposits-rest-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ version = "0.60.0"
edition = "2021"

[dependencies]
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
validator = { version = "0.19.0", features = ["derive"] }
rust_decimal = { version = "1.36.0" }
strum = "0.26"
strum_macros = "0.26"
chrono = "0.4.39"
chrono-tz = "0.10.0"
serde = { workspace = true, features = ["derive"] }
validator = { workspace = true, features = ["derive"] }
rust_decimal = { workspace = true }
strum = { workspace = true }
strum_macros = { workspace = true }
chrono = { workspace = true }
chrono-tz = { workspace = true }
6 changes: 2 additions & 4 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,9 @@ localstack-clean-build-drive-deposit-event-rules: clean-build-drive-deposit-even
# the request.http supports it so alternatively that can be used for br brotli compression
# Define variables
# for k8s with ingress
#rest_gateway_server_host := "http://api.drivedeposits.local"

rest_gateway_server_host := "http://api.drivedeposits.local"

#rest_gateway_server_host := "http://localhost:3000"

rest_gateway_server_host := "http://localhost:3000"
token := "Bearer token"

# Recipe for the POST request with root path
Expand Down