Merge pull request #75 from OneLiteFeatherNET/refactor/server

Refactor/server

Author: Randoooom

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "feedback-fusion"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 license = "MIT"
 
@@ -22,6 +22,7 @@ getset = "0.1.2"
 itertools = "0.12.1"
 kanal = "0.1.0-pre8"
 lazy_static = "1.4.0"
+log = "0.4.22"
 nanoid = "0.4.0"
 notify = { version = "6.1.1", default-features = false, features = [
   "macos_kqueue",
@@ -45,6 +46,7 @@ tonic-reflection = "0.11.0"
 tonic-web = "0.11.0"
 tokio = { version = "1.37.0", features = ["full"] }
 tower = "0.4.13"
+tokio-retry = "0.3"
 tower-http = { version = "=0.4.4", features = ["trace", "validate-request"] }
 tracing = "0.1.39"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

Cargo.toml

@@ -70,7 +70,7 @@ dependencies = ["docker_network"]
 script = "docker compose -f tests/_common/oidc-mock/docker-compose.yaml up -d && sleep 5 && curl -s -o /dev/null http://localhost:5151/.well-known/openid-configuration"
 
 [tasks.integration_test]
-env = { OIDC_DISCOVERY_URL = "http://localhost:5151", OIDC_CLIENT_ID = "client", OIDC_CLIENT_SECRET = "secret", RUST_LOG = "INFO" }
+env = { OIDC_PROVIDER = "http://localhost:5151", OIDC_CLIENT_ID = "client", OIDC_CLIENT_SECRET = "secret", RUST_LOG = "INFO" }
 command = "cargo"
 args = ["test", "--no-fail-fast", "--test", "integration_test"]
 
@@ -86,7 +86,7 @@ docker run --name feedback-fusion -d \
   -e POSTGRES_PASSWORD=password \
   -e POSTGRES_DATABASE=postgres \
   -e POSTGRES_ENDPOINT=postgres:5432 \
-  -e OIDC_DISCOVERY_URL=http://oidc-server-mock \
+  -e OIDC_PROVIDER=http://oidc-server-mock \
   -e OIDC_ISSUER=http://localhost:5151 \
   -e RUST_LOG=DEBUG \
   --network feedback-fusion -p 8000:8000 feedback-fusion
@@ -125,7 +125,7 @@ docker run --name feedback-fusion -d \
   -e MYSQL_PASSWORD=password \
   -e MYSQL_DATABASE=database \
   -e MYSQL_ENDPOINT=mysql:3306 \
-  -e OIDC_DISCOVERY_URL=http://oidc-server-mock \
+  -e OIDC_PROVIDER=http://oidc-server-mock \
   -e OIDC_ISSUER=http://localhost:5151 \
   -e RUST_LOG=DEBUG \
   --network feedback-fusion -p 8000:8000 feedback-fusion
@@ -183,7 +183,7 @@ docker run --name feedback-fusion -d \
   -e MSSQL_PASSWORD=Password1 \
   -e MSSQL_DATABASE=master \
   -e MSSQL_ENDPOINT=mssql:1433 \
-  -e OIDC_DISCOVERY_URL=http://oidc-server-mock \
+  -e OIDC_PROVIDER=http://oidc-server-mock \
   -e OIDC_ISSUER=http://localhost:5151 \
   -e RUST_LOG=DEBUG \
   --network feedback-fusion -p 8000:8000 feedback-fusion

Makefile.toml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.1"
+appVersion: "0.1.2"

charts/feedback-fusion/Chart.yaml

@@ -4,8 +4,8 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.feedbackFusion.preset.name }}
 data:
-  {{- if .Values.feedbackFusion.preset.data }}
+  {{- with .Values.feedbackFusion.preset.data }}
   config.yaml: |
-    {{ .Values.feedbackFusion.preset.data | indent 4 }}
+    {{ toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}

charts/feedback-fusion/templates/configmap-preset.yaml

@@ -48,8 +48,8 @@ spec:
             {{- end }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
-          readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12 }}
+          startupProbe:
+            {{- toYaml .Values.startupProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

charts/feedback-fusion/templates/deployment.yaml

@@ -65,9 +65,12 @@ resources: {}
 livenessProbe:
   grpc:
     port: 8000
-readinessProbe:
+  periodSeconds: 5
+startupProbe:
   grpc:
     port: 8000
+  periodSeconds: 2
+  failureThreshold: 10
 
 # Additional volumes on the output Deployment definition.
 volumes: []
@@ -93,14 +96,32 @@ feedbackFusion:
     enabled: false
     name: feedback-fusion-preset
     create: false 
-    data: |
+    data:
+      # targets:
+      #   - id: target 
+      #     name: TestTarget 
+      #     description: A nice Target 
+      #     prompts:
+      #       - id: prompt 
+      #         title: Testprompt 
+      #         description: A nice Prompt 
+      #         active: true
+      #         fields:
+      #           - id: field1 
+      #             title: TextField
+      #             field_type: text 
+      #             options:
+      #               type: text
+      #               lines: 1 
+      #               placeholder: test
+
 
   config: 
     secret: feedback-fusion-config
     # RUST_LOG: INFO
     # GLOBAL_RATE_LIMIT: 10
     # OIDC_AUDIENCE: ""
-    # OIDC_DISCOVERY_URL: ""
+    # OIDC_PROVIDER: ""
     #
     # POSTGRES_ENDPOINT: ""
     # POSTGRES_USERNAME: ""

charts/feedback-fusion/values.yaml

@@ -39,7 +39,7 @@ lazy_static! {
 pub struct Config {
     #[serde(default = "default_global_rate_limit")]
     global_rate_limit: u64,
-    oidc_discovery_url: String,
+    oidc_provider: String,
     #[serde(default = "default_oidc_audience")]
     oidc_audience: String,
     oidc_issuer: Option<String>,

src/config.rs

@@ -23,6 +23,10 @@
 
 use crate::{database::migration::Migration, prelude::*};
 use rbatis::RBatis;
+use tokio_retry::{
+    strategy::{jitter, FibonacciBackoff},
+    Retry,
+};
 
 pub mod migration;
 pub mod schema;
@@ -105,7 +109,25 @@ macro_rules! database_configuration {
                             #[cfg(feature = $scheme)]
                             Self::$ident(config) => {
                                 let url = config.to_url($scheme);
-                                connection.init($driver {}, url.as_str())?;
+
+                                let retry_strategy = FibonacciBackoff::from_millis(500)
+                                    .map(jitter)
+                                    .take(5);
+
+                                Retry::spawn(retry_strategy.clone(), || async {
+                                    match connection.init($driver {}, url.as_str()) {
+                                        Ok(result) => Ok(result),
+                                        Err(error) => {
+                                            error!("Failed to establish DatabaseConnection, retrying in {}s", retry_strategy.clone().next().unwrap().as_secs());
+                                            error!("{}", error);
+
+                                            Err(error)
+                                        }
+                                    }
+                                }).await?;
+
+                                connection.intercepts.clear();
+                                connection.intercepts.push(std::sync::Arc::new(rbatis::plugin::intercept_log::LogInterceptor::new(log::LevelFilter::Debug)));
 
                                 // perform migrations
                                 let last: Option<Migration> = Migration::select_latest(&connection).await.unwrap_or_default();