address review feedback

Author: tgauth

dsc/tests/dsc_export.tests.ps1

@@ -167,15 +167,16 @@ resources:
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
 resources:
   - name: Test Export
-    type: Test/ExportBubble
+    type: Test/Export
     properties:
+      count: 1
 '@
         $out = dsc config export -i $yaml | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         $out.resources.count | Should -Be 1
         $out.resources[0].name | Should -BeExactly 'TestName'
         $out.resources[0].kind | Should -BeExactly 'TestKind'
-        $out.resources[0].securityContext | Should -BeExactly 'TestSecurityContext'
+        $out.resources[0].metadata.securityContext | Should -BeExactly 'TestSecurityContext'
         $out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_kind'
         $out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_securityContext'
         $out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_name'

dsc_lib/locales/en-us.toml

@@ -66,6 +66,7 @@ parameterNotArray = "Parameter '%{name}' is not an array"
 parameterNotObject = "Parameter '%{name}' is not an object"
 invokePropertyExpressions = "Invoke property expressions"
 invokeExpression = "Invoke property expression for %{name}: %{value}"
+propertyNotString = "Property '%{name}' with value '%{value}' is not a string"
 
 [discovery.commandDiscovery]
 couldNotReadSetting = "Could not read 'resourcePath' setting"

dsc_lib/src/configure/config_doc.rs

@@ -139,8 +139,6 @@ pub struct Resource {
     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 {
@@ -196,7 +194,6 @@ impl Resource {
             name: String::new(),
             depends_on: None,
             kind: None,
-            security_context: None,
             properties: None,
             metadata: None,
         }

dsc_lib/src/configure/mod.rs

@@ -66,22 +66,27 @@ 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 r: Resource = config_doc::Resource::new();
+            r.resource_type.clone_from(&resource.type_name);
             let mut props: Map<String, Value> = serde_json::from_value(instance.clone())?;
             if let Some(kind) = props.remove("_kind") {
+                if !kind.is_string() {
+                    return Err(DscError::Parser(t!("configure.mod.propertyNotString", name = "_kind", value = kind).to_string()));
+                }
                 r.kind = kind.as_str().map(std::string::ToString::to_string);
             }
             if let Some(security_context) = props.remove("_securityContext") {
-                r.security_context = security_context.as_str().map(std::string::ToString::to_string);
+                let mut metadata = Map::new();
+                metadata.insert("securityContext".to_string(), security_context.clone());
+                r.metadata = Some(metadata);
             }
             r.name = if let Some(name) = props.remove("_name") {
                 name.as_str()
                     .map(std::string::ToString::to_string)
-                    .ok_or_else(|| DscError::Parser(t!("configure.mod.valueCouldNotBeTransformedAsString", value = name).to_string()))?
+                    .ok_or_else(|| DscError::Parser(t!("configure.mod.propertyNotString", name = "_name", value = name).to_string()))?
             } else {
-                format!("{}-{}", r.resource_type, i)
+                format!("{}-{i}", r.resource_type)
             };
-            r.resource_type.clone_from(&resource.type_name);
             r.properties = escape_property_values(&props)?;
 
             conf.resources.push(r);

tools/dsctest/dscexportbubble.dsc.resource.json

@@ -10,7 +10,6 @@ pub enum Schemas {
     ExitCode,
     InDesiredState,
     Export,
-    ExportBubble,
     Exporter,
     Sleep,
     Trace,
@@ -56,9 +55,6 @@ pub enum SubCommand {
         input: String,
     },
 
-    #[clap(name = "export-bubble", about = "Export properties that DSC will bubble up")]
-    ExportBubble,
-
     #[clap(name = "exporter", about = "Exports different types of resources")]
     Exporter {
         #[clap(name = "input", short, long, help = "The input to the exporter command as JSON")]

tools/dsctest/src/args.rs

@@ -9,4 +9,10 @@ use serde::{Deserialize, Serialize};
 pub struct Export {
     /// Number of instances to return
     pub count: u64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub _kind: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub _name: Option<String>,
+    #[serde(rename = "_securityContext", skip_serializing_if = "Option::is_none")]
+    pub _security_context: Option<String>,
 }

tools/dsctest/src/export.rs

@@ -94,19 +94,15 @@ fn main() {
             };
             for i in 0..export.count {
                 let instance = Export {
-                    count: i
+                    count: i,
+                    _kind: Some("TestKind".to_string()),
+                    _name: Some("TestName".to_string()),
+                    _security_context: Some("TestSecurityContext".to_string()),
                 };
                 println!("{}", serde_json::to_string(&instance).unwrap());
             }
             String::new()
         },
-        SubCommand::ExportBubble => {
-            let mut properties = Map::new();
-            properties.insert("_kind".to_string(), serde_json::Value::String("TestKind".to_string()));
-            properties.insert("_name".to_string(), serde_json::Value::String("TestName".to_string()));
-            properties.insert("_securityContext".to_string(), serde_json::Value::String("TestSecurityContext".to_string()));
-            serde_json::to_string(&properties).unwrap()
-        },
         SubCommand::Exporter { input } => {
             let exporter = match serde_json::from_str::<Exporter>(&input) {
                 Ok(exporter) => exporter,
@@ -144,9 +140,6 @@ fn main() {
                 Schemas::Export => {
                     schema_for!(Export)
                 },
-                Schemas::ExportBubble => {
-                    schema_for!(Resource)
-                },
                 Schemas::Exporter => {
                     schema_for!(Exporter)
                 },