moved registry cli things to registry cli

Signed-off-by: Brooks Townsend <brooks@cosmonic.com>

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

@@ -27,109 +27,6 @@ const OCI_MEDIA_TYPE: &str = "application/vnd.oci.image.layer.v1.tar";
 // straight up stolen from oci_distribution::Reference
 pub const REFERENCE_REGEXP: &str = r"^((?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?/)?[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?)(?::([\w][\w.-]{0,127}))?(?:@([A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}))?$";
 
-#[cfg(feature = "cli")]
-mod cli {
-    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,
-    }
-}
-#[cfg(feature = "cli")]
-pub use cli::*;
-
 /// Additional options for pulling an OCI artifact
 #[derive(Default)]
 pub struct OciPullOptions {

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/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;