LibreCloud/lib_clds
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: fix liveness and change if auth.role is empty

Browse Source
This commit is contained in:
Jesús Pérez Lorenzo 2021-10-14 15:05:01 +01:00
parent 57378e546b
commit 7c132d9839
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/defs.rs
View File

@ -2,7 +2,7 @@ use serde::{Serialize, Deserialize, Deserializer};
use std::fmt; use std::fmt;
use crate::clouds::on_clouds::load_config_data; use crate::clouds::on_clouds::load_config_data;
use crate::clouds::defs::Cloud; use crate::clouds::defs::{Cloud,SrvcsHostInfo};
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Clone, Debug, Serialize, Deserialize, Default)] #[derive(Clone, Debug, Serialize, Deserialize, Default)]
@ -534,6 +534,10 @@ impl Default for Price {
} }
} }
} }
fn default_liveness() -> Vec<SrvcsHostInfo> {
Vec::new()
}
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct CloudItem { pub struct CloudItem {
@ -541,7 +545,8 @@ pub struct CloudItem {
pub path: String, pub path: String,
pub info: String, pub info: String,
pub resources: Option<String>, pub resources: Option<String>,
pub liveness: Option<String>, #[serde(default = "default_liveness")]
pub liveness: Vec<SrvcsHostInfo>,
pub provision: Option<String>, pub provision: Option<String>,
pub critical: IsCritical, pub critical: IsCritical,
pub graph: GraphNode, pub graph: GraphNode,
@ -553,7 +558,7 @@ impl Default for CloudItem {
path: String::from(""), path: String::from(""),
info: String::from(""), info: String::from(""),
resources: Some(String::from("")), resources: Some(String::from("")),
liveness: Some(String::from("")), liveness: Vec::new(),
provision: Some(String::from("")), provision: Some(String::from("")),
critical: IsCritical::no, critical: IsCritical::no,
graph: GraphNode::default(), graph: GraphNode::default(),
@ -585,6 +590,7 @@ impl CloudItem {
} }
} }
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct CloudGroup { pub struct CloudGroup {
@ -592,7 +598,8 @@ pub struct CloudGroup {
pub path: String, pub path: String,
pub info: String, pub info: String,
pub resources: Option<String>, pub resources: Option<String>,
pub liveness: Option<String>, #[serde(default = "default_liveness")]
pub liveness: Vec<SrvcsHostInfo>,
pub provision: Option<String>, pub provision: Option<String>,
pub items: Vec<CloudItem>, pub items: Vec<CloudItem>,
pub graph: GraphNode, pub graph: GraphNode,
@ -605,7 +612,7 @@ impl Default for CloudGroup {
path: String::from(""), path: String::from(""),
info: String::from(""), info: String::from(""),
resources: Some(String::from("")), resources: Some(String::from("")),
liveness: Some(String::from("")), liveness: Vec::new(),
provision: Some(String::from("")), provision: Some(String::from("")),
items: Vec::new(), items: Vec::new(),
graph: GraphNode::default(), graph: GraphNode::default(),
@ -632,7 +639,7 @@ impl CloudGroup {
info: self.info.to_owned(), info: self.info.to_owned(),
resources: Some(self.load_resources(cloud).await.unwrap_or_else(|_|String::from(""))), resources: Some(self.load_resources(cloud).await.unwrap_or_else(|_|String::from(""))),
liveness: self.liveness.to_owned(), liveness: self.liveness.to_owned(),
provision: self.liveness.to_owned(), provision: self.provision.to_owned(),
items: self.items.to_owned(), items: self.items.to_owned(),
graph: self.graph.to_owned(), graph: self.graph.to_owned(),
prices: self.prices.to_owned(), prices: self.prices.to_owned(),
@ -675,7 +682,8 @@ pub struct CloudCheckItem {
pub name: String, pub name: String,
pub path: String, pub path: String,
pub info: String, pub info: String,
pub liveness: Option<String>, #[serde(default = "default_liveness")]
pub liveness: Vec<SrvcsHostInfo>,
pub critical: IsCritical, pub critical: IsCritical,
} }
impl Default for CloudCheckItem { impl Default for CloudCheckItem {
@ -684,7 +692,7 @@ impl Default for CloudCheckItem {
name: String::from(""), name: String::from(""),
path: String::from(""), path: String::from(""),
info: String::from(""), info: String::from(""),
liveness: Some(String::from("")), liveness: Vec::new(),
critical: IsCritical::no, critical: IsCritical::no,
} }
} }
@ -695,7 +703,8 @@ pub struct CloudCheckGroup {
pub name: String, pub name: String,
pub path: String, pub path: String,
pub info: String, pub info: String,
pub liveness: Option<String>, #[serde(default = "default_liveness")]
pub liveness: Vec<SrvcsHostInfo>,
pub items: Vec<CloudCheckItem>, pub items: Vec<CloudCheckItem>,
} }
impl Default for CloudCheckGroup { impl Default for CloudCheckGroup {
@ -704,7 +713,7 @@ impl Default for CloudCheckGroup {
name: String::from(""), name: String::from(""),
path: String::from(""), path: String::from(""),
info: String::from(""), info: String::from(""),
liveness: Some(String::from("")), liveness: Vec::new(),
items: Vec::new(), items: Vec::new(),
} }
} }