fix clippy

Author: tgauth

build.ps1

@@ -60,7 +60,8 @@ $filesForWindowsPackage = @(
     'RunCommandOnSet.dsc.resource.json',
     'RunCommandOnSet.exe',
     'sshdconfig.exe',
-    'sshdconfig.dsc.resource.json',
+    'sshd.dsc.resource.json',
+    'sshd_config.dsc.resource.json',
     'windowspowershell.dsc.resource.json',
     'wmi.dsc.resource.json',
     'wmi.resource.ps1',
@@ -87,7 +88,8 @@ $filesForLinuxPackage = @(
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
     'sshdconfig',
-    'sshdconfig.dsc.resource.json'
+    'sshd.dsc.resource.json',
+    'sshd_config.dsc.resource.json'
 )
 
 $filesForMacPackage = @(
@@ -109,7 +111,8 @@ $filesForMacPackage = @(
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
     'sshdconfig',
-    'sshdconfig.dsc.resource.json'
+    'sshd.dsc.resource.json',
+    'sshd_config.dsc.resource.json'
 )
 
 # the list of files other than the binaries which need to be executable

registry_lib/src/lib.rs

@@ -57,7 +57,7 @@ impl RegistryHelper {
     ///
     /// * `RegistryError` - The error that occurred.
     pub fn new(key_path: &str, value_name: Option<String>, value_data: Option<RegistryValueData>) -> Result<Self, RegistryError> {
-        let (hive, subkey) = get_hive_from_path(&key_path)?;
+        let (hive, subkey) = get_hive_from_path(key_path)?;
         let config = Registry {
             key_path: key_path.to_string(),
             value_name,

sshdconfig/src/args.rs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 use clap::{Parser, Subcommand};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 #[derive(Parser)]
@@ -12,18 +13,23 @@ pub struct Args {
 
 #[derive(Subcommand)]
 pub enum Command {
-    /// Export sshd_config
+    /// Export `sshd_config`
     Export,
-    /// Get default shell, eventually to be used for sshd_config and repeatable keywords
+    /// Get default shell, eventually to be used for `sshd_config` and repeatable keywords
     Get,
-    /// Set default shell, eventually to be used for sshd_config and repeatable keywords
+    Schema {
+        // Used to inform which schema to generate
+        #[clap(long, hide = true)]
+        as_global: bool,
+    },
+    /// Set default shell, eventually to be used for `sshd_config` and repeatable keywords
     Set {
         #[clap(short = 'i', long, help = "input to set in sshd_config")]
         input: String
     },
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
 pub struct DefaultShell {
     pub shell: Option<String>,
     pub cmd_option: Option<String>,

sshdconfig/src/get.rs

@@ -74,37 +74,3 @@ fn get_default_shell() -> Result<(), SshdConfigError> {
     println!("{output}");
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use registry_lib::config::RegistryValueData;
-
-    #[test]
-    fn test_parse_shell_command() {
-        let (shell, args) = parse_shell_command(r#"C:\Program Files\PowerShell\pwsh.exe -NoProfile"#);
-        assert_eq!(shell, r#"C:\Program Files\PowerShell\pwsh.exe"#);
-        assert_eq!(args, vec!["-NoProfile"]);
-    }
-
-    #[test]
-    fn test_parse_shell_command_with_quotes() {
-        let (shell, args) = parse_shell_command(r#""C:\Program Files\PowerShell\pwsh.exe" -NoProfile -Command"#);
-        assert_eq!(shell, r#"C:\Program Files\PowerShell\pwsh.exe"#);
-        assert_eq!(args, vec!["-NoProfile", "-Command"]);
-    }
-
-    #[test]
-    fn test_extract_string_value_string() {
-        let value = RegistryValueData::String("test".to_string());
-        let result = extract_string_value(value, "test_field").unwrap();
-        assert_eq!(result, Some("test".to_string()));
-    }
-
-    #[test]
-    fn test_extract_string_value_multistring() {
-        let value = RegistryValueData::MultiString(vec!["first".to_string(), "second".to_string()]);
-        let result = extract_string_value(value, "test_field").unwrap();
-        assert_eq!(result, Some("first".to_string()));
-    }
-}

sshdconfig/src/main.rs

@@ -1,10 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use args::{Args, Command};
 use clap::{Parser};
+use schemars::schema_for;
+
+use args::{Args, Command, DefaultShell};
 use export::invoke_export;
 use get::invoke_get;
+use parser::SshdConfigParser;
 use set::invoke_set;
 
 mod args;
@@ -23,6 +26,15 @@ fn main() {
         Command::Export => invoke_export(),
         Command::Get => invoke_get(),
         Command::Set { input } => invoke_set(input),
+        Command::Schema { as_global } => {
+            let schema = if *as_global {
+                schema_for!(DefaultShell)
+            } else {
+                schema_for!(SshdConfigParser)
+            };
+            println!("{}", serde_json::to_string_pretty(&schema).unwrap());
+            Ok(())
+        }
     };
 
     if let Err(e) = result {

sshdconfig/src/set.rs

@@ -12,40 +12,38 @@ use crate::error::SshdConfigError;
 /// # Errors
 ///
 /// This function will return an error if the desired settings cannot be applied.
-pub fn invoke_set(input: &String) -> Result<(), SshdConfigError> {
+pub fn invoke_set(input: &str) -> Result<(), SshdConfigError> {
     match serde_json::from_str::<DefaultShell>(input) {
         Ok(default_shell) => {
-            set_default_shell(&default_shell.shell, &default_shell.cmd_option, &default_shell.escape_arguments, &default_shell.shell_arguments)
+            set_default_shell(default_shell.shell, default_shell.cmd_option, default_shell.escape_arguments, default_shell.shell_arguments)
         },
         Err(e) => {
             // TODO: handle other commands like repeatable keywords or sshd_config modifications
-            return Err(SshdConfigError::InvalidInput(format!("Failed to parse input as DefaultShell: {}", e)));
+            Err(SshdConfigError::InvalidInput(format!("Failed to parse input as DefaultShell: {e}")))
         }
     }
 }
 
-fn set_default_shell(shell: &Option<String>, cmd_option: &Option<String>, escape_arguments: &Option<bool>, shell_arguments: &Option<Vec<String>>) -> Result<(), SshdConfigError> {
+fn set_default_shell(shell: Option<String>, cmd_option: Option<String>, escape_arguments: Option<bool>, shell_arguments: Option<Vec<String>>) -> Result<(), SshdConfigError> {
     if let Some(shell) = shell {
-        let shell_path = Path::new(shell);
-        if shell_path.is_relative() {
-            if shell_path.components().any(|c| c == std::path::Component::ParentDir) {
-                return Err(SshdConfigError::InvalidInput("shell path must not be relative".to_string()));
-            }
+        let shell_path = Path::new(&shell);
+        if shell_path.is_relative() && shell_path.components().any(|c| c == std::path::Component::ParentDir) {
+            return Err(SshdConfigError::InvalidInput("shell path must not be relative".to_string()));
         }
         if !shell_path.exists() {
-            return Err(SshdConfigError::InvalidInput(format!("shell path does not exist: {}", shell)));
+            return Err(SshdConfigError::InvalidInput(format!("shell path does not exist: {shell}")));
         }
 
         let mut shell_data = shell.clone();
         if let Some(shell_args) = shell_arguments {
             let args_str = shell_args.join(" ");
-            shell_data = format!("{} {}", shell, args_str);
+            shell_data = format!("{shell} {args_str}");
         }
 
         set_registry("DefaultShell", RegistryValueData::String(shell_data))?;
     } else {
         remove_registry("DefaultShell")?;
-    };
+    }
 
 
     if let Some(cmd_option) = cmd_option {
@@ -56,7 +54,7 @@ fn set_default_shell(shell: &Option<String>, cmd_option: &Option<String>, escape
 
     if let Some(escape_args) = escape_arguments {
         let mut escape_data = 0;
-        if *escape_args {
+        if escape_args {
             escape_data = 1;
         }
         set_registry("DefaultShellEscapeArguments", RegistryValueData::DWord(escape_data))?;

sshdconfig/sshd.dsc.resource.json

@@ -23,7 +23,8 @@
         "command": {
             "executable": "sshdconfig",
             "args": [
-                "schema"
+                "schema",
+                "--as-global"
             ]
         }
     }