bubble up special properties from resource during export

Author: tgauth

dsc/src/subcommand.rs

@@ -141,8 +141,7 @@ pub fn config_test(configurator: &mut Configurator, format: Option<&OutputFormat
                             name: test_result.name,
                             resource_type: test_result.resource_type,
                             properties,
-                            depends_on: None,
-                            metadata: None,
+                            ..Default::default()
                         };
                         result_configuration.resources.push(resource);
                     }

dsc_lib/src/configure/config_doc.rs

@@ -134,9 +134,13 @@ pub struct Resource {
     #[schemars(regex(pattern = r"^\[resourceId\(\s*'[a-zA-Z0-9\.]+/[a-zA-Z0-9]+'\s*,\s*'[a-zA-Z0-9 ]+'\s*\)]$"))]
     pub depends_on: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub kind: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub properties: Option<Map<String, Value>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub metadata: Option<Map<String, Value>>,
+    #[serde(rename = "securityContext", skip_serializing_if = "Option::is_none")]
+    pub security_context: Option<String>,
 }
 
 impl Default for Configuration {
@@ -191,6 +195,8 @@ impl Resource {
             resource_type: String::new(),
             name: String::new(),
             depends_on: None,
+            kind: None,
+            security_context: None,
             properties: None,
             metadata: None,
         }

dsc_lib/src/configure/mod.rs

@@ -67,9 +67,21 @@ pub fn add_resource_export_results_to_configuration(resource: &DscResource, conf
     } else {
         for (i, instance) in export_result.actual_state.iter().enumerate() {
             let mut r = config_doc::Resource::new();
+            let mut props: Map<String, Value> = serde_json::from_value(instance.clone())?;
+            if let Some(kind) = props.remove("_kind") {
+                r.kind = kind.as_str().map(|s| s.to_string());
+            }
+            if let Some(security_context) = props.remove("_securityContext") {
+                r.security_context = security_context.as_str().map(|s| s.to_string());
+            }
+            r.name = if let Some(name) = props.remove("_name") {
+                name.as_str()
+                    .map(|s| s.to_string())
+                    .ok_or_else(|| DscError::Parser(t!("configure.mod.valueCouldNotBeTransformedAsString", value = name).to_string()))?
+            } else {
+                format!("{}-{}", r.resource_type, i)
+            };
             r.resource_type.clone_from(&resource.type_name);
-            r.name = format!("{}-{i}", r.resource_type);
-            let props: Map<String, Value> = serde_json::from_value(instance.clone())?;
             r.properties = escape_property_values(&props)?;
 
             conf.resources.push(r);

dsc_lib/src/dscresources/dscresource.rs

@@ -109,9 +109,8 @@ impl DscResource {
         let adapter_resource = Resource {
             name: self.type_name.clone(),
             resource_type: adapter.to_string(),
-            depends_on: None,
-            metadata: None,
             properties: Some(resources_map),
+            ..Default::default()
         };
         configuration.resources.push(adapter_resource);
         let config_json = serde_json::to_string(&configuration)?;