modify export behavior

Author: tgauth

dsc/tests/dsc_sshdconfig.tests.ps1

@@ -96,7 +96,8 @@ resources:
         if ($command -eq 'export') {
             $out.resources.count | Should -Be 1
             $out.resources[0].properties.loglevel | Should -Be 'debug3'
-            $out.resources[0].properties._inheritedDefaults | Should -Contain 'port'
+            $out.resources[0].properties.port | Should -Be 22
+            $out.resources[0].properties._inheritedDefaults | Should -BeNullOrEmpty
         } else {
             $out.results.count | Should -Be 1
             ($out.results.result.actualState.psobject.properties | Measure-Object).count | Should -Be 2

sshdconfig/src/get.rs

@@ -33,7 +33,7 @@ pub fn invoke_get(input: Option<&String>, setting: &Setting) -> Result<Map<Strin
     match *setting {
         Setting::SshdConfig => {
             let cmd_info = build_command_info(input, true)?;
-            get_sshd_settings(&cmd_info)
+            get_sshd_settings(&cmd_info, true)
         },
         Setting::WindowsGlobal => {
             get_default_shell()?;
@@ -102,12 +102,12 @@ fn get_default_shell() -> Result<(), SshdConfigError> {
 ///
 /// # Arguments
 ///
-/// * `cmd_info` - CommandInfo struct containing optional filters, metadata, and includeDefaults flag.
+/// * `cmd_info` - `CommandInfo` struct containing optional filters, metadata, and includeDefaults flag.
 ///
 /// # Errors
 ///
 /// This function will return an error if it cannot retrieve the sshd settings.
-pub fn get_sshd_settings(cmd_info: &CommandInfo) -> Result<Map<String, Value>, SshdConfigError> {
+pub fn get_sshd_settings(cmd_info: &CommandInfo, is_get: bool) -> Result<Map<String, Value>, SshdConfigError> {
     let sshd_config_text = invoke_sshd_config_validation(cmd_info.sshd_args.clone())?;
     let mut result = parse_text_to_map(&sshd_config_text)?;
     let mut inherited_defaults: Vec<String> = Vec::new();
@@ -161,7 +161,7 @@ pub fn get_sshd_settings(cmd_info: &CommandInfo) -> Result<Map<String, Value>, S
     if cmd_info.metadata.filepath.is_some() {
         result.insert("_metadata".to_string(), serde_json::to_value(cmd_info.metadata.clone())?);
     }
-    if cmd_info.include_defaults {
+    if cmd_info.include_defaults && is_get {
         result.insert("_inheritedDefaults".to_string(), serde_json::to_value(inherited_defaults)?);
     }
     Ok(result)

sshdconfig/src/inputs.rs

@@ -19,9 +19,9 @@ pub struct CommandInfo {
 
 impl CommandInfo {
     /// Create a new `CommandInfo` instance.
-    pub fn new(is_get: bool) -> Self {
+    pub fn new(include_defaults: bool) -> Self {
         Self {
-            include_defaults: is_get,
+            include_defaults,
             input: Map::new(),
             metadata: Metadata::new(),
             sshd_args: None

sshdconfig/src/main.rs

@@ -36,7 +36,7 @@ fn main() {
     let result = match &args.command {
         Command::Export { input } => {
             match build_command_info(input.as_ref(), false) {
-                Ok(cmd_info) => get_sshd_settings(&cmd_info),
+                Ok(cmd_info) => get_sshd_settings(&cmd_info, false),
                 Err(e) => Err(e),
             }
         },