Release v0.18.0

.github/workflows/release.yml

@@ -56,8 +56,9 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: release/windows/wash.exe
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          generate_release_notes: true
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: false
           prerelease: true

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wash-cli"
-version = "0.18.0-alpha.3"
+version = "0.18.0"
 authors = ["wasmCloud Team"]
 categories = ["wasm", "command-line-utilities"]
 description = "wasmcloud Shell (wash) CLI tool"
@@ -140,7 +140,7 @@ toml = "0.7.4"
 wadm = "0.4.0"
 walkdir = "2.3"
 wascap = "0.10.1"
-wash-lib = { version = "0.9.0-alpha.3", path = "./crates/wash-lib" }
+wash-lib = { version = "0.9.0", path = "./crates/wash-lib" }
 wasmbus-rpc = "0.13.0"
 wasmcloud-control-interface = "0.25"
 wasmcloud-test-util = "0.6.4"

crates/wash-lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wash-lib"
-version = "0.9.0-alpha.3"
+version = "0.9.0"
 authors = ["wasmCloud Team"]
 categories = ["wasm", "wasmcloud"]
 description = "wasmcloud Shell (wash) libraries"

crates/wash-lib/src/cli/mod.rs

@@ -41,6 +41,7 @@ pub mod get;
 pub mod inspect;
 pub mod link;
 pub mod output;
+pub mod registry;
 pub mod spy;
 pub mod start;
 pub mod stop;

crates/wash-lib/src/cli/registry.rs

@@ -0,0 +1,97 @@
+use clap::{Parser, Subcommand};
+
+#[derive(Parser, Debug, Clone)]
+pub struct AuthOpts {
+    /// OCI username, if omitted anonymous authentication will be used
+    #[clap(
+        short = 'u',
+        long = "user",
+        env = "WASH_REG_USER",
+        hide_env_values = true
+    )]
+    pub user: Option<String>,
+
+    /// OCI password, if omitted anonymous authentication will be used
+    #[clap(
+        short = 'p',
+        long = "password",
+        env = "WASH_REG_PASSWORD",
+        hide_env_values = true
+    )]
+    pub password: Option<String>,
+
+    /// Allow insecure (HTTP) registry connections
+    #[clap(long = "insecure")]
+    pub insecure: bool,
+}
+
+#[derive(Debug, Clone, Subcommand)]
+pub enum RegistryCommand {
+    /// Pull an artifact from an OCI compliant registry
+    #[clap(name = "pull")]
+    Pull(RegistryPullCommand),
+    /// Push an artifact to an OCI compliant registry
+    #[clap(name = "push")]
+    Push(RegistryPushCommand),
+    /// Ping (test url) to see if the OCI url has an artifact
+    #[clap(name = "ping")]
+    Ping(RegistryPingCommand),
+}
+
+#[derive(Parser, Debug, Clone)]
+pub struct RegistryPullCommand {
+    /// URL of artifact
+    #[clap(name = "url")]
+    pub url: String,
+
+    /// File destination of artifact
+    #[clap(long = "destination")]
+    pub destination: Option<String>,
+
+    /// Digest to verify artifact against
+    #[clap(short = 'd', long = "digest")]
+    pub digest: Option<String>,
+
+    /// Allow latest artifact tags
+    #[clap(long = "allow-latest")]
+    pub allow_latest: bool,
+
+    #[clap(flatten)]
+    pub opts: AuthOpts,
+}
+
+#[derive(Parser, Debug, Clone)]
+pub struct RegistryPushCommand {
+    /// URL to push artifact to
+    #[clap(name = "url")]
+    pub url: String,
+
+    /// Path to artifact to push
+    #[clap(name = "artifact")]
+    pub artifact: String,
+
+    /// Path to config file, if omitted will default to a blank configuration
+    #[clap(short = 'c', long = "config")]
+    pub config: Option<String>,
+
+    /// Allow latest artifact tags
+    #[clap(long = "allow-latest")]
+    pub allow_latest: bool,
+
+    /// Optional set of annotations to apply to the OCI artifact manifest
+    #[clap(short = 'a', long = "annotation", name = "annotations")]
+    pub annotations: Option<Vec<String>>,
+
+    #[clap(flatten)]
+    pub opts: AuthOpts,
+}
+
+#[derive(Parser, Debug, Clone)]
+pub struct RegistryPingCommand {
+    /// URL of artifact
+    #[clap(name = "url")]
+    pub url: String,
+
+    #[clap(flatten)]
+    pub opts: AuthOpts,
+}

crates/wash-lib/src/registry.rs

