Remove unused properties from Resource in config doc

dsc/tests/dsc_export.tests.ps1

@@ -163,7 +163,7 @@ resources:
       $out.resources[1].properties.hello | Should -BeExactly 'world'
     }
 
-    It 'Export can surface _kind, _securityContext, and _name from a resource' {
+    It 'Export can surface _securityContext and _name from a resource' {
       $yaml = @'
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
 resources:
@@ -176,9 +176,7 @@ resources:
         $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].metadata.'Microsoft.DSC'.securityContext | Should -BeExactly 'elevated'
-        $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'
     }

lib/dsc-lib/src/configure/config_doc.rs

@@ -427,44 +427,6 @@ pub struct Copy {
     pub batch_size: Option<IntOrExpression>,
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(deny_unknown_fields)]
-pub struct Plan {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "promotionCode")]
-    pub promotion_code: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub publisher: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub product: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
-}
-
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(deny_unknown_fields)]
-pub struct Identity {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub r#type: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "userAssignedIdentities")]
-    pub user_assigned_identities: Option<Map<String, Value>>,
-}
-
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(deny_unknown_fields)]
-pub struct Sku {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tier: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub size: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub family: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub capacity: Option<i32>,
-}
-
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema, DscRepoSchema)]
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
 #[dsc_repo_schema(base_name = "document.resource", folder_path = "config")]
@@ -480,31 +442,15 @@ pub struct Resource {
     #[serde(default)]
     pub name: String, // friendly unique instance name
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub comments: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub directives: Option<ResourceDirective>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub execution_information: Option<ExecutionInformation>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub location: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     #[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 tags: Option<Map<String, Value>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub identity: Option<Identity>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sku: Option<Sku>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub kind: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub scope: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub copy: Option<Copy>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub plan: Option<Plan>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub properties: Option<Map<String, Value>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub resources: Option<Vec<Resource>>,
@@ -545,19 +491,11 @@ impl Resource {
             depends_on: None,
             directives: None,
             execution_information: None,
-            kind: None,
             properties: None,
             metadata: None,
             condition: None,
-            identity: None,
-            sku: None,
-            scope: None,
             copy: None,
-            plan: None,
             resources: None,
-            comments: None,
-            location: None,
-            tags: None,
             require_version: None,
         }
     }

lib/dsc-lib/src/configure/mod.rs

@@ -129,12 +129,6 @@ pub fn add_resource_export_results_to_configuration(resource: &DscResource, conf
             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);
-            }
             r.name = if let Some(name) = props.remove("_name") {
                 name.as_str()
                     .map(std::string::ToString::to_string)
@@ -299,7 +293,7 @@ fn check_security_context(metadata: Option<&Metadata>, directive_security_contex
 
     let mut security_context_required: Option<&SecurityContextKind> = None;
     if let Some(metadata) = &metadata
-        && let Some(microsoft_dsc) = &metadata.microsoft 
+        && let Some(microsoft_dsc) = &metadata.microsoft
         && let Some(required_security_context) = &microsoft_dsc.security_context {
             warn!("{}", t!("configure.mod.securityContextInMetadataDeprecated"));
             security_context_required = Some(required_security_context);

lib/dsc-lib/tests/integration/schemas/schema_for.rs

@@ -47,9 +47,6 @@ macro_rules! test_schema_for {
             test_schema_for!(dsc_lib::configure::config_doc::DataType);
             test_schema_for!(dsc_lib::configure::config_doc::CopyMode);
             test_schema_for!(dsc_lib::configure::config_doc::Copy);
-            test_schema_for!(dsc_lib::configure::config_doc::Plan);
-            test_schema_for!(dsc_lib::configure::config_doc::Identity);
-            test_schema_for!(dsc_lib::configure::config_doc::Sku);
             test_schema_for!(dsc_lib::configure::config_doc::Resource);
         }
         #[allow(unused_must_use)]

tools/dsctest/src/export.rs

@@ -10,8 +10,6 @@ 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/main.rs

@@ -125,7 +125,6 @@ fn main() {
             for i in 0..export.count {
                 let instance = Export {
                     count: i,
-                    _kind: Some("TestKind".to_string()),
                     _name: Some("TestName".to_string()),
                     _security_context: Some("elevated".to_string()),
                 };