ALPHA: wire is a tool to deploy nixos systems
wire.althaea.zone/
Revert "pass -v to ssh on --verbose" (#409)
authored by
marshmallow
and committed by
GitHub
19b07a7d
5bf0da88
+52
-66
-4
CHANGELOG.md
-4
CHANGELOG.md
+1
-1
Cargo.lock
+1
-1
Cargo.lock
+1
-3
Cargo.toml
+1
-3
Cargo.toml
···
18
18
[workspace.dependencies]
19
19
futures-util = { version = "0.3.31", features = ["sink", "std"] }
20
20
clap = { version = "4.5.51", features = ["derive", "string", "cargo"] }
21
-
clap-verbosity-flag = { version = "3.0.4", features = [
22
-
"tracing",
23
-
], default-features = false }
21
+
clap-verbosity-flag = "3.0.4"
24
22
serde = { version = "1.0.228", features = ["derive", "rc"] }
25
23
tokio = { version = "1.48.0", features = ["full"] }
26
24
tracing = { version = "0.1.41", features = ["release_max_level_debug"] }
-2
crates/cli/src/cli.rs
-2
crates/cli/src/cli.rs
···
9
9
use clap_num::number_range;
10
10
use clap_verbosity_flag::InfoLevel;
11
11
use tokio::runtime::Handle;
12
-
use tracing::level_filters::LevelFilter;
13
12
use wire_core::SubCommandModifiers;
14
13
use wire_core::commands::common::get_hive_node_names;
15
14
use wire_core::hive::node::{
···
333
332
}
334
333
_ => wire_core::StrictHostKeyChecking::default(),
335
334
},
336
-
verbose: self.verbose.tracing_level_filter() > LevelFilter::INFO,
337
335
}
338
336
}
339
337
}
+2
-1
crates/cli/src/tracing_setup.rs
+2
-1
crates/cli/src/tracing_setup.rs
···
10
10
use clap_verbosity_flag::{LogLevel, Verbosity};
11
11
use owo_colors::{OwoColorize, Stream, Style};
12
12
use tracing::{Level, Subscriber};
13
+
use tracing_log::AsTrace;
13
14
use tracing_subscriber::{
14
15
Layer,
15
16
field::{RecordFields, VisitFmt},
···
251
252
/// Set up logging for the application
252
253
/// Uses `WireFieldFormat` if -v was never passed
253
254
pub fn setup_logging<L: LogLevel>(verbosity: &Verbosity<L>, show_progress: bool) {
254
-
let filter = verbosity.tracing_level_filter();
255
+
let filter = verbosity.log_level_filter().as_trace();
255
256
let registry = tracing_subscriber::registry();
256
257
257
258
STATUS.lock().show_progress(show_progress);
+48
-53
crates/core/src/hive/node.rs
+48
-53
crates/core/src/hive/node.rs
···
91
91
92
92
options.extend(["BatchMode=yes".to_string()]);
93
93
94
-
if modifiers.verbose {
95
-
vector.push("-v".to_string());
96
-
}
97
-
98
94
vector.push("-o".to_string());
99
95
vector.extend(options.into_iter().intersperse("-o".to_string()));
100
96
···
330
326
use super::*;
331
327
use std::{assert_matches::assert_matches, env};
332
328
333
-
fn setup_ssh_opts_test() -> (Target, String) {
329
+
#[test]
330
+
fn test_ssh_opts() {
334
331
let target = Target::from_host("hello-world");
332
+
let subcommand_modifiers = SubCommandModifiers {
333
+
non_interactive: false,
334
+
..Default::default()
335
+
};
335
336
let tmp = format!(
336
337
"/tmp/{}",
337
338
rand::distr::SampleString::sample_string(&Alphabetic, &mut rand::rng(), 10)
338
339
);
340
+
339
341
std::fs::create_dir(&tmp).unwrap();
340
-
unsafe { env::set_var("XDG_RUNTIME_DIR", &tmp) };
341
-
(target, tmp)
342
-
}
343
342
344
-
#[test]
345
-
fn test_ssh_opts_verbose() {
346
-
let (target, _tmp) = setup_ssh_opts_test();
343
+
unsafe { env::set_var("XDG_RUNTIME_DIR", &tmp) }
347
344
348
-
let args = target
349
-
.create_ssh_args(SubCommandModifiers {
350
-
verbose: true,
351
-
..Default::default()
352
-
})
353
-
.unwrap();
354
-
355
-
assert!(
356
-
args.contains(&"-v".to_string()),
357
-
"Verbose flag should add -v to SSH args"
358
-
);
359
-
360
-
let expected = vec![
345
+
let args = [
361
346
"-l".to_string(),
362
347
target.user.to_string(),
363
348
"-p".to_string(),
364
349
target.port.to_string(),
365
-
"-v".to_string(),
366
350
"-o".to_string(),
367
351
"StrictHostKeyChecking=accept-new".to_string(),
368
352
"-o".to_string(),
369
353
"BatchMode=yes".to_string(),
370
354
];
371
-
assert_eq!(args, expected);
372
-
}
373
355
374
-
#[test]
375
-
fn test_ssh_opts_non_interactive() {
376
-
let (target, _tmp) = setup_ssh_opts_test();
356
+
assert_eq!(target.create_ssh_args(subcommand_modifiers).unwrap(), args);
357
+
assert_eq!(
358
+
target.create_ssh_opts(subcommand_modifiers).unwrap(),
359
+
args.join(" ")
360
+
);
377
361
378
-
let default_args = target
379
-
.create_ssh_args(SubCommandModifiers::default())
380
-
.unwrap();
381
-
382
-
let non_interactive_args = target
383
-
.create_ssh_args(SubCommandModifiers {
384
-
non_interactive: true,
385
-
..Default::default()
386
-
})
387
-
.unwrap();
362
+
assert_eq!(
363
+
target.create_ssh_args(subcommand_modifiers).unwrap(),
364
+
[
365
+
"-l".to_string(),
366
+
target.user.to_string(),
367
+
"-p".to_string(),
368
+
target.port.to_string(),
369
+
"-o".to_string(),
370
+
"StrictHostKeyChecking=accept-new".to_string(),
371
+
"-o".to_string(),
372
+
"BatchMode=yes".to_string(),
373
+
]
374
+
);
388
375
389
376
assert_eq!(
390
-
default_args, non_interactive_args,
391
-
"non_interactive flag should not affect SSH args"
377
+
target.create_ssh_args(subcommand_modifiers).unwrap(),
378
+
[
379
+
"-l".to_string(),
380
+
target.user.to_string(),
381
+
"-p".to_string(),
382
+
target.port.to_string(),
383
+
"-o".to_string(),
384
+
"StrictHostKeyChecking=accept-new".to_string(),
385
+
"-o".to_string(),
386
+
"BatchMode=yes".to_string(),
387
+
]
392
388
);
393
389
394
-
let expected = vec![
395
-
"-l".to_string(),
396
-
target.user.to_string(),
397
-
"-p".to_string(),
398
-
target.port.to_string(),
399
-
"-o".to_string(),
400
-
"StrictHostKeyChecking=accept-new".to_string(),
401
-
"-o".to_string(),
402
-
"BatchMode=yes".to_string(),
403
-
];
404
-
assert_eq!(default_args, expected);
390
+
// forced non interactive is the same as --non-interactive
391
+
assert_eq!(
392
+
target.create_ssh_args(subcommand_modifiers).unwrap(),
393
+
target
394
+
.create_ssh_args(SubCommandModifiers {
395
+
non_interactive: true,
396
+
..Default::default()
397
+
})
398
+
.unwrap()
399
+
);
405
400
}
406
401
407
402
#[test]
-2
crates/core/src/lib.rs
-2
crates/core/src/lib.rs
···
43
43
pub show_trace: bool,
44
44
pub non_interactive: bool,
45
45
pub ssh_accept_host: StrictHostKeyChecking,
46
-
pub verbose: bool,
47
46
}
48
47
49
48
impl Default for SubCommandModifiers {
···
52
51
show_trace: false,
53
52
non_interactive: !std::io::stdin().is_terminal(),
54
53
ssh_accept_host: StrictHostKeyChecking::default(),
55
-
verbose: false,
56
54
}
57
55
}
58
56
}