chore: bump ndc_sdk

Cargo.toml

@@ -1,7 +1,8 @@
-[workspace.package]
-version = "0.1.0"
-
 [workspace]
+resolver = "2"
+package.version = "0.1.0"
+package.edition = "2021"
+
 members = [
   "crates/ndc-sqlserver",
   "crates/query-engine",

crates/ndc-sqlserver/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ndc-sqlserver"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 default-run = "ndc-sqlserver"
 
@@ -14,7 +14,7 @@ name = "ndc-sqlserver"
 path = "bin/main.rs"
 
 [dependencies]
-ndc-hub = { git = "https://github.com/hasura/ndc-hub.git", tag = "v0.1.0-rc.1", package = "ndc-sdk" }
+ndc-sdk = { git = "https://github.com/hasura/ndc-hub.git", rev = "098b1c2", package = "ndc-sdk" }
 query-engine = { path = "../query-engine" }
 
 tokio-util = { version = "0.7.9", features = ["compat"] }

crates/ndc-sqlserver/bin/main.rs

@@ -1,4 +1,4 @@
-use ndc_hub::default_main::default_main;
+use ndc_sdk::default_main::default_main;
 use ndc_sqlserver::connector::SQLServer;
 
 #[tokio::main]

crates/ndc-sqlserver/src/configuration.rs

@@ -1,7 +1,7 @@
 //! Configuration and state for our connector.
 use super::metrics;
 
-use ndc_hub::connector;
+use ndc_sdk::connector;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;

crates/ndc-sqlserver/src/connector.rs

@@ -8,8 +8,9 @@
 use tiberius::Query;
 
 use async_trait::async_trait;
-use ndc_hub::connector;
-use ndc_hub::models;
+use ndc_sdk::connector;
+use ndc_sdk::json_response::JsonResponse;
+use ndc_sdk::models;
 
 use query_engine::phases;
 
@@ -33,17 +34,17 @@ impl connector::Connector for SQLServer {
 
     /// Configure a configuration maybe?
     async fn update_configuration(
-        args: &Self::RawConfiguration,
+        args: Self::RawConfiguration,
     ) -> Result<configuration::DeploymentConfiguration, connector::UpdateConfigurationError> {
-        configuration::configure(args).await
+        configuration::configure(&args).await
     }
 
     /// Validate the raw configuration provided by the user,
     /// returning a configuration error or a validated [`Connector::Configuration`].
     async fn validate_raw_configuration(
-        configuration: &Self::RawConfiguration,
+        configuration: Self::RawConfiguration,
     ) -> Result<Self::Configuration, connector::ValidateError> {
-        configuration::validate_raw_configuration(configuration).await
+        configuration::validate_raw_configuration(&configuration).await
     }
 
     /// Initialize the connector's in-memory state.
@@ -93,9 +94,9 @@ impl connector::Connector for SQLServer {
     ///
     /// This function implements the [capabilities endpoint](https://hasura.github.io/ndc-spec/specification/capabilities.html)
     /// from the NDC specification.
-    async fn get_capabilities() -> models::CapabilitiesResponse {
+    async fn get_capabilities() -> JsonResponse<models::CapabilitiesResponse> {
         let empty = serde_json::to_value(()).unwrap();
-        models::CapabilitiesResponse {
+        JsonResponse::Value(models::CapabilitiesResponse {
             versions: "^0.0.0".into(),
             capabilities: models::Capabilities {
                 explain: Some(empty.clone()),
@@ -107,7 +108,7 @@ impl connector::Connector for SQLServer {
                 relationships: Some(empty),
                 mutations: None,
             },
-        }
+        })
     }
 
     /// Get the connector's schema.
@@ -116,7 +117,7 @@ impl connector::Connector for SQLServer {
     /// from the NDC specification.
     async fn get_schema(
         _configuration: &Self::Configuration,
-    ) -> Result<models::SchemaResponse, connector::SchemaError> {
+    ) -> Result<JsonResponse<models::SchemaResponse>, connector::SchemaError> {
         todo!("get_schema")
     }
 
@@ -128,7 +129,7 @@ impl connector::Connector for SQLServer {
         _configuration: &Self::Configuration,
         _state: &Self::State,
         _query_request: models::QueryRequest,
-    ) -> Result<models::ExplainResponse, connector::ExplainError> {
+    ) -> Result<JsonResponse<models::ExplainResponse>, connector::ExplainError> {
         todo!("explain!")
     }
 
@@ -140,7 +141,7 @@ impl connector::Connector for SQLServer {
         _configuration: &Self::Configuration,
         _state: &Self::State,
         _request: models::MutationRequest,
-    ) -> Result<models::MutationResponse, connector::MutationError> {
+    ) -> Result<JsonResponse<models::MutationResponse>, connector::MutationError> {
         todo!("mutations are currently not implemented")
     }
 
@@ -152,7 +153,7 @@ impl connector::Connector for SQLServer {
         configuration: &Self::Configuration,
         state: &Self::State,
         query_request: models::QueryRequest,
-    ) -> Result<models::QueryResponse, connector::QueryError> {
+    ) -> Result<JsonResponse<models::QueryResponse>, connector::QueryError> {
         tracing::info!("{}", serde_json::to_string(&query_request).unwrap());
         tracing::info!("{:?}", query_request);
 
@@ -184,7 +185,8 @@ impl connector::Connector for SQLServer {
         // assuming query succeeded, increment counter
         state.metrics.query_total.inc();
 
-        Ok(result)
+        // TODO: return raw JSON
+        Ok(JsonResponse::Value(result))
     }
 }
 

crates/ndc-sqlserver/src/metrics.rs

@@ -1,7 +1,7 @@
 //! Metrics setup and update for our connector.
 
 use super::configuration::InitializationError;
-use ndc_hub::connector;
+use ndc_sdk::connector;
 use prometheus::core::{AtomicU64, GenericCounter};
 
 #[derive(Debug, Clone)]

crates/ndc-sqlserver/tests/common/mod.rs

@@ -35,7 +35,7 @@ pub async fn run_explain(testname: &str) -> ExactExplainResponse {
 }
 
 /// Run a query against the server, get the result, and compare against the snapshot.
-pub async fn get_schema() -> ndc_hub::models::SchemaResponse {
+pub async fn get_schema() -> ndc_sdk::models::SchemaResponse {
     make_request(|client| client.get("/schema")).await
 }
 
@@ -71,13 +71,13 @@ async fn make_request<Response: for<'a> serde::Deserialize<'a>>(
     let test_deployment_file = get_deployment_file();
 
     // initialise server state with the static configuration.
-    let state = ndc_hub::default_main::init_server_state::<connector::SQLServer>(
+    let state = ndc_sdk::default_main::init_server_state::<connector::SQLServer>(
         test_deployment_file.display().to_string(),
     )
     .await;
 
     // create a fresh client
-    let router = ndc_hub::default_main::create_router(state);
+    let router = ndc_sdk::default_main::create_router(state, None);
     let client = TestClient::new(router);
 
     // make the request

crates/ndc-sqlserver/tests/snapshots/query_tests__aggregation__aggregate_count_albums.snap

@@ -5,12 +5,12 @@ expression: result
 [
   {
     "aggregates": {
-      "avg_artist_id": 121,
       "how_many_albums": 347,
       "how_many_artist_ids": 347,
       "how_many_distinct_artist_ids": 204,
+      "min_artist_id": 1,
       "max_artist_id": 275,
-      "min_artist_id": 1
+      "avg_artist_id": 121
     }
   }
 ]

crates/ndc-sqlserver/tests/snapshots/query_tests__aggregation__aggregate_count_albums_plus_field.snap

@@ -5,12 +5,12 @@ expression: result
 [
   {
     "aggregates": {
-      "avg_artist_id": 121,
       "how_many_albums": 347,
       "how_many_artist_ids": 347,
       "how_many_distinct_artist_ids": 204,
+      "min_artist_id": 1,
       "max_artist_id": 275,
-      "min_artist_id": 1
+      "avg_artist_id": 121
     },
     "rows": [
       {

crates/ndc-sqlserver/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums.snap

@@ -6,44 +6,44 @@ expression: result
   {
     "rows": [
       {
+        "Name": "Accept",
         "Albums": {
           "aggregates": {
             "how_many_albums": 2
           }
-        },
-        "Name": "Accept"
+        }
       },
       {
+        "Name": "Aerosmith",
         "Albums": {
           "aggregates": {
             "how_many_albums": 1
           }
-        },
-        "Name": "Aerosmith"
+        }
       },
       {
+        "Name": "Alanis Morissette",
         "Albums": {
           "aggregates": {
             "how_many_albums": 1
           }
-        },
-        "Name": "Alanis Morissette"
+        }
       },
       {
+        "Name": "Alice In Chains",
         "Albums": {
           "aggregates": {
             "how_many_albums": 1
           }
-        },
-        "Name": "Alice In Chains"
+        }
       },
       {
+        "Name": "Antônio Carlos Jobim",
         "Albums": {
           "aggregates": {
             "how_many_albums": 2
           }
-        },
-        "Name": "Antônio Carlos Jobim"
+        }
       }
     ]
   }

crates/ndc-sqlserver/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap

@@ -6,75 +6,75 @@ expression: result
   {
     "rows": [
       {
+        "Name": "Accept",
         "Albums": {
-          "aggregates": {
-            "how_many_albums": 2
-          },
           "rows": [
             {
               "Title": "Balls to the Wall"
             },
             {
               "Title": "Restless and Wild"
             }
-          ]
-        },
-        "Name": "Accept"
+          ],
+          "aggregates": {
+            "how_many_albums": 2
+          }
+        }
       },
       {
+        "Name": "Aerosmith",
         "Albums": {
-          "aggregates": {
-            "how_many_albums": 1
-          },
           "rows": [
             {
               "Title": "Big Ones"
             }
-          ]
-        },
-        "Name": "Aerosmith"
+          ],
+          "aggregates": {
+            "how_many_albums": 1
+          }
+        }
       },
       {
+        "Name": "Alanis Morissette",
         "Albums": {
-          "aggregates": {
-            "how_many_albums": 1
-          },
           "rows": [
             {
               "Title": "Jagged Little Pill"
             }
-          ]
-        },
-        "Name": "Alanis Morissette"
+          ],
+          "aggregates": {
+            "how_many_albums": 1
+          }
+        }
       },
       {
+        "Name": "Alice In Chains",
         "Albums": {
-          "aggregates": {
-            "how_many_albums": 1
-          },
           "rows": [
             {
               "Title": "Facelift"
             }
-          ]
-        },
-        "Name": "Alice In Chains"
+          ],
+          "aggregates": {
+            "how_many_albums": 1
+          }
+        }
       },
       {
+        "Name": "Antônio Carlos Jobim",
         "Albums": {
-          "aggregates": {
-            "how_many_albums": 2
-          },
           "rows": [
             {
               "Title": "Warner 25 Anos"
             },
             {
               "Title": "Chill: Brazil (Disc 2)"
             }
-          ]
-        },
-        "Name": "Antônio Carlos Jobim"
+          ],
+          "aggregates": {
+            "how_many_albums": 2
+          }
+        }
       }
     ]
   }