ALPHA: wire is a tool to deploy nixos systems
wire.althaea.zone/
remove unused 3rd argument for ssh opts
+10
-13
+1
-1
crates/core/src/commands/common.rs
+1
-1
crates/core/src/commands/common.rs
+1
-1
crates/core/src/commands/noninteractive.rs
+1
-1
crates/core/src/commands/noninteractive.rs
···
192
192
modifiers: SubCommandModifiers,
193
193
) -> Result<Command, HiveLibError> {
194
194
let mut command = Command::new("ssh");
195
-
command.args(target.create_ssh_args(modifiers, true, false)?);
195
+
command.args(target.create_ssh_args(modifiers, true)?);
196
196
command.arg(target.get_preferred_host()?.to_string());
197
197
198
198
Ok(command)
+1
-1
crates/core/src/commands/pty/mod.rs
+1
-1
crates/core/src/commands/pty/mod.rs
···
433
433
modifiers: SubCommandModifiers,
434
434
) -> Result<portable_pty::CommandBuilder, HiveLibError> {
435
435
let mut command = portable_pty::CommandBuilder::new("ssh");
436
-
command.args(target.create_ssh_args(modifiers, false, false)?);
436
+
command.args(target.create_ssh_args(modifiers, false)?);
437
437
command.arg(target.get_preferred_host()?.to_string());
438
438
Ok(command)
439
439
}
+7
-10
crates/core/src/hive/node.rs
+7
-10
crates/core/src/hive/node.rs
···
49
49
pub fn create_ssh_opts(
50
50
&self,
51
51
modifiers: SubCommandModifiers,
52
-
master: bool,
53
52
) -> Result<String, HiveLibError> {
54
-
self.create_ssh_args(modifiers, false, master)
53
+
self.create_ssh_args(modifiers, false)
55
54
.map(|x| x.join(" "))
56
55
}
57
56
···
60
59
&self,
61
60
modifiers: SubCommandModifiers,
62
61
non_interactive_forced: bool,
63
-
master: bool,
64
62
) -> Result<Vec<String>, HiveLibError> {
65
63
let mut vector = vec![
66
64
"-l".to_string(),
···
220
218
221
219
let mut command_string = CommandStringBuilder::new("ssh");
222
220
command_string.arg(format!("{}@{host}", self.target.user));
223
-
command_string.arg(self.target.create_ssh_opts(modifiers, true)?);
221
+
command_string.arg(self.target.create_ssh_opts(modifiers)?);
224
222
command_string.arg("exit");
225
223
226
224
let output = run_command(
···
858
856
859
857
assert_eq!(
860
858
target
861
-
.create_ssh_args(subcommand_modifiers, false, false)
859
+
.create_ssh_args(subcommand_modifiers, false)
862
860
.unwrap(),
863
861
args
864
862
);
865
863
assert_eq!(
866
-
target.create_ssh_opts(subcommand_modifiers, false).unwrap(),
864
+
target.create_ssh_opts(subcommand_modifiers).unwrap(),
867
865
args.join(" ")
868
866
);
869
867
870
868
assert_eq!(
871
869
target
872
-
.create_ssh_args(subcommand_modifiers, false, true)
870
+
.create_ssh_args(subcommand_modifiers, false)
873
871
.unwrap(),
874
872
[
875
873
"-l".to_string(),
···
887
885
888
886
assert_eq!(
889
887
target
890
-
.create_ssh_args(subcommand_modifiers, true, true)
888
+
.create_ssh_args(subcommand_modifiers, true)
891
889
.unwrap(),
892
890
[
893
891
"-l".to_string(),
···
906
904
// forced non interactive is the same as --non-interactive
907
905
assert_eq!(
908
906
target
909
-
.create_ssh_args(subcommand_modifiers, true, false)
907
+
.create_ssh_args(subcommand_modifiers, true)
910
908
.unwrap(),
911
909
target
912
910
.create_ssh_args(
···
914
912
non_interactive: true,
915
913
..Default::default()
916
914
},
917
-
false,
918
915
false
919
916
)
920
917
.unwrap()