Merge branch 'main' into feature/1030/configuration-management

1 files changed, 79 insertions, 32 deletions

diff --git a/Cargo.lock b/Cargo.lock
index db7cfa9d..db037f61 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,7 +19,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "agent_interface"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "csv",
  "download",
@@ -271,7 +271,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "batcher"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "time",
  "tokio",
@@ -358,7 +358,7 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "c8y_api"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "agent_interface",
  "anyhow",
@@ -413,7 +413,7 @@ dependencies = [
 
 [[package]]
 name = "c8y_smartrest"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "agent_interface",
  "anyhow",
@@ -437,7 +437,7 @@ dependencies = [
 
 [[package]]
 name = "c8y_translator"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "assert-json-diff",
@@ -477,7 +477,7 @@ checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 
 [[package]]
 name = "certificate"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -546,7 +546,7 @@ dependencies = [
 
 [[package]]
 name = "clock"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "mockall 0.10.2",
  "time",
@@ -833,7 +833,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "download"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "backoff",
@@ -941,7 +941,7 @@ dependencies = [
 
 [[package]]
 name = "flockfile"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "assert_matches",
  "nix",
@@ -1386,7 +1386,7 @@ dependencies = [
 
 [[package]]
 name = "json-writer"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -1425,6 +1425,21 @@ dependencies = [
 ]
 
 [[package]]
+name = "logged_command"
+version = "0.6.1"
+dependencies = [
+ "anyhow",
+ "assert_matches",
+ "async-trait",
+ "log",
+ "serial_test 0.6.0",
+ "tempfile",
+ "test-case",
+ "thiserror",
+ "tokio",
+]
+
+[[package]]
 name = "matches"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1584,7 +1599,7 @@ dependencies = [
 
 [[package]]
 name = "mqtt_channel"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1592,14 +1607,14 @@ dependencies = [
  "futures",
  "mqtt_tests",
  "rumqttc",
- "serial_test",
+ "serial_test 0.5.1",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "mqtt_tests"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "fastrand",
@@ -1971,7 +1986,7 @@ dependencies = [
 
 [[package]]
 name = "plugin_sm"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "agent_interface",
  "anyhow",
@@ -1979,9 +1994,10 @@ dependencies = [
  "async-trait",
  "csv",
  "download",
+ "logged_command",
  "serde",
  "serde_json",
- "serial_test",
+ "serial_test 0.5.1",
  "tedge_utils",
  "tempfile",
  "test-case",
@@ -2478,6 +2494,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "rustversion"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
+
+[[package]]
 name = "rusty-fork"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2512,7 +2534,7 @@ dependencies = [
 
 [[package]]
 name = "sawtooth_publisher"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "async-log",
  "env_logger 0.9.0",
@@ -2634,7 +2656,18 @@ checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d"
 dependencies = [
  "lazy_static",
  "parking_lot 0.11.2",
- "serial_test_derive",
+ "serial_test_derive 0.5.1",
+]
+
+[[package]]
+name = "serial_test"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5bcc41d18f7a1d50525d080fd3e953be87c4f9f1a974f3c21798ca00d54ec15"
+dependencies = [
+ "lazy_static",
+ "parking_lot 0.11.2",
+ "serial_test_derive 0.6.0",
 ]
 
 [[package]]
@@ -2649,6 +2682,19 @@ dependencies = [
 ]
 
 [[package]]
+name = "serial_test_derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2881bccd7d60fb32dfa3d7b3136385312f8ad75e2674aab2852867a09790cae8"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2 1.0.36",
+ "quote 1.0.15",
+ "rustversion",
+ "syn 1.0.88",
+]
+
+[[package]]
 name = "sha-1"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2772,7 +2818,7 @@ dependencies = [
 
 [[package]]
 name = "tedge"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -2805,7 +2851,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_agent"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "agent_interface",
  "anyhow",
@@ -2823,7 +2869,7 @@ dependencies = [
  "predicates 2.1.1",
  "serde",
  "serde_json",
- "serial_test",
+ "serial_test 0.5.1",
  "tedge_config",
  "tedge_users",
  "tedge_utils",
@@ -2838,7 +2884,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_apama_plugin"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "clap 3.1.6",
  "roxmltree",
@@ -2849,7 +2895,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_apt_plugin"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "clap 3.1.6",
@@ -2857,7 +2903,7 @@ dependencies = [
  "hamcrest2",
  "reqwest",
  "serde",
- "serial_test",
+ "serial_test 0.5.1",
  "tedge_utils",
  "test-case",
  "thiserror",
@@ -2865,7 +2911,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_config"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "assert_matches",
  "certificate",
@@ -2880,7 +2926,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_dummy_plugin"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "clap 3.1.6",
  "thiserror",
@@ -2888,7 +2934,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_logfile_request_plugin"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2911,7 +2957,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_mapper"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "agent_interface",
  "anyhow",
@@ -2929,12 +2975,13 @@ dependencies = [
  "flockfile",
  "futures",
  "mockall 0.11.0",
+ "mockito",
  "mqtt_channel",
  "mqtt_tests",
  "reqwest",
  "serde",
  "serde_json",
- "serial_test",
+ "serial_test 0.5.1",
  "tedge_config",
  "tedge_users",
  "tedge_utils",
@@ -2951,7 +2998,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_users"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "thiserror",
  "users",
@@ -2959,7 +3006,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_utils"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -2976,7 +3023,7 @@ dependencies = [
 
 [[package]]
 name = "tedge_watchdog"
-version = "0.6.0"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "clap 3.1.6",
@@ -3052,7 +3099,7 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
 [[package]]
 name = "thin_edge_json"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "assert_matches",