address review feedback

Author: tgauth

build.ps1

@@ -60,7 +60,7 @@ $filesForWindowsPackage = @(
     'RunCommandOnSet.dsc.resource.json',
     'RunCommandOnSet.exe',
     'sshdconfig.exe',
-    'sshd.dsc.resource.json',
+    'sshd-windows.dsc.resource.json',
     'sshd_config.dsc.resource.json',
     'windowspowershell.dsc.resource.json',
     'wmi.dsc.resource.json',
@@ -88,7 +88,6 @@ $filesForLinuxPackage = @(
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
     'sshdconfig',
-    'sshd.dsc.resource.json',
     'sshd_config.dsc.resource.json'
 )
 
@@ -111,7 +110,6 @@ $filesForMacPackage = @(
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
     'sshdconfig',
-    'sshd.dsc.resource.json',
     'sshd_config.dsc.resource.json'
 )
 
@@ -176,7 +174,7 @@ if ($null -ne $packageType) {
 
     & $rustup default stable
 
-    ## Test if Node is installed 
+    ## Test if Node is installed
     ## Skipping upgrade as users may have a specific version they want to use
     if (!(Get-Command 'node' -ErrorAction Ignore)) {
         Write-Verbose -Verbose "Node.js not found, installing..."

sshdconfig/locales/en-us.toml

@@ -14,32 +14,32 @@ parseInt = "Parse Integer"
 registry = "Registry"
 
 [get]
-notImplemented = "get not yet implemented for Microsoft.OpenSSH.SSHD/sshd_config"
-defaultShellMustBeString = "shell must be a string"
 defaultShellCmdOptionMustBeString = "cmdOption must be a string"
 defaultShellEscapeArgsMustBe0Or1 = "'%{input}' must be a 0 or 1"
 defaultShellEscapeArgsMustBeDWord = "escapeArguments must be a DWord"
+defaultShellMustBeString = "shell must be a string"
+notImplemented = "get not yet implemented for Microsoft.OpenSSH.SSHD/sshd_config"
 windowsOnly = "Microsoft.OpenSSH.SSHD/Windows is only applicable to Windows"
 
 [set]
 failedToParseInput = "failed to parse input as DefaultShell with error: '%{error}'"
-shellPathMustNotBeRelative = "shell path must not be relative"
 shellPathDoesNotExist = "shell path does not exist: '%{shell}'"
+shellPathMustNotBeRelative = "shell path must not be relative"
 
 [parser]
 failedToParse = "failed to parse: '%{input}'"
-failedToParseRoot = "failed to parse root: '%{input}'"
-invalidConfig = "invalid config: '%{input}'"
-unknownNodeType = "unknown node type: '%{node}'"
-failedToParseChildNode = "failed to parse child node: '%{input}'"
-missingValueInChildNode = "missing value in child node: '%{input}'"
-missingKeyInChildNode = "missing key in child node: '%{input}'"
 failedToParseAsArray = "value is not an array"
+failedToParseChildNode = "failed to parse child node: '%{input}'"
 failedToParseNode = "failed to parse '%{input}'"
+failedToParseRoot = "failed to parse root: '%{input}'"
+invalidConfig = "invalid config: '%{input}'"
+invalidValue = "operator is an invalid value for node"
 keyNotFound = "key '%{key}' not found"
 keyNotRepeatable = "key '%{key}' is not repeatable"
-invalidValue = "operator is an invalid value for node"
+missingKeyInChildNode = "missing key in child node: '%{input}'"
+missingValueInChildNode = "missing value in child node: '%{input}'"
 unknownNode = "unknown node: '%{kind}'"
+unknownNodeType = "unknown node type: '%{node}'"
 
 [util]
 sshdElevation = "elevated security context required"

sshdconfig/src/args.rs

@@ -35,8 +35,11 @@ pub enum Command {
 
 #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
 pub struct DefaultShell {
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub shell: Option<String>,
+    #[serde(rename = "cmdOption", skip_serializing_if = "Option::is_none")]
     pub cmd_option: Option<String>,
+    #[serde(rename = "escapeArguments", skip_serializing_if = "Option::is_none")]
     pub escape_arguments: Option<bool>,
 }
 

sshdconfig/src/get.rs

@@ -78,4 +78,4 @@ fn get_default_shell() -> Result<(), SshdConfigError> {
 #[cfg(not(windows))]
 fn get_default_shell() -> Result<(), SshdConfigError> {
     Err(SshdConfigError::InvalidInput(t!("get.windowsOnly").to_string()))
-}
+}

sshdconfig/sshd.dsc.resource.json sshdconfig/sshd-windows.dsc.resource.jsonsshdconfig/sshd.dsc.resource.json renamed to sshdconfig/sshd-windows.dsc.resource.json

@@ -67,8 +67,8 @@ Describe 'Default Shell Configuration Tests' -Skip:(!$IsWindows) {
 
             $result = $output | ConvertFrom-Json
             $result.shell | Should -Be $testShell
-            $result.cmd_option | Should -BeNullOrEmpty
-            $result.escape_arguments | Should -BeNullOrEmpty
+            $result.cmdOption | Should -BeNullOrEmpty
+            $result.escapeArguments | Should -BeNullOrEmpty
         }
 
         It 'Should get default shell with args when registry value exists' {
@@ -83,8 +83,8 @@ Describe 'Default Shell Configuration Tests' -Skip:(!$IsWindows) {
 
             $result = $output | ConvertFrom-Json
             $result.shell | Should -Be $testShell
-            $result.cmd_option | Should -Be "/c"
-            $result.escape_arguments | Should -Be $false
+            $result.cmdOption | Should -Be "/c"
+            $result.escapeArguments | Should -Be $false
         }
 
         It 'Should handle empty default shell registry values' -Skip:(!$IsWindows) {
@@ -93,8 +93,8 @@ Describe 'Default Shell Configuration Tests' -Skip:(!$IsWindows) {
 
             $result = $output | ConvertFrom-Json
             $result.shell | Should -BeNullOrEmpty
-            $result.cmd_option | Should -BeNullOrEmpty
-            $result.escape_arguments | Should -BeNullOrEmpty
+            $result.cmdOption | Should -BeNullOrEmpty
+            $result.escapeArguments | Should -BeNullOrEmpty
         }
     }
 
@@ -104,8 +104,8 @@ Describe 'Default Shell Configuration Tests' -Skip:(!$IsWindows) {
 
             $inputConfig = @{
                 shell = $testShell
-                cmd_option = "/c"
-                escape_arguments = $false
+                cmdOption = "/c"
+                escapeArguments = $false
             } | ConvertTo-Json
 
             sshdconfig set --input $inputConfig
@@ -157,8 +157,8 @@ Describe 'Default Shell Configuration Tests' -Skip:(!$IsWindows) {
         It 'Should maintain configuration consistency between set and get' {
             $originalConfig = @{
                 shell = "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe"
-                cmd_option = "/c"
-                escape_arguments = $true
+                cmdOption = "/c"
+                escapeArguments = $true
             }
             $inputJson = $originalConfig | ConvertTo-Json
 
@@ -171,8 +171,8 @@ Describe 'Default Shell Configuration Tests' -Skip:(!$IsWindows) {
             $retrievedConfig = $getOutput | ConvertFrom-Json
 
             $retrievedConfig.shell | Should -Be $originalConfig.shell
-            $retrievedConfig.cmd_option | Should -Be $originalConfig.cmd_option
-            $retrievedConfig.escape_arguments | Should -Be $originalConfig.escape_arguments
+            $retrievedConfig.cmdOption | Should -Be $originalConfig.cmdOption
+            $retrievedConfig.escapeArguments | Should -Be $originalConfig.escapeArguments
         }
     }