Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

feat(*) wash burrito support #556

Merged
merged 9 commits into from
Jun 13, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ docker-compose.yml

# Host config files
host_config.json
# No dumps in git
*.dump
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ctrlc = { workspace = true }
dirs = { workspace = true }
env_logger = { workspace = true }
envmnt = { workspace = true }
futures = { workspace = true }
indicatif = { workspace = true }
log = { workspace = true }
nkeys = { workspace = true }
Expand Down Expand Up @@ -134,6 +135,7 @@ thiserror = "1.0"
tokio = { version = "1.28.2", default-features = false, features = ["fs"] }
tokio-stream = "0.1"
tokio-tar = "0.3"
tokio-util = "0.7.8"
toml = "0.7.4"
wadm = "0.4.0"
walkdir = "2.3"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ build-watch: ## Continuously build the project

test: ## Run unit test suite
@$(CARGO) nextest run $(CARGO_TEST_TARGET) --no-fail-fast --bin wash
@$(CARGO) nextest run $(CARGO_TEST_TARGET) --no-fail-fast -p wash-lib
@$(CARGO) nextest run $(CARGO_TEST_TARGET) --no-fail-fast -p wash-lib --features=cli

test-wash-ci:
@$(CARGO) nextest run --profile ci --workspace --bin wash
Expand Down
1 change: 1 addition & 0 deletions crates/wash-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ time = "0.3"
tokio = { workspace = true, features = ["process"] }
tokio-stream = { workspace = true }
tokio-tar = { workspace = true }
tokio-util = { workspace = true }
toml = { workspace = true }
wadm = { workspace = true, optional = true}
walkdir = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions crates/wash-lib/src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::{
};

use anyhow::{anyhow, bail, Result};
#[cfg(feature = "cli")]
use clap::{Parser, Subcommand};
use oci_distribution::manifest::OciImageManifest;
use oci_distribution::{
Expand Down
8 changes: 8 additions & 0 deletions crates/wash-lib/src/start/nats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,14 @@ where
.map(|_| child)
}

/// Helper function to get the path to the NATS server pid file
pub fn nats_pid_path<P>(install_dir: P) -> PathBuf
where
P: AsRef<Path>,
{
install_dir.as_ref().join(NATS_SERVER_PID)
}

/// Helper function to determine the NATS server release path given an os/arch and version
fn nats_url(os: &str, arch: &str, version: &str) -> String {
// Replace "macos" with "darwin" to match NATS release scheme
Expand Down
Loading