Rel 0.5.0

databroker-proto/build.rs

@@ -23,6 +23,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 "proto/sdv/databroker/v1/collector.proto",
                 "proto/kuksa/val/v1/val.proto",
                 "proto/kuksa/val/v1/types.proto",
+                "proto/kuksa/val/v2/val.proto",
+                "proto/kuksa/val/v2/types.proto",
             ],
             &["proto"],
         )?;

databroker-proto/src/lib.rs

@@ -143,5 +143,8 @@ pub mod kuksa {
                 }
             }
         }
+        pub mod v2 {
+            tonic::include_proto!("kuksa.val.v2");
+        }
     }
 }

databroker/src/broker.rs

@@ -15,7 +15,7 @@ use crate::permissions::{PermissionError, Permissions};
 pub use crate::types;
 
 use crate::query;
-pub use crate::types::{ChangeType, DataType, DataValue, EntryType};
+pub use crate::types::{ChangeType, DataType, DataValue, EntryType, ValueFailure};
 
 use tokio::sync::{broadcast, mpsc, RwLock};
 use tokio_stream::wrappers::ReceiverStream;
@@ -43,6 +43,37 @@ pub enum UpdateError {
     PermissionExpired,
 }
 
+impl UpdateError {
+    pub fn to_status_with_code(&self, id: &i32) -> tonic::Status {
+        match self {
+            UpdateError::NotFound => tonic::Status::new(
+                tonic::Code::NotFound,
+                format!("Signal not found (id: {})", id),
+            ),
+            UpdateError::WrongType => tonic::Status::new(
+                tonic::Code::InvalidArgument,
+                format!("Wrong type provided (id: {})", id),
+            ),
+            UpdateError::OutOfBounds => tonic::Status::new(
+                tonic::Code::OutOfRange,
+                format!("Index out of bounds (id: {})", id),
+            ),
+            UpdateError::UnsupportedType => tonic::Status::new(
+                tonic::Code::Unimplemented,
+                format!("Unsupported type (id: {})", id),
+            ),
+            UpdateError::PermissionDenied => tonic::Status::new(
+                tonic::Code::PermissionDenied,
+                format!("Permission denied (id: {})", id),
+            ),
+            UpdateError::PermissionExpired => tonic::Status::new(
+                tonic::Code::Unauthenticated,
+                format!("Permission expired (id: {})", id),
+            ),
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
 pub enum ReadError {
     NotFound,

databroker/src/grpc/kuksa_val_v1/conversions.rs

@@ -143,6 +143,7 @@ impl From<broker::Datapoint> for Option<proto::Datapoint> {
                 })),
                 timestamp: Some(from.ts.into()),
             }),
+            broker::DataValue::ValueFailure(_) => None,
         }
     }
 }
@@ -231,6 +232,7 @@ impl From<broker::DataValue> for Option<proto::Datapoint> {
                 })),
                 timestamp: None,
             }),
+            broker::DataValue::ValueFailure(_) => None,
         }
     }
 }