Fix the bridge configuration of the clean session flag (#426)

* Fix bridge config: the session must not been clean on re-connect

* Fix function scope

Co-authored-by: Wenzek <diw@softwareag.com>

3 files changed, 26 insertions, 25 deletions

diff --git a/tedge/src/cli/connect/bridge_config.rs b/tedge/src/cli/connect/bridge_config.rs
index 0c45775b..3bd70972 100644
--- a/tedge/src/cli/connect/bridge_config.rs
+++ b/tedge/src/cli/connect/bridge_config.rs
@@ -348,26 +348,27 @@ bridge_attempt_unsubscribe false
 
         Ok(())
     }
-}
-fn default_bridge_config() -> BridgeConfig {
-    BridgeConfig {
-        cloud_name: "az/c8y".into(),
-        config_file: "cfg".to_string(),
-        connection: "edge_to_az/c8y".into(),
-        address: "".into(),
-        remote_username: None,
-        bridge_root_cert_path: "".into(),
-        bridge_certfile: "".into(),
-        bridge_keyfile: "".into(),
-        remote_clientid: "".into(),
-        local_clientid: "".into(),
-        use_mapper: true,
-        use_agent: true,
-        try_private: false,
-        start_type: "automatic".into(),
-        clean_session: true,
-        notifications: false,
-        bridge_attempt_unsubscribe: false,
-        topics: vec![],
+
+    fn default_bridge_config() -> BridgeConfig {
+        BridgeConfig {
+            cloud_name: "az/c8y".into(),
+            config_file: "cfg".to_string(),
+            connection: "edge_to_az/c8y".into(),
+            address: "".into(),
+            remote_username: None,
+            bridge_root_cert_path: "".into(),
+            bridge_certfile: "".into(),
+            bridge_keyfile: "".into(),
+            remote_clientid: "".into(),
+            local_clientid: "".into(),
+            use_mapper: true,
+            use_agent: true,
+            try_private: false,
+            start_type: "automatic".into(),
+            clean_session: true,
+            notifications: false,
+            bridge_attempt_unsubscribe: false,
+            topics: vec![],
+        }
     }
 }
diff --git a/tedge/src/cli/connect/bridge_config_azure.rs b/tedge/src/cli/connect/bridge_config_azure.rs
index c126e4de..0aa5ac1b 100644
--- a/tedge/src/cli/connect/bridge_config_azure.rs
+++ b/tedge/src/cli/connect/bridge_config_azure.rs
@@ -50,7 +50,7 @@ impl From<BridgeConfigAzureParams> for BridgeConfig {
             use_agent: false,
             try_private: false,
             start_type: "automatic".into(),
-            clean_session: true,
+            clean_session: false,
             notifications: false,
             bridge_attempt_unsubscribe: false,
             topics: vec![
@@ -100,7 +100,7 @@ fn test_bridge_config_from_azure_params() -> anyhow::Result<()> {
         ],
         try_private: false,
         start_type: "automatic".into(),
-        clean_session: true,
+        clean_session: false,
         notifications: false,
         bridge_attempt_unsubscribe: false,
     };
diff --git a/tedge/src/cli/connect/bridge_config_c8y.rs b/tedge/src/cli/connect/bridge_config_c8y.rs
index e95efd0d..574b1543 100644
--- a/tedge/src/cli/connect/bridge_config_c8y.rs
+++ b/tedge/src/cli/connect/bridge_config_c8y.rs
@@ -40,7 +40,7 @@ impl From<BridgeConfigC8yParams> for BridgeConfig {
             use_agent: true,
             try_private: false,
             start_type: "automatic".into(),
-            clean_session: true,
+            clean_session: false,
             notifications: false,
             bridge_attempt_unsubscribe: false,
             topics: vec![
@@ -133,7 +133,7 @@ fn test_bridge_config_from_c8y_params() -> anyhow::Result<()> {
         ],
         try_private: false,
         start_type: "automatic".into(),
-        clean_session: true,
+        clean_session: false,
         notifications: false,
         bridge_attempt_unsubscribe: false,
     };