Insert ndc-spec version into CapabilitiesResponse instead of expectin…

…g connector to do it
hasura · Jul 8, 2024 · 3cece04 · 3cece04
1 parent 7f83820
commit 3cece04
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sdk/Cargo.toml b/crates/sdk/Cargo.toml
@@ -24,8 +24,8 @@ rustls = ["reqwest/rustls"]
 ndc-test = ["dep:ndc-test"]
 
 [dependencies]
-ndc-models = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.4" }
-ndc-test = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.4", optional = true }
+ndc-models = { git = "http://github.com/hasura/ndc-spec.git" }
+ndc-test = { git = "http://github.com/hasura/ndc-spec.git", optional = true }
 
 async-trait = "0.1.79"
 axum = { version = "0.6.20", features = ["http2"] }

diff --git a/crates/sdk/src/connector.rs b/crates/sdk/src/connector.rs
@@ -69,7 +69,7 @@ pub trait Connector {
     ///
     /// This function implements the [capabilities endpoint](https://hasura.github.io/ndc-spec/specification/capabilities.html)
     /// from the NDC specification.
-    async fn get_capabilities() -> JsonResponse<models::CapabilitiesResponse>;
+    async fn get_capabilities() -> models::Capabilities;
 
     /// Get the connector's schema.
     ///

diff --git a/crates/sdk/src/connector/example.rs b/crates/sdk/src/connector/example.rs
@@ -48,28 +48,24 @@ impl Connector for Example {
         Ok(())
     }
 
-    async fn get_capabilities() -> JsonResponse<models::CapabilitiesResponse> {
-        models::CapabilitiesResponse {
-            version: "0.1.4".into(),
-            capabilities: models::Capabilities {
-                relationships: None,
-                query: models::QueryCapabilities {
-                    variables: None,
+    async fn get_capabilities() -> models::Capabilities {
+        models::Capabilities {
+            relationships: None,
+            query: models::QueryCapabilities {
+                variables: None,
+                aggregates: None,
+                explain: None,
+                nested_fields: models::NestedFieldCapabilities {
+                    filter_by: None,
+                    order_by: None,
                     aggregates: None,
-                    explain: None,
-                    nested_fields: models::NestedFieldCapabilities {
-                        filter_by: None,
-                        order_by: None,
-                        aggregates: None,
-                    },
-                },
-                mutation: models::MutationCapabilities {
-                    transactional: None,
-                    explain: None,
                 },
             },
+            mutation: models::MutationCapabilities {
+                transactional: None,
+                explain: None,
+            },
         }
-        .into()
     }
 
     async fn get_schema(

diff --git a/crates/sdk/src/default_main.rs b/crates/sdk/src/default_main.rs
@@ -378,7 +378,11 @@ async fn get_metrics<C: Connector>(
 }
 
 async fn get_capabilities<C: Connector>() -> JsonResponse<CapabilitiesResponse> {
-    C::get_capabilities().await
+    let capabilities = C::get_capabilities().await;
+    CapabilitiesResponse {
+        version: ndc_models::VERSION.into(),
+        capabilities
+    }.into()
 }
 
 async fn get_health<C: Connector>(State(state): State<ServerState<C>>) -> Result<(), HealthError> {
@@ -441,7 +445,7 @@ mod ndc_test_commands {
         async fn get_capabilities(
             &self,
         ) -> Result<ndc_models::CapabilitiesResponse, ndc_test::error::Error> {
-            C::get_capabilities()
+            super::get_capabilities::<C>()
                 .await
                 .into_value::<Box<dyn std::error::Error>>()
                 .map_err(ndc_test::error::Error::OtherError)