huskies: merge 1182 bug Sled uplinks all register as 'workspace' — containers never get HUSKIES_PROJECT_NAME
This commit is contained in:
@@ -763,6 +763,7 @@ async fn handle_adopt_project(
|
||||
|
||||
let mut docker_args = project_docker_run_args(
|
||||
&container_name,
|
||||
name,
|
||||
port,
|
||||
ssh_port,
|
||||
&pubkey,
|
||||
@@ -1150,6 +1151,7 @@ pub async fn handle_new_project(
|
||||
// string that is returned to the caller or written to a log.
|
||||
let mut docker_args = project_docker_run_args(
|
||||
&container_name,
|
||||
name,
|
||||
port,
|
||||
ssh_port,
|
||||
&pubkey,
|
||||
@@ -1361,6 +1363,7 @@ pub async fn build_project_image(
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub(crate) fn project_docker_run_args(
|
||||
container_name: &str,
|
||||
project_name: &str,
|
||||
port: u16,
|
||||
ssh_port: u16,
|
||||
pubkey: &str,
|
||||
@@ -1389,6 +1392,8 @@ pub(crate) fn project_docker_run_args(
|
||||
"-e".into(),
|
||||
"HUSKIES_PORT=3001".into(),
|
||||
"-e".into(),
|
||||
format!("HUSKIES_PROJECT_NAME={project_name}"),
|
||||
"-e".into(),
|
||||
format!("HUSKIES_SSH_PUBKEY={pubkey}"),
|
||||
"-e".into(),
|
||||
format!("GIT_USER_NAME={git_user_name}"),
|
||||
@@ -1839,6 +1844,7 @@ mod tests {
|
||||
fn project_docker_args_include_huskies_host_env() {
|
||||
let args = project_docker_run_args(
|
||||
"huskies-myapp",
|
||||
"myapp",
|
||||
3100,
|
||||
2200,
|
||||
"ssh-ed25519 AAAA...",
|
||||
@@ -1887,10 +1893,33 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn project_docker_args_include_project_name_env() {
|
||||
let args = project_docker_run_args(
|
||||
"huskies-myapp",
|
||||
"myapp",
|
||||
3100,
|
||||
2200,
|
||||
"ssh-ed25519 AAAA...",
|
||||
"Test User",
|
||||
"test@example.com",
|
||||
None,
|
||||
"",
|
||||
);
|
||||
let pairs: Vec<_> = args.windows(2).collect();
|
||||
assert!(
|
||||
pairs
|
||||
.iter()
|
||||
.any(|w| w[0] == "-e" && w[1] == "HUSKIES_PROJECT_NAME=myapp"),
|
||||
"expected -e HUSKIES_PROJECT_NAME=myapp in docker args, got: {args:?}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn project_docker_args_no_gateway_url_when_empty() {
|
||||
let args = project_docker_run_args(
|
||||
"huskies-myapp",
|
||||
"myapp",
|
||||
3100,
|
||||
2200,
|
||||
"ssh-ed25519 AAAA...",
|
||||
@@ -1910,6 +1939,7 @@ mod tests {
|
||||
let creds = std::path::Path::new("/home/user/.claude/.credentials.json");
|
||||
let args = project_docker_run_args(
|
||||
"huskies-myapp",
|
||||
"myapp",
|
||||
3100,
|
||||
2200,
|
||||
"ssh-ed25519 AAAA...",
|
||||
@@ -1930,6 +1960,7 @@ mod tests {
|
||||
fn project_docker_args_no_credentials_mount_when_none() {
|
||||
let args = project_docker_run_args(
|
||||
"huskies-myapp",
|
||||
"myapp",
|
||||
3100,
|
||||
2200,
|
||||
"ssh-ed25519 AAAA...",
|
||||
|
||||
@@ -228,6 +228,7 @@ pub async fn handle_project_rebuild(
|
||||
|
||||
let mut docker_args = super::new_project::project_docker_run_args(
|
||||
&container_name,
|
||||
name,
|
||||
port,
|
||||
ssh_port,
|
||||
&pubkey,
|
||||
|
||||
Reference in New Issue
Block a user