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

Update ndc-sdk version to v1.6.0 #151

Merged
merged 10 commits into from
Oct 3, 2024
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
134 changes: 45 additions & 89 deletions Cargo.lock

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

10 changes: 6 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ unused_async = "allow"

[workspace.dependencies]
# ndc-models was using version 0.1.2 but we needed rustls fix
ndc-models = { git = "https://github.com/hasura/ndc-spec.git", rev = "c59f824ff95e6a376c34f85816e80164bc1f3894" }
ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs.git", rev = "a273a01efccfc71ef3341cf5f357b2c9ae2d109f", default-features = false, features = ["rustls"]}
# ndc-test was using version 0.1.2 but we needed rustls fix
ndc-test = { git = "https://github.com/hasura/ndc-spec.git", rev = "c59f824ff95e6a376c34f85816e80164bc1f3894", default-features = false, features = ["rustls"] }

ndc-models = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.6" }
ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs.git", tag = "v0.4.0" }
ndc-test = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.6" }

smol_str = "0.1"
3 changes: 0 additions & 3 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,5 @@ tokio = { version = "1.37.0", features = ["full"] }
[dev-dependencies]
tempfile = "3.10.1"

[build-dependencies]
build-data = "0.2.1"

[package.metadata.cargo-machete]
ignored = ["build_data"] # apparently cargo-machete doesn't find dependencies used by build scripts
19 changes: 9 additions & 10 deletions crates/cli/tests/update_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,15 @@ async fn test_update_configuration() -> anyhow::Result<()> {
let contents = fs::read_to_string(configuration_file_path).await?;
common::assert_ends_with_newline(&contents);
let output: RawConfiguration = serde_json::from_str(&contents)?;
match output {
configuration::RawConfiguration {
mssql_connection_string,
metadata,
..
} => {
assert_eq!(mssql_connection_string, connection_uri);
let some_table_metadata = metadata.tables.0.get("Artist");
assert!(some_table_metadata.is_some());
}
let configuration::RawConfiguration {
mssql_connection_string,
metadata,
..
} = output;
{
assert_eq!(mssql_connection_string, connection_uri);
let some_table_metadata = metadata.tables.0.get("Artist");
assert!(some_table_metadata.is_some());
}

Ok(())
Expand Down
1 change: 1 addition & 0 deletions crates/configuration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ edition.workspace = true
workspace = true

[dependencies]
ndc-models = { workspace = true }
query-engine-metadata = { path = "../query-engine/metadata" }
query-engine-metrics = { path = "../query-engine/metrics" }

Expand Down
Loading
Loading