Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/apps/desktop/src/api/ssh_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,7 @@ mod tests {
},
default_workspace: Some("/workspace".to_string()),
proxy_jump: None,
proxy_command: None,
container: Some(ContainerWorkspaceConfig {
name: "dev".to_string(),
access: ContainerAccess::DockerExec,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,10 @@ impl PortForwardTool {
username,
auth,
default_workspace: None,
proxy_jump: config_entry.and_then(|entry| entry.proxy_jump),
proxy_jump: config_entry
.as_ref()
.and_then(|entry| entry.proxy_jump.clone()),
proxy_command: config_entry.and_then(|entry| entry.proxy_command),
container: None,
wsl: None,
options: SSHConnectionOptions::default(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,7 @@ mod tests {
default_workspace: Some("/srv/project".to_string()),
last_connected: Some(1),
proxy_jump: Some("jump.example.invalid".to_string()),
proxy_command: None,
container: None,
options: owner::SshConnectionOptionsRecord::default(),
}
Expand Down
3 changes: 2 additions & 1 deletion src/crates/services/services-integrations/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ chrono = { workspace = true, optional = true }
dunce = { workspace = true, optional = true }
futures = { workspace = true, optional = true }
futures-util = { workspace = true, optional = true }
glob = { workspace = true, optional = true }
fs2 = { workspace = true, optional = true }
git2 = { workspace = true, optional = true }
hostname = { workspace = true, optional = true }
Expand Down Expand Up @@ -510,7 +511,7 @@ product-full = [
"workspace-search",
]
skillhub = ["openbitfun-services-core/tls-provider", "reqwest", "reqwest/json", "reqwest/query", "reqwest/rustls-no-provider", "reqwest/stream", "zip", "tempfile", "tokio/fs", "tokio/io-util"]
ssh_config = ["dep:ssh_config"]
ssh_config = ["dep:ssh_config", "dep:glob"]

[dev-dependencies]
tempfile = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,8 @@ pub struct SavedConnectionRecord {
pub last_connected: Option<u64>,
#[serde(default)]
pub proxy_jump: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub proxy_command: Option<String>,
#[serde(default)]
pub container: Option<ContainerWorkspaceRecord>,
#[serde(default)]
Expand Down
Loading
Loading