Skip to content

Commit f0b695a

Browse files
refactor(cli): narrow visibility and fix review issues in shared helpers extraction
- Remove orphan doc comment left on sandbox_list after print_yaml_line extraction - Change `pub mod commands` to `pub(crate) mod commands` in lib.rs - Move 6 unnecessarily pub-exported items to private use imports in run.rs - Restore stripped rationale comment in parse_cli_setting_value Signed-off-by: Varsha Prasad Narsing <[email protected]>
1 parent 4f1721a commit f0b695a

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

‎crates/openshell-cli/src/commands/common.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,10 @@ pub fn parse_cli_setting_value(key: &str, raw_value: &str) -> Result<SettingValu
620620

621621
let value = match setting.kind {
622622
SettingValueKind::String => {
623+
// Reject typos client-side so `openshell settings set ...
624+
// proposal_approval_mode autom` errors immediately instead of
625+
// round-tripping through the server. The server enforces the
626+
// same check independently for non-CLI callers.
623627
setting
624628
.validate_string_value(raw_value)
625629
.map_err(|allowed| {

‎crates/openshell-cli/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
pub(crate) static TEST_ENV_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
1010

1111
pub mod auth;
12-
pub mod commands;
12+
pub(crate) mod commands;
1313
pub mod completers;
1414
pub mod edge_tunnel;
1515
pub mod oidc_auth;

‎crates/openshell-cli/src/run.rs‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44
//! CLI command implementations.
55
66
pub use crate::commands::common::{
7-
PolicyGetView, confirm_global_setting_delete, confirm_global_setting_takeover,
8-
is_valid_env_name, parse_credential_expiry_cli_value, parse_credential_expiry_value,
9-
parse_duration_to_ms, parse_env_pairs, parse_key_value_pairs, parse_secret_material_env_pairs,
7+
PolicyGetView, parse_credential_expiry_cli_value, parse_env_pairs, parse_key_value_pairs,
108
};
119
use crate::commands::common::{
12-
ProvisioningDisplay, ProvisioningStep, format_epoch_ms, format_optional_epoch_ms,
10+
ProvisioningDisplay, ProvisioningStep, confirm_global_setting_delete,
11+
confirm_global_setting_takeover, format_epoch_ms, format_optional_epoch_ms,
1312
format_setting_value, format_timestamp, format_timestamp_ms, handle_platform_progress_event,
1413
is_provisioning_progress_event, non_empty_or, parse_cli_setting_value,
15-
parse_credential_expiry_pairs, parse_credential_pairs, phase_name, print_policy_merge_warnings,
16-
print_sandbox_header, print_sandbox_policy, provisioning_timeout_message,
17-
ready_false_condition_message, scrub_git_env, short_hash, truncate_display,
18-
truncate_status_field,
14+
parse_credential_expiry_pairs, parse_credential_pairs, parse_duration_to_ms,
15+
parse_secret_material_env_pairs, phase_name, print_policy_merge_warnings, print_sandbox_header,
16+
print_sandbox_policy, provisioning_timeout_message, ready_false_condition_message,
17+
scrub_git_env, short_hash, truncate_display, truncate_status_field,
1918
};
2019

2120
use crate::policy_update::build_policy_update_plan;
@@ -3024,8 +3023,6 @@ async fn sandbox_exec_interactive_grpc(
30243023
Ok(exit_code)
30253024
}
30263025

3027-
/// Print a single YAML line with dimmed keys and regular values.
3028-
30293026
/// List sandboxes.
30303027
#[allow(clippy::too_many_arguments)]
30313028
pub async fn sandbox_list(

0 commit comments

Comments
 (0)