Report SDK SSH config load failures
ci / test (push) Canceled after 0s
ci / fuzz-smoke (push) Canceled after 0s
ci / macos-client (macos-aarch64, macos-14) (push) Canceled after 0s
ci / macos-client (macos-x86_64, macos-13) (push) Canceled after 0s
ci / windows-client (push) Canceled after 0s
ci / package-release (linux-x86_64, ubuntu-latest, , , ) (push) Canceled after 0s
ci / package-release (macos-aarch64, macos-14, , , ) (push) Canceled after 0s
ci / package-release (macos-x86_64, macos-13, , , ) (push) Canceled after 0s
ci / package-release (windows-aarch64, windows-latest, aarch64, windows, aarch64-pc-windows-msvc) (push) Canceled after 0s
ci / package-release (windows-x86_64, windows-latest, , , ) (push) Canceled after 0s
ci / remote-bench (push) Canceled after 0s
ci / publish-gitea-release (push) Canceled after 0s
ci / test (push) Canceled after 0s
ci / fuzz-smoke (push) Canceled after 0s
ci / macos-client (macos-aarch64, macos-14) (push) Canceled after 0s
ci / macos-client (macos-x86_64, macos-13) (push) Canceled after 0s
ci / windows-client (push) Canceled after 0s
ci / package-release (linux-x86_64, ubuntu-latest, , , ) (push) Canceled after 0s
ci / package-release (macos-aarch64, macos-14, , , ) (push) Canceled after 0s
ci / package-release (macos-x86_64, macos-13, , , ) (push) Canceled after 0s
ci / package-release (windows-aarch64, windows-latest, aarch64, windows, aarch64-pc-windows-msvc) (push) Canceled after 0s
ci / package-release (windows-x86_64, windows-latest, , , ) (push) Canceled after 0s
ci / remote-bench (push) Canceled after 0s
ci / publish-gitea-release (push) Canceled after 0s
This commit is contained in:
+9
-2
@@ -165,8 +165,7 @@ impl DoshClientBuilder {
|
|||||||
.or(host_config.port)
|
.or(host_config.port)
|
||||||
.unwrap_or(self.client.config.dosh_port);
|
.unwrap_or(self.client.config.dosh_port);
|
||||||
let ssh_port = host_config.ssh_port.or(self.client.config.ssh_port);
|
let ssh_port = host_config.ssh_port.or(self.client.config.ssh_port);
|
||||||
let ssh_config =
|
let ssh_config = load_sdk_ssh_config(host_config.ssh_config.as_deref(), ssh_port)?;
|
||||||
load_sdk_ssh_config(host_config.ssh_config.as_deref(), ssh_port).unwrap_or_default();
|
|
||||||
let requested_user = self
|
let requested_user = self
|
||||||
.user
|
.user
|
||||||
.clone()
|
.clone()
|
||||||
@@ -735,6 +734,14 @@ mod tests {
|
|||||||
assert!(parsed.identities_only);
|
assert!(parsed.identities_only);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sdk_ssh_config_without_alias_does_not_shell_out() {
|
||||||
|
assert_eq!(
|
||||||
|
load_sdk_ssh_config(None, Some(2222)).unwrap(),
|
||||||
|
SdkSshConfig::default()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn sdk_identity_paths_follow_cli_precedence_and_identities_only() {
|
fn sdk_identity_paths_follow_cli_precedence_and_identities_only() {
|
||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
Reference in New Issue
Block a user