handle local paths without file:///

Cargo.toml

@@ -17,6 +17,7 @@ documentation = "https://appliedcomputing.io/simkube/"
 license-file = "LICENSE"
 readme = "README.md"
 edition = "2021"
+rust-version = "1.79"
 
 [profile.dev.package."*"]
 debug = false

Makefile

@@ -19,7 +19,7 @@ APP_VERSION=$(shell $(APP_VERSION_CMD))
 include build/base.mk
 include build/k8s.mk
 
-RUST_BUILD_IMAGE ?= rust:buster
+RUST_BUILD_IMAGE ?= rust:1.79-bullseye
 
 main:
 	docker run $(DOCKER_ARGS) -u `id -u`:`id -g` -w /build -v `pwd`:/build:rw -v $(BUILD_DIR):/build/.build:rw $(RUST_BUILD_IMAGE) make build-docker

docs/intro/installation.md

@@ -11,7 +11,7 @@ This guide will walk you through installing the various SimKube components
 
 The following prereqs are required for all components:
 
-- [Rust (including Cargo)](https://www.rust-lang.org/learn/get-started) >= 1.71
+- [Rust (including Cargo)](https://www.rust-lang.org/learn/get-started) >= 1.79
 - [Docker](https://docs.docker.com/get-started/)
 - [kubectl](https://kubernetes.io/docs/tasks/tools/) >= 1.27
 - a Kubernetes cluster running at least v1.27

images/Dockerfile.sk-ctrl

@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG K8S_VERSION=v1.29.5
 

images/Dockerfile.sk-driver

@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG K8S_VERSION=v1.29.5
 

images/Dockerfile.sk-tracer

@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN apt-get update && apt-get install -y \
     ca-certificates \

sk-core/Cargo.toml

@@ -33,6 +33,7 @@ thiserror = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
+url = { workspace = true }
 
 # testutils dependencies
 http = { workspace = true, optional = true }

sk-core/src/external_storage.rs

@@ -22,6 +22,12 @@
 /// Set the `GOOGLE_SERVICE_ACCOUNT` environment variable to the path for your service account JSON
 /// file (if you're running inside a container, you'll need that file injected as well).  Pass in a
 /// URL like `gs://bucket/path/to/resource`.
+use std::path::{
+    absolute,
+    PathBuf,
+};
+
+use anyhow::anyhow;
 use async_trait::async_trait;
 use bytes::Bytes;
 #[cfg(feature = "testutils")]
@@ -53,8 +59,7 @@ pub struct SkObjectStore {
 
 impl SkObjectStore {
     pub fn new(path_str: &str) -> anyhow::Result<SkObjectStore> {
-        let url = Url::parse(path_str)?;
-        let (scheme, path) = ObjectStoreScheme::parse(&url)?;
+        let (scheme, path) = parse_path(path_str)?;
         let store: Box<DynObjectStore> = match scheme {
             ObjectStoreScheme::Local => Box::new(object_store::local::LocalFileSystem::new()),
             ObjectStoreScheme::Memory => Box::new(object_store::memory::InMemory::new()),
@@ -96,6 +101,18 @@ impl ObjectStoreWrapper for SkObjectStore {
     }
 }
 
+fn parse_path(path_str: &str) -> anyhow::Result<(ObjectStoreScheme, Path)> {
+    let url = match Url::parse(path_str) {
+        Err(url::ParseError::RelativeUrlWithoutBase) => {
+            let path = absolute(PathBuf::from(path_str))?;
+            Url::from_file_path(path).map_err(|e| anyhow!("could not create URL from file path: {e:?}"))?
+        },
+        res => res?,
+    };
+
+    Ok(ObjectStoreScheme::parse(&url)?)
+}
+
 #[cfg(test)]
 mod test {
     use rstest::*;
@@ -112,4 +129,13 @@ mod test {
         let store = SkObjectStore::new("s3://foo/bar").unwrap();
         assert_eq!(store.scheme(), ObjectStoreScheme::AmazonS3);
     }
+
+    #[rstest]
+    #[case::with_base("file:///tmp/foo")]
+    #[case::without_base("/tmp/foo")]
+    #[case::relative("foo")]
+    fn test_new_sk_object_store_local_path(#[case] path: &str) {
+        let store = SkObjectStore::new(path).unwrap();
+        assert_eq!(store.scheme(), ObjectStoreScheme::Local);
+    }
 }