Skip to content

UNC Paths and compilation on Windows #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rutexd wants to merge 5 commits into from
Closed

UNC Paths and compilation on Windows #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0546a71
Forcing Gateway service to use unified connect function, allow be com…
rutexd Nov 2, 2022
b735679
Replaced UNC windows paths to normal paths
rutexd Nov 2, 2022
69b07dd
Replaced UNC windows paths to normal paths to fix packaging
rutexd Nov 3, 2022
d07d8af
Replaced UNC windows paths to normal paths to fix packaging
rutexd Nov 3, 2022
ce93e40
replace import to direct call to avoid warning
rutexd Nov 3, 2022
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
23 changes: 21 additions & 2 deletions cargo-shuttle/src/args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{
ffi::OsStr,
fs::{canonicalize, create_dir_all},
fs::{create_dir_all},
io::{self, ErrorKind},
path::PathBuf,
};
Expand Down Expand Up @@ -183,7 +183,26 @@ pub struct InitArgs {

// Helper function to parse and return the absolute path
fn parse_path(path: &OsStr) -> Result<PathBuf, io::Error> {
canonicalize(path).map_err(|e| {
#[cfg(target_os = "windows")]
Copy link
Contributor

@chesedo chesedo Nov 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rutexd I really want to merge this. But will prefer a solution where we don't use cfg. Ie the same non-canonicalize code should work on both Windows and Unix. If you can push such an update, then we can merge this

{
let p = PathBuf::try_from(path).map_err(|e| {
io::Error::new(
ErrorKind::InvalidInput,
format!("could not turn {path:?} into a real path: {e}"),
)
})?;

let cwd = std::env::current_dir().map_err(|e| {
io::Error::new(
ErrorKind::InvalidInput,
format!("could not get current working dir: {e}"),
)
})?;
Ok(cwd.join(p))
}

#[cfg(target_os = "unix")]
std::fs::canonicalize(path).map_err(|e| {
io::Error::new(
ErrorKind::InvalidInput,
format!("could not turn {path:?} into a real path: {e}"),
Expand Down
2 changes: 1 addition & 1 deletion gateway/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ impl GatewayService {
/// * `args` - The [`Args`] with which the service was
/// started. Will be passed as [`Context`] to workers and state.
pub async fn init(args: ContextArgs, db: SqlitePool) -> Self {
let docker = Docker::connect_with_unix(&args.docker_host, 60, API_DEFAULT_VERSION).unwrap();
let docker = Docker::connect_with_local(&args.docker_host, 60, API_DEFAULT_VERSION).unwrap();

let container_settings = ContainerSettings::builder(&docker).from_args(&args).await;

Expand Down