fix(claims): safely parse null versions as empty string

Signed-off-by: Brooks Townsend <brooks@cosmonic.com>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasmcloud-control-interface"
-version = "0.28.0"
+version = "0.28.1"
 authors = ["wasmCloud Team"]
 edition = "2021"
 homepage = "https://wasmcloud.com"

src/lib.rs

@@ -228,8 +228,8 @@ impl Client {
  debug!("get_claims:request {}", &subject);
  match self.request_timeout(subject, vec![], self.timeout).await {
  Ok(msg) => {
- let list: GetClaimsResponse = json_deserialize(&msg.payload)?;
- Ok(list)
+ let list: SafeClaimsResponse = json_deserialize(&msg.payload)?;
+ Ok(list.into())
  }
  Err(e) => Err(format!("Did not receive claims from lattice: {}", e).into()),
  }

src/types.rs

@@ -77,6 +77,31 @@ pub struct GetClaimsResponse {
  pub claims: CtlKVList,
 }
 
+/// A safety type that can handle claims values that are set to Null. This is
+/// only used internally for compatibility, we will still send out [GetClaimsResponse]
+/// as the response type.
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
+pub(crate) struct SafeClaimsResponse {
+ pub claims: Vec<HashMap<String, Option<String>>>,
+}
+
+impl Into<GetClaimsResponse> for SafeClaimsResponse {
+ fn into(self) -> GetClaimsResponse {
+ GetClaimsResponse {
+ claims: self
+ .claims
+ .into_iter()
+ .map(|claim| {
+ claim
+ .into_iter()
+ .map(|(k, v)| (k, v.unwrap_or_default()))
+ .collect()
+ })
+ .collect(),
+ }
+ }
+}
+
 /// A summary representation of a host
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Host {