kratactl: initial windows bringup

.github/workflows/client.yml

@@ -7,9 +7,14 @@ jobs:
         os:
         - { name: linux, on: ubuntu-latest }
         - { name: darwin, on: macos-14 }
+        - { name: windows, on: windows-latest }
         arch:
         - x86_64
         - aarch64
+        exclude:
+        # aarch64 windows support is not available in downstream dependencies
+        - os: { name: windows, on: windows-latest }
+          arch: aarch64
     env:
       TARGET_OS: "${{ matrix.os.name }}"
       TARGET_ARCH: "${{ matrix.arch }}"
@@ -29,4 +34,6 @@ jobs:
       if: ${{ matrix.os.name == 'darwin' }}
     - run: ./hack/ci/install-mac-deps.sh
       if: ${{ matrix.os.name == 'darwin' }}
+    - run: ./hack/ci/install-windows-deps.sh
+      if: ${{ matrix.os.name == 'windows' }}
     - run: ./hack/build/cargo.sh build --bin kratactl

crates/kratactl/Cargo.toml

@@ -13,13 +13,15 @@ env_logger = { workspace = true }
 krata = { path = "../krata" }
 log = { workspace = true }
 serde = { workspace = true }
-termion = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tonic = { workspace = true }
 tower = { workspace = true }
 url = { workspace = true }
 
+[target.'cfg(unix)'.dependencies]
+termion = { workspace = true }
+
 [lib]
 name = "kratactl"
 

crates/kratactl/src/client.rs

@@ -1,7 +1,13 @@
+#[cfg(not(unix))]
+use anyhow::anyhow;
 use anyhow::Result;
 use krata::{control::control_service_client::ControlServiceClient, dial::ControlDialAddress};
+#[cfg(unix)]
 use tokio::net::UnixStream;
-use tonic::transport::{Channel, ClientTlsConfig, Endpoint, Uri};
+#[cfg(unix)]
+use tonic::transport::Uri;
+use tonic::transport::{Channel, ClientTlsConfig, Endpoint};
+#[cfg(unix)]
 use tower::service_fn;
 
 pub struct ControlClientProvider {}
@@ -10,13 +16,13 @@ impl ControlClientProvider {
     pub async fn dial(addr: ControlDialAddress) -> Result<ControlServiceClient<Channel>> {
         let channel = match addr {
             ControlDialAddress::UnixSocket { path } => {
-                // This URL is not actually used but is required to be specified.
-                Endpoint::try_from(format!("unix://localhost/{}", path))?
-                    .connect_with_connector(service_fn(|uri: Uri| {
-                        let path = uri.path().to_string();
-                        UnixStream::connect(path)
-                    }))
-                    .await?
+                #[cfg(not(unix))]
+                return Err(anyhow!(
+                    "unix sockets are not supported on this platform (path {})",
+                    path
+                ));
+                #[cfg(unix)]
+                ControlClientProvider::dial_unix_socket(path).await?
             }
 
             ControlDialAddress::Tcp { host, port } => {
@@ -41,4 +47,15 @@ impl ControlClientProvider {
 
         Ok(ControlServiceClient::new(channel))
     }
+
+    #[cfg(unix)]
+    async fn dial_unix_socket(path: String) -> Result<Channel> {
+        // This URL is not actually used but is required to be specified.
+        Ok(Endpoint::try_from(format!("unix://localhost/{}", path))?
+            .connect_with_connector(service_fn(|uri: Uri| {
+                let path = uri.path().to_string();
+                UnixStream::connect(path)
+            }))
+            .await?)
+    }
 }

crates/kratactl/src/console.rs

@@ -1,8 +1,3 @@
-use std::{
-    io::stdout,
-    os::fd::{AsRawFd, FromRawFd},
-};
-
 use anyhow::Result;
 use async_stream::stream;
 use krata::{
@@ -10,9 +5,13 @@ use krata::{
     control::{watch_events_reply::Event, ConsoleDataReply, ConsoleDataRequest},
 };
 use log::debug;
+#[cfg(unix)]
+use std::os::fd::{AsRawFd, FromRawFd};
+#[cfg(unix)]
 use termion::raw::IntoRawMode;
+#[cfg(unix)]
+use tokio::fs::File;
 use tokio::{
-    fs::File,
     io::{stdin, AsyncReadExt, AsyncWriteExt},
     task::JoinHandle,
 };
@@ -48,8 +47,14 @@ impl StdioConsoleStream {
     }
 
     pub async fn stdout(mut stream: Streaming<ConsoleDataReply>) -> Result<()> {
-        let terminal = stdout().into_raw_mode()?;
-        let mut stdout = unsafe { File::from_raw_fd(terminal.as_raw_fd()) };
+        #[cfg(unix)]
+        let terminal = std::io::stdout().into_raw_mode()?;
+        #[cfg(unix)]
+        let mut stdout =
+            unsafe { File::from_std(std::fs::File::from_raw_fd(terminal.as_raw_fd())) };
+        #[cfg(not(unix))]
+        let mut stdout = tokio::io::stdout();
+
         while let Some(reply) = stream.next().await {
             let reply = reply?;
             if reply.data.is_empty() {

hack/build/cross-compile.sh

@@ -14,8 +14,14 @@ then
 fi
 
 HOST_OS="$(uname -s)"
+HOST_OS="$(echo "${HOST_OS}" | awk -F '_' '{print $1}')"
 HOST_OS="$(echo "${HOST_OS}" | tr '[:upper:]' '[:lower:]')"
 
+if [ "${HOST_OS}" = "mingw64" ]
+then
+  HOST_OS="windows"
+fi
+
 if [ -z "${TARGET_OS}" ]
 then
   TARGET_OS="${HOST_OS}"

hack/build/target.sh

@@ -19,7 +19,13 @@ fi
 if [ -z "${TARGET_OS}" ]
 then
   TARGET_OS="$(uname -s)"
+  TARGET_OS="$(echo "${TARGET_OS}" | awk -F '_' '{print $1}')"
   TARGET_OS="$(echo "${TARGET_OS}" | tr '[:upper:]' '[:lower:]')"
+
+  if [ "${TARGET_OS}" = "mingw64" ]
+  then
+    TARGET_OS="windows"
+  fi
 fi
 
 if [ "${TARGET_OS}" = "darwin" ]
@@ -36,6 +42,20 @@ then
       RUST_TARGET="aarch64-apple-darwin"
     fi
   fi
+elif [ "${TARGET_OS}" = "windows" ]
+then
+  if [ -z "${RUST_TARGET}" ]
+  then
+    if [ "${TARGET_ARCH}" = "x86_64" ]
+    then
+      RUST_TARGET="x86_64-pc-windows-msvc"
+    fi
+
+    if [ "${TARGET_ARCH}" = "aarch64" ]
+    then
+      RUST_TARGET="aarch64-pc-windows-msvc"
+    fi
+  fi
 else
   if [ -z "${RUST_TARGET}" ]
   then

hack/ci/install-windows-deps.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+winget install protobuf