Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: adding checks and skips for snses that don't have name set #447

Merged
merged 2 commits into from
Jun 3, 2024
Merged

fix: adding checks and skips for snses that don't have name set #447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20fea1c
adding checks and skips for snses that are disabled and don't have co…
NikolaMilosa Jun 3, 2024
6032858
Merge branch 'main' into nm-fixing-canister-logging
NikolaMilosa Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions rs/ic-observability/sns-downloader/src/downloader_loop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,20 @@ pub async fn run_downloader_loop(logger: Logger, cli: CliArgs, stop_signal: Rece
}
};

let targets = match &targets["data"] {
serde_json::Value::Array(ar) => ar,
let targets: Vec<_> = match &targets["data"] {
serde_json::Value::Array(ar) => ar.iter().filter(|v| v["name"].as_str().is_some()).collect(),
_ => {
warn!(logger, "Didn't receive expected structure of payload");
continue;
}
};

for target in targets {
for target in &targets {
let mut sns = Sns {
description: target["description"].as_str().unwrap().to_string(),
enabled: target["enabled"].as_bool().unwrap(),
description: target["description"].as_str().unwrap_or_default().to_string(),
enabled: target["enabled"].as_bool().unwrap_or_default(),
root_canister_id: target["root_canister_id"].as_str().unwrap().to_string(),
name: target["name"].as_str().unwrap().to_string(),
url: target["url"].as_str().unwrap().to_string(),
name: target["name"].as_str().unwrap_or_default().to_string(),
url: target["url"].as_str().unwrap_or_default().to_string(),
canisters: get_canisters(&cli, target["root_canister_id"].as_str().unwrap().to_string(), &client, logger.clone()).await,
};
sns.canisters.push(Canister {
Expand Down Expand Up @@ -176,7 +175,7 @@ async fn get_canisters(cli: &CliArgs, root_canister_id: String, client: &Client,
.iter()
.map(|val| Canister {
canister_id: val["canister_id"].as_str().unwrap().to_string(),
module_hash: val["module_hash"].as_str().unwrap().to_string(),
module_hash: val["module_hash"].as_str().unwrap_or_default().to_string(),
canister_type: val["canister_type"].as_str().unwrap().to_string(),
})
.collect(),
Expand Down
Loading