Skip to content
Merged
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
76 changes: 54 additions & 22 deletions DESIGN.md

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions crates/cli/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -481,13 +481,13 @@ pub(crate) struct InitArgs {

#[derive(Debug, clap::Args)]
pub(crate) struct UnlinkArgs {
#[arg(value_name = "hostname", help = "Project hostname to unlink")]
#[arg(value_name = "project", help = "Project slug or hostname to unlink")]
pub(crate) hostname: Option<String>,
}

#[derive(Debug, clap::Args)]
pub(crate) struct OpenArgs {
#[arg(value_name = "hostname", help = "Project hostname to open")]
#[arg(value_name = "project", help = "Project slug or hostname to open")]
pub(crate) hostname: Option<String>,
}

Expand All @@ -496,7 +496,10 @@ pub(crate) struct ProjectEnvArgs {
#[arg(long, help = "Print generated Project environment values as JSON")]
pub(crate) json: bool,

#[arg(value_name = "hostname", help = "Project hostname to render env for")]
#[arg(
value_name = "project",
help = "Project slug or hostname to render env for"
)]
pub(crate) hostname: Option<String>,
}

Expand Down
20 changes: 17 additions & 3 deletions crates/cli/src/commands/php.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ use resources::{
TargetPlatform, TrackName, TrackSelector, UreqResourceHttpClient,
};
use serde::Serialize;
use state::{Database, ManagedResourceDesiredState, ProjectRecord, PvPaths, StateError};
use state::{
Database, ManagedResourceDesiredState, ProjectMode, ProjectRecord, PvPaths, StateError,
};

use crate::args::{ListArgs, PhpInstallArgs, PhpUninstallArgs, PhpUseArgs, ShimArgs};
use crate::environment::{Environment, artifact_manifest_url};
Expand Down Expand Up @@ -64,7 +66,7 @@ pub(crate) fn use_track(

output.line(&format!(
"Set {} PHP track to {track}",
project.primary_hostname
project_display_name(&project)
))?;
output.line(&format!("Updated Project config: {}", config_file.path))?;
write_install_lines(&installed, &mut output)?;
Expand Down Expand Up @@ -650,7 +652,8 @@ fn request_project_reconciliation(
match daemon::submit_job_blocking(paths.clone(), RECONCILE_KIND, &scope) {
Ok(job) => output.line(&format!(
"Queued reconciliation {} for {}",
job.id, project.primary_hostname
job.id,
project_display_name(project)
))?,
Err(daemon::DaemonError::Io(error)) if daemon_is_unavailable(&error) => {
write_daemon_unavailable_warning(output)?
Expand All @@ -661,6 +664,17 @@ fn request_project_reconciliation(
Ok(())
}

fn project_display_name(project: &ProjectRecord) -> &str {
if project.mode == ProjectMode::ResourceOnly {
return project.slug.as_str();
}

project
.primary_hostname
.as_deref()
.unwrap_or(project.slug.as_str())
}

fn request_system_reconciliation(
paths: &PvPaths,
output: &mut Output<'_, impl Write>,
Expand Down
Loading
Loading