Fix issues with incorrect plugins setup for WASM

the-guild-org · Nov 27, 2023 · 923b25b · 923b25b
1 parent 9ce30c1
commit 923b25b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/libs/engine/src/gateway.rs b/libs/engine/src/gateway.rs
@@ -76,7 +76,7 @@ impl ConductorGateway {
 
         let combined_plugins = global_plugins
             .iter()
-            .chain(&self.config.plugins)
+            .chain(&endpoint_config.plugins)
             .flat_map(|vec| vec.iter())
             .cloned()
             .collect::<Vec<_>>();

diff --git a/libs/engine/src/plugins/plugin_manager.rs b/libs/engine/src/plugins/plugin_manager.rs
@@ -3,6 +3,7 @@ use conductor_common::{
     http::ConductorHttpResponse,
 };
 use conductor_config::PluginDefinition;
+use tracing::debug;
 
 use crate::request_execution_context::RequestExecutionContext;
 
@@ -22,6 +23,8 @@ impl PluginManager {
         let mut instance = PluginManager::default();
 
         if let Some(config_defs) = plugins_config {
+            debug!("config_defs: {:?}", config_defs);
+
             config_defs.iter().for_each(|plugin_def| match plugin_def {
                 PluginDefinition::GraphiQLPlugin { config } => {
                     instance.register_plugin(GraphiQLPlugin(config.clone().unwrap_or_default()))
@@ -48,9 +51,13 @@ impl PluginManager {
 
     #[tracing::instrument(level = "debug", skip(self, context))]
     pub async fn on_downstream_http_request(&self, context: &mut RequestExecutionContext<'_>) {
+        debug!("on_downstream_http_request");
         let p = &self.plugins;
+        debug!("plugins: {:?}", p.iter().count());
 
         for plugin in p.iter() {
+            debug!("calling plugin: {:?}", plugin);
+
             plugin.on_downstream_http_request(context).await;
 
             if context.is_short_circuit() {

diff --git a/test_config/worker.yaml b/test_config/worker.yaml
@@ -1,9 +1,5 @@
-server:
-  port: 9000
-
 logger:
   level: debug
-  format: pretty
 
 sources:
   - id: countries
@@ -15,5 +11,5 @@ endpoints:
   - path: /graphql
     from: countries
     plugins:
-      - type: graphiql
       - type: http_get
+      - type: graphiql