feat: made changes to runner for support of module configuration

Author: raphael-goetz

crates/base/src/client/mod.rs

@@ -9,15 +9,12 @@ use tonic::{
 use tucana::{
     aquila::{
         RuntimeStatusUpdateRequest, runtime_status_service_client::RuntimeStatusServiceClient,
-        runtime_status_update_request::Status,
-    },
-    shared::{AdapterRuntimeStatus, AdapterStatusConfiguration},
+    }, shared::ModuleStatus,
 };
 
 pub struct DracoRuntimeStatusService {
     channel: Channel,
     identifier: String,
-    configs: Vec<AdapterStatusConfiguration>,
     aquila_token: String,
 }
 
@@ -73,29 +70,26 @@ impl DracoRuntimeStatusService {
         aquila_url: String,
         aquila_token: String,
         identifier: String,
-        configs: Vec<AdapterStatusConfiguration>,
     ) -> Self {
         let channel = create_channel_with_retry("Aquila", aquila_url).await;
-        Self::new(channel, identifier, configs, aquila_token)
+        Self::new(channel, identifier, aquila_token)
     }
 
     pub fn new(
         channel: Channel,
         identifier: String,
-        configs: Vec<AdapterStatusConfiguration>,
         aquila_token: String,
     ) -> Self {
         DracoRuntimeStatusService {
             channel,
             identifier,
-            configs,
             aquila_token,
         }
     }
 
     pub async fn update_runtime_status_by_status(
         &self,
-        status: tucana::shared::adapter_runtime_status::Status,
+        status: tucana::shared::module_status::StatusVariant,
     ) {
         log::info!("Updating the current runtime status!");
         let mut client = RuntimeStatusServiceClient::new(self.channel.clone());
@@ -113,12 +107,11 @@ impl DracoRuntimeStatusService {
             get_authorization_metadata(&self.aquila_token),
             Extensions::new(),
             RuntimeStatusUpdateRequest {
-                status: Some(Status::AdapterRuntimeStatus(AdapterRuntimeStatus {
+                status: Some(ModuleStatus {
                     status: status.into(),
                     timestamp: timestamp as i64,
                     identifier: self.identifier.clone(),
-                    configurations: self.configs.clone(),
-                })),
+                }),
             },
         );
 

crates/base/src/runner.rs

@@ -1,15 +1,14 @@
 use crate::{
-    client::DracoRuntimeStatusService,
+    client::{DracoRuntimeStatusService},
     config::AdapterConfig,
     store::AdapterStore,
     traits::{LoadConfig, Server as AdapterServer},
 };
-use code0_flow::flow_service::FlowUpdateService;
+use code0_flow::flow_service::{FlowUpdateService, ModuleDefinitionAppendix};
 use std::{sync::Arc, time::Duration};
 use tokio::{signal, task::JoinHandle, time::sleep};
 use tonic::transport::Server;
 use tonic_health::pb::health_server::HealthServer;
-use tucana::shared::AdapterStatusConfiguration;
 
 /// Context passed to adapter server implementations containing all shared resources
 pub struct ServerContext<C: LoadConfig> {
@@ -58,7 +57,7 @@ impl<C: LoadConfig> ServerRunner<C> {
 
     pub async fn serve(
         self,
-        runtime_config: Vec<AdapterStatusConfiguration>,
+        appendix: Vec<ModuleDefinitionAppendix>,
     ) -> anyhow::Result<()> {
         let config = self.context.adapter_config.clone();
         let mut runtime_status_service: Option<Arc<DracoRuntimeStatusService>> = None;
@@ -71,26 +70,27 @@ impl<C: LoadConfig> ServerRunner<C> {
                     config.aquila_url.clone(),
                     config.aquila_token.clone(),
                     config.draco_variant.clone(),
-                    runtime_config,
                 )
                 .await,
             ));
 
             if let Some(ser) = &runtime_status_service {
                 ser.update_runtime_status_by_status(
-                    tucana::shared::adapter_runtime_status::Status::NotReady,
+                    tucana::shared::module_status::StatusVariant::NotReady,
                 )
                 .await;
             };
 
             let service_name = format!("draco-{}", config.draco_variant.to_lowercase());
+
             let mut definition_service = FlowUpdateService::from_url(
                 config.aquila_url.clone(),
                 config.definition_path.as_str(),
                 config.aquila_token.clone(),
             )
             .await
-            .with_definition_source(service_name);
+            .with_definition_source(service_name)
+            .with_appendix(appendix);
 
             let mut success = false;
             let mut count = 1;
@@ -144,7 +144,7 @@ impl<C: LoadConfig> ServerRunner<C> {
 
         if let Some(ser) = &runtime_status_service {
             ser.update_runtime_status_by_status(
-                tucana::shared::adapter_runtime_status::Status::Running,
+                tucana::shared::module_status::StatusVariant::Running,
             )
             .await;
 
@@ -163,7 +163,7 @@ impl<C: LoadConfig> ServerRunner<C> {
                         interval.tick().await;
                         status_service
                             .update_runtime_status_by_status(
-                                tucana::shared::adapter_runtime_status::Status::Running,
+                                tucana::shared::module_status::StatusVariant::Running,
                             )
                             .await;
                     }
@@ -251,7 +251,7 @@ impl<C: LoadConfig> ServerRunner<C> {
 
         if let Some(ser) = &runtime_status_service {
             ser.update_runtime_status_by_status(
-                tucana::shared::adapter_runtime_status::Status::Stopped,
+                tucana::shared::module_status::StatusVariant::Stopped,
             )
             .await;
         };