wip

the-guild-org · Mar 18, 2024 · 77ab5dc · 77ab5dc
1 parent 62597a2
commit 77ab5dc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 28 deletions.
diff --git a/libs/common/src/execute.rs b/libs/common/src/execute.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use crate::{
   graphql::ParsedGraphQLRequest,
   http::{ConductorHttpRequest, ConductorHttpResponse},

diff --git a/libs/config/conductor.schema.json b/libs/config/conductor.schema.json
@@ -231,6 +231,7 @@
           "type": "string"
         },
         "schema_awareness": {
+          "description": "TODO: docs",
           "anyOf": [
             {
               "$ref": "#/definitions/SchemaAwarenessConfig"

diff --git a/libs/config/src/lib.rs b/libs/config/src/lib.rs
@@ -163,7 +163,6 @@ fn endpoint_definition_example1() -> JsonSchemaExample<ConductorConfig> {
                 config: GraphQLSourceConfig {
                     endpoint: "https://my-source.com/graphql".to_string(),
                     schema_awareness: None,
-                    validate_operations: false
                 },
             }],
             endpoints: vec![EndpointDefinition {
@@ -188,7 +187,6 @@ fn endpoint_definition_example2() -> JsonSchemaExample<ConductorConfig> {
                 config: GraphQLSourceConfig {
                     endpoint: "https://my-source.com/graphql".to_string(),
                     schema_awareness: None,
-                    validate_operations: false
                 },
             }],
             endpoints: vec![EndpointDefinition {
@@ -467,15 +465,6 @@ pub struct GraphQLSourceConfig {
   pub endpoint: String,
   /// TODO: docs
   pub schema_awareness: Option<SchemaAwarenessConfig>,
-  /// Runs GraphQL validation when `schema_awareness` is configured and loaded correctly.
-  ///
-  /// If schema awareness is not configured or not loaded sucussfully, this option is ignored.
-  #[serde(default = "default_graphql_source_validate_operations")]
-  pub validate_operations: bool,
-}
-
-fn default_graphql_source_validate_operations() -> bool {
-  true
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone, JsonSchema)]
@@ -571,7 +560,6 @@ fn graphql_source_definition_example() -> JsonSchemaExample<SourceDefinition> {
       config: GraphQLSourceConfig {
         endpoint: "https://my-source.com/graphql".to_string(),
         schema_awareness: None,
-        validate_operations: false,
       },
     },
   }

diff --git a/libs/e2e_tests/suite.rs b/libs/e2e_tests/suite.rs
@@ -30,7 +30,6 @@ impl TestSuite {
       GraphQLSourceConfig {
         endpoint: mock_server.url("/graphql"),
         schema_awareness: None,
-        validate_operations: false,
       },
     )
     .await
@@ -67,7 +66,6 @@ impl TestSuite {
       GraphQLSourceConfig {
         endpoint: mock_server.url("/graphql"),
         schema_awareness: None,
-        validate_operations: false,
       },
     )
     .await

diff --git a/libs/engine/src/source/graphql_source.rs b/libs/engine/src/source/graphql_source.rs
@@ -2,7 +2,7 @@ use std::{future::Future, pin::Pin, sync::Arc};
 
 use conductor_common::{
   execute::RequestExecutionContext,
-  graphql::{validate_graphql_operation, GraphQLResponse, ParsedGraphQLSchema},
+  graphql::{GraphQLResponse, ParsedGraphQLSchema},
   http::{ConductorHttpRequest, CONTENT_TYPE},
 };
 use conductor_config::GraphQLSourceConfig;
@@ -76,18 +76,6 @@ impl SourceRuntime for GraphQLSourceRuntime {
     route_data: &'a ConductorGatewayRouteData,
     request_context: &'a mut RequestExecutionContext,
   ) -> Pin<Box<(dyn Future<Output = Result<GraphQLResponse, SourceError>> + 'a)>> {
-    if self.config.validate_operations {
-      if let Some(schema) = self.schema() {
-        if let Some(operation) = &request_context.downstream_graphql_request {
-          let errors = validate_graphql_operation(schema.as_ref(), &operation.parsed_operation);
-
-          if !errors.is_empty() {
-            return Box::pin(async move { Ok(errors.into()) });
-          }
-        }
-      }
-    }
-
     Box::pin(wasm_polyfills::call_async(async move {
       let fetcher = &self.fetcher;
       let endpoint = &self.config.endpoint;

diff --git a/plugins/graphql_validation/src/plugin.rs b/plugins/graphql_validation/src/plugin.rs
@@ -20,6 +20,14 @@ impl CreatablePlugin for GraphQLValidationPlugin {
 #[async_trait::async_trait(?Send)]
 impl Plugin for GraphQLValidationPlugin {
   async fn on_downstream_graphql_request(&self, _ctx: &mut RequestExecutionContext) {
-
+    if let Some(schema) = self.schema() {
+      if let Some(operation) = &request_context.downstream_graphql_request {
+        let errors = validate_graphql_operation(schema.as_ref(), &operation.parsed_operation);
+
+        if !errors.is_empty() {
+          return Box::pin(async move { Ok(errors.into()) });
+        }
+      }
+    }
   }
 }