project-akri · kate-goldenring · Mar 12, 2021 · Mar 12, 2021 · Mar 12, 2021 · Mar 12, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -15,9 +15,9 @@ 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.3.0
+version: 0.3.1
 
 # 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.
-appVersion: 0.3.0
+appVersion: 0.3.1
diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/shared/src/akri/configuration.rs b/shared/src/akri/configuration.rs
@@ -43,7 +43,7 @@ pub struct Configuration {
     /// discover the capability and any information needed by the `DiscoveryHandler`.
     pub discovery_handler: DiscoveryHandlerInfo,
 
-    /// This defines the number of nodes that can schedule worloads for
+    /// This defines the number of nodes that can schedule workloads for
     /// any given capability that is found
     #[serde(default = "default_capacity")]
     pub capacity: i32,
@@ -64,14 +64,14 @@ pub struct Configuration {
 
     /// This defines a service that should be created to access
     /// all of the capabilities found that are described by this
-    /// configuration. For each Configurataion, there is at most
+    /// configuration. For each Configuration, there is at most
     /// 1 device capability service.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub configuration_service_spec: Option<ServiceSpec>,
 
-    /// This defines some properties that will be propogated to
+    /// This defines some properties that will be propagated to
     /// any Instance
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
+    #[serde(default)]
     pub properties: HashMap<String, String>,
 }
 
@@ -240,8 +240,7 @@ mod crd_serialization_tests {
         assert_eq!(0, deserialized.properties.len());
 
         let serialized = serde_json::to_string(&deserialized).unwrap();
-        let expected_deserialized =
-            r#"{"discoveryHandler":{"name":"random","discoveryDetails":""},"capacity":4}"#;
+        let expected_deserialized = r#"{"discoveryHandler":{"name":"random","discoveryDetails":""},"capacity":4,"properties":{}}"#;
         assert_eq!(expected_deserialized, serialized);
     }
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.3.0
+0.3.1
diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["DazWilkin <daz.wilkin@gmail.com>"]
 edition = "2018"
 

diff --git a/webhooks/validating/configuration/src/main.rs b/webhooks/validating/configuration/src/main.rs
@@ -107,6 +107,7 @@ fn filter_configuration(mut v: Value) -> Value {
 
     v
 }
+
 fn validate_configuration(rqst: &AdmissionRequest) -> AdmissionResponse {
     println!("Validating Configuration");
     match &rqst.object {
@@ -118,8 +119,15 @@ fn validate_configuration(rqst: &AdmissionRequest) -> AdmissionResponse {
                 serde_json::from_str(y.as_str()).expect("Could not parse as Akri Configuration");
             let reserialized = serde_json::to_string(&config).unwrap();
             let deserialized: Value = serde_json::from_str(&reserialized).expect("untyped JSON");
-
+            println!(
+                "validate_configuration - deserialized Configuration: {:?}",
+                deserialized
+            );
             let val: Value = filter_configuration(raw.clone());
+            println!(
+                "validate_configuration - expected deserialized format: {:?}",
+                val
+            );
 
             // Do they match?
             match check(&val, &deserialized) {
@@ -289,7 +297,7 @@ mod tests {
                 "spec": {
                     "discoveryHandler": {
                         "name": "debugEcho",
-                        "discoveryDetails": "{\"descriptions\": [\"foo\",\"bar\"]}"
+                        "discoveryDetails": "descriptions:\n- \"foo0\"\n- \"foo1\"\n"
                     },
                     "brokerPodSpec": {
                         "containers": [
@@ -309,7 +317,8 @@ mod tests {
                             }
                         ]
                     },
-                    "capacity": 1
+                    "capacity": 1,
+                    "properties": {}
                 }
             },
             "oldObject": null,