Skip to content

fix: address outstanding sonar issues #104

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

Merged
rapids-bot merged 1 commit into from
May 14, 2026
Merged

fix: address outstanding sonar issues #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 42 additions & 28 deletions crates/cli/src/doctor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,41 +525,55 @@ async fn collect_observability(gateway: &GatewayConfig) -> Vec<Check> {

async fn collect_observability_component_checks(checks: &mut Vec<Check>, config: &Value) {
for section in ["atof", "atif"] {
if section_enabled(config, section) {
let label = if section == "atof" {
"ATOF dir"
} else {
"ATIF dir"
};
match section_output_directory(config, section) {
Some(path) => checks.push(check_directory(label, &path)),
None => checks.push(Check {
name: label,
status: Status::Info,
details: "enabled; using runtime default output directory".into(),
}),
}
if let Some(check) = observability_file_exporter_check(config, section) {
checks.push(check);
}
}
for section in ["opentelemetry", "openinference"] {
if section_enabled(config, section) {
let label = if section == "opentelemetry" {
"OpenTelemetry endpoint"
} else {
"OpenInference endpoint"
};
match section_endpoint(config, section) {
Some(endpoint) => checks.push(probe_http_named(label, &endpoint).await),
None => checks.push(Check {
name: label,
status: Status::Info,
details: "enabled; using exporter default endpoint".into(),
}),
}
if let Some(check) = observability_http_exporter_check(config, section).await {
checks.push(check);
}
}
}

fn observability_file_exporter_check(config: &Value, section: &str) -> Option<Check> {
if !section_enabled(config, section) {
return None;
}
let label = if section == "atof" {
"ATOF dir"
} else {
"ATIF dir"
};
Some(match section_output_directory(config, section) {
Some(path) => check_directory(label, &path),
None => Check {
name: label,
status: Status::Info,
details: "enabled; using runtime default output directory".into(),
},
})
}

async fn observability_http_exporter_check(config: &Value, section: &str) -> Option<Check> {
if !section_enabled(config, section) {
return None;
}
let label = if section == "opentelemetry" {
"OpenTelemetry endpoint"
} else {
"OpenInference endpoint"
};
Some(match section_endpoint(config, section) {
Some(endpoint) => probe_http_named(label, &endpoint).await,
None => Check {
name: label,
status: Status::Info,
details: "enabled; using exporter default endpoint".into(),
},
})
}

fn observability_component_config(plugin_value: &Value) -> Option<&Value> {
plugin_value
.get("components")
Expand Down
137 changes: 94 additions & 43 deletions crates/cli/src/plugins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,28 +463,7 @@ fn edit_section(
.ok_or_else(|| CliError::Config(format!("{} is not an editable section", section.name)))?
.fields;
loop {
let mut items = Vec::new();
if section_has_enabled_toggle(section) {
let enabled = section_enabled(config, section).unwrap_or(false);
items.push(MenuItem::new(format!(
"Toggle section [{}]",
status_label(enabled)
)));
}
for field in fields {
let configured = section_field_configured(config, section, *field)?;
items.push(MenuItem::new(format!(
"{} = {}",
configured_label(configured, field.name),
section_field_value(config, section, field.name)?
.map(|value| display_field_value(section, *field, &value))
.or_else(|| default_field_value(section, *field)
.map(|value| format!("{} (default)", display_value(&value))))
.unwrap_or_else(|| "(default)".to_string())
)));
}
items.push(MenuItem::new(shortcut_label("Reset section", "r")));
items.push(MenuItem::new(shortcut_label("Back", "q")));
let items = section_menu_items(config, section, fields)?;
let selection = prompt_menu(theme, section.name, &items, 0)?;
let selection = match selection {
MenuResponse::Selected(selection) => selection,
Expand All @@ -493,14 +472,7 @@ fn edit_section(
continue;
}
MenuResponse::Shortcut(MenuShortcut::Reset, selected) => {
if reset_selected_field(config, section, fields, selected)? {
continue;
}
let reset_section_index =
usize::from(section_has_enabled_toggle(section)) + fields.len();
if selected == reset_section_index {
reset_section(config, section);
}
reset_selected_item(config, section, fields, selected)?;
continue;
}
MenuResponse::Shortcut(MenuShortcut::Clear, selected) => {
Expand All @@ -516,24 +488,91 @@ fn edit_section(
}
MenuResponse::Cancel => return Ok(()),
};
let mut index = selection;
if section_has_enabled_toggle(section) {
if index == 0 {
toggle_section(config, section);
continue;
}
index -= 1;
}
if index < fields.len() {
edit_field(theme, config, section, &fields[index])?;
} else if index == fields.len() {
reset_section(config, section);
} else {
if !edit_selected_section_item(theme, config, section, fields, selection)? {
return Ok(());
}
}
}

fn section_menu_items(
config: &ObservabilityConfig,
section: EditorFieldSpec,
fields: &[EditorFieldSpec],
) -> Result<Vec<MenuItem>, CliError> {
let mut items = Vec::new();
if section_has_enabled_toggle(section) {
let enabled = section_enabled(config, section).unwrap_or(false);
items.push(MenuItem::new(format!(
"Toggle section [{}]",
status_label(enabled)
)));
}
for field in fields {
items.push(section_field_menu_item(config, section, *field)?);
}
items.push(MenuItem::new(shortcut_label("Reset section", "r")));
items.push(MenuItem::new(shortcut_label("Back", "q")));
Ok(items)
}

fn section_field_menu_item(
config: &ObservabilityConfig,
section: EditorFieldSpec,
field: EditorFieldSpec,
) -> Result<MenuItem, CliError> {
let configured = section_field_configured(config, section, field)?;
let value = section_field_value(config, section, field.name)?
.map(|value| display_field_value(section, field, &value))
.or_else(|| {
default_field_value(section, field)
.map(|value| format!("{} (default)", display_value(&value)))
})
.unwrap_or_else(|| "(default)".to_string());
Ok(MenuItem::new(format!(
"{} = {}",
configured_label(configured, field.name),
value
)))
}

fn reset_selected_item(
config: &mut ObservabilityConfig,
section: EditorFieldSpec,
fields: &[EditorFieldSpec],
selected: usize,
) -> Result<(), CliError> {
if reset_selected_field(config, section, fields, selected)? {
return Ok(());
}
if selected == reset_section_index(section, fields) {
reset_section(config, section);
}
Ok(())
}

fn edit_selected_section_item(
theme: &ColorfulTheme,
config: &mut ObservabilityConfig,
section: EditorFieldSpec,
fields: &[EditorFieldSpec],
selection: usize,
) -> Result<bool, CliError> {
if section_has_enabled_toggle(section) && selection == 0 {
toggle_section(config, section);
return Ok(true);
}
let index = selected_field_index(section, selection);
if let Some(field) = fields.get(index) {
edit_field(theme, config, section, field)?;
return Ok(true);
}
if index == fields.len() {
reset_section(config, section);
return Ok(true);
}
Ok(false)
}

fn edit_field(
theme: &ColorfulTheme,
config: &mut ObservabilityConfig,
Expand Down Expand Up @@ -755,6 +794,18 @@ fn reset_selected_field(
Ok(true)
}

fn selected_field_index(section: EditorFieldSpec, selected: usize) -> usize {
let mut index = selected;
if section_has_enabled_toggle(section) {
index -= 1;
}
index
}

fn reset_section_index(section: EditorFieldSpec, fields: &[EditorFieldSpec]) -> usize {
usize::from(section_has_enabled_toggle(section)) + fields.len()
}

fn section_has_enabled_toggle(section: EditorFieldSpec) -> bool {
section.name != POLICY_SECTION
&& section
Expand Down
Loading
Loading