@@ -6,8 +6,6 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Result};
-#[cfg(feature = "cli")]
-use clap::{Parser, Subcommand};
 use oci_distribution::manifest::OciImageManifest;
 use oci_distribution::{
     client::{Client, ClientConfig, ClientProtocol, Config, ImageLayer},
@@ -69,102 +67,6 @@ pub enum SupportedArtifacts {
     Wasm,
 }
 
-#[derive(Parser, Debug, Clone)]
-pub struct AuthOpts {
-    /// OCI username, if omitted anonymous authentication will be used
-    #[clap(
-        short = 'u',
-        long = "user",
-        env = "WASH_REG_USER",
-        hide_env_values = true
-    )]
-    pub user: Option<String>,
-
-    /// OCI password, if omitted anonymous authentication will be used
-    #[clap(
-        short = 'p',
-        long = "password",
-        env = "WASH_REG_PASSWORD",
-        hide_env_values = true
-    )]
-    pub password: Option<String>,
-
-    /// Allow insecure (HTTP) registry connections
-    #[clap(long = "insecure")]
-    pub insecure: bool,
-}
-
-#[derive(Debug, Clone, Subcommand)]
-pub enum RegistryCommand {
-    /// Pull an artifact from an OCI compliant registry
-    #[clap(name = "pull")]
-    Pull(RegistryPullCommand),
-    /// Push an artifact to an OCI compliant registry
-    #[clap(name = "push")]
-    Push(RegistryPushCommand),
-    /// Ping (test url) to see if the OCI url has an artifact
-    #[clap(name = "ping")]
-    Ping(RegistryPingCommand),
-}
-
-#[derive(Parser, Debug, Clone)]
-pub struct RegistryPullCommand {
-    /// URL of artifact
-    #[clap(name = "url")]
-    pub url: String,
-
-    /// File destination of artifact
-    #[clap(long = "destination")]
-    pub destination: Option<String>,
-
-    /// Digest to verify artifact against
-    #[clap(short = 'd', long = "digest")]
-    pub digest: Option<String>,
-
-    /// Allow latest artifact tags
-    #[clap(long = "allow-latest")]
-    pub allow_latest: bool,
-
-    #[clap(flatten)]
-    pub opts: AuthOpts,
-}
-
-#[derive(Parser, Debug, Clone)]
-pub struct RegistryPushCommand {
-    /// URL to push artifact to
-    #[clap(name = "url")]
-    pub url: String,
-
-    /// Path to artifact to push
-    #[clap(name = "artifact")]
-    pub artifact: String,
-
-    /// Path to config file, if omitted will default to a blank configuration
-    #[clap(short = 'c', long = "config")]
-    pub config: Option<String>,
-
-    /// Allow latest artifact tags
-    #[clap(long = "allow-latest")]
-    pub allow_latest: bool,
-
-    /// Optional set of annotations to apply to the OCI artifact manifest
-    #[clap(short = 'a', long = "annotation", name = "annotations")]
-    pub annotations: Option<Vec<String>>,
-
-    #[clap(flatten)]
-    pub opts: AuthOpts,
-}
-
-#[derive(Parser, Debug, Clone)]
-pub struct RegistryPingCommand {
-    /// URL of artifact
-    #[clap(name = "url")]
-    pub url: String,
-
-    #[clap(flatten)]
-    pub opts: AuthOpts,
-}
-
 // NOTE(thomastaylor312): In later refactors, we might want to consider making some sort of puller
 // and pusher structs that can take optional implementations of a `Cache` trait that does all the
 // cached file handling. But for now, this should be good enough

src/common/registry_cmd.rs

@@ -10,14 +10,15 @@ use oci_distribution::{
 use serde_json::json;
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
+use wash_lib::cli::{
+    labels_vec_to_hashmap,
+    registry::{RegistryCommand, RegistryPingCommand, RegistryPullCommand, RegistryPushCommand},
+    CommandOutput, OutputKind,
+};
 use wash_lib::registry::{
     pull_oci_artifact, push_oci_artifact, validate_artifact, OciPullOptions, OciPushOptions,
     SupportedArtifacts,
 };
-use wash_lib::{
-    cli::{labels_vec_to_hashmap, CommandOutput, OutputKind},
-    registry::{RegistryCommand, RegistryPingCommand, RegistryPullCommand, RegistryPushCommand},
-};
 
 use crate::appearance::spinner::Spinner;
 

src/down/mod.rs

@@ -215,7 +215,9 @@ where
     let signal = if pid_file.is_file() {
         format!("stop={}", &pid_file.display())
     } else {
-        "stop".into()
+        return Err(anyhow::anyhow!(
+            "No pidfile found for nats-server, assuming it's managed externally"
+        ));
     };
     let output = Command::new(bin_path)
         .arg("--signal")

src/main.rs

@@ -10,13 +10,13 @@ use wash_lib::{
         get::GetCommand,
         inspect::InspectCliCommand,
         link::LinkCommand,
+        registry::{RegistryCommand, RegistryPullCommand, RegistryPushCommand},
         spy::SpyCommand,
         start::StartCommand,
         stop::StopCommand,
         CommandOutput, OutputKind,
     },
     drain::Drain as DrainSelection,
-    registry::{RegistryCommand, RegistryPullCommand, RegistryPushCommand},
 };
 
 use app::AppCliCommand;