Merge pull request #1541 from Gijsreyn/gh-1540/main/add-windowsfeaturelist-resource

Add new `Microsoft.Windows/WindowsFeatureList` resource

Author: SteveL-MSFT

Cargo.lock

@@ -48,7 +48,6 @@ default-members = [
     "lib/dsc-lib-registry",
     "resources/runcommandonset",
     "lib/dsc-lib-security_context",
-    "resources/dism_dsc",
     "resources/sshdconfig",
     "resources/WindowsUpdate",
     "resources/windows_service",
@@ -58,7 +57,8 @@ default-members = [
     "grammars/tree-sitter-dscexpression",
     "grammars/tree-sitter-ssh-server-config",
     "y2j",
-    "xtask"
+    "xtask",
+    "resources/dism_dsc"
 ]
 
 [workspace.metadata.groups]

Cargo.toml

@@ -109,6 +109,7 @@
       "windows_firewall.exe",
       "windows_service.exe",
       "windows_service.dsc.resource.json",
+      "windows_feature.dsc.resource.json",
       "wmi.dsc.resource.json",
       "wmi.resource.ps1",
       "wmiAdapter.psd1",
@@ -180,7 +181,7 @@
         "SupportedPlatformOS": "Windows",
         "Binaries": ["dism_dsc"],
         "CopyFiles": {
-            "Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json"]
+            "Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json", "windows_feature.dsc.resource.json"]
         }
     },
     {

data.build.json

@@ -35,8 +35,8 @@ pub struct Registry {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, JsonSchema)]
-#[serde(deny_unknown_fields)]
+#[serde(deny_unknown_fields, rename_all = "camelCase")]
 pub struct Metadata {
-    #[serde(rename = "whatIf", skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub what_if: Option<Vec<String>>
 }

lib/dsc-lib-registry/src/config.rs

@@ -5,6 +5,6 @@
     "SupportedPlatformOS": "Windows",
     "Binaries": ["dism_dsc"],
     "CopyFiles": {
-        "Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json"]
+        "Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json", "windows_feature.dsc.resource.json"]
     }
 }

resources/dism_dsc/.project.data.json

@@ -2,10 +2,10 @@ _version = 1
 
 [main]
 missingArguments = "Missing operation and resource type arguments"
-usage = "Usage: dism_dsc <get|set|export> <optional-feature|feature-on-demand>"
+usage = "Usage: dism_dsc <get|set|export> <optional-feature|feature-on-demand|windows-feature>"
 windowsOnly = "This resource is only supported on Windows"
 unknownOperation = "Unknown operation '%{operation}'"
-unknownResourceType = "Unknown resource type '%{resource_type}'. Expected 'optional-feature' or 'feature-on-demand'"
+unknownResourceType = "Unknown resource type '%{resource_type}'. Expected 'optional-feature', 'feature-on-demand', or 'windows-feature'"
 errorReadingInput = "Error reading input: %{err}"
 
 [get]
@@ -60,3 +60,8 @@ getCapabilitiesFailed = "DismGetCapabilities failed: HRESULT %{hr}"
 getCapabilityInfoFailed = "DismGetCapabilityInfo failed for '%{name}': HRESULT %{hr}"
 addCapabilityFailed = "DismAddCapability failed for '%{name}': HRESULT %{hr}"
 removeCapabilityFailed = "DismRemoveCapability failed for '%{name}': HRESULT %{hr}"
+
+[windows_feature_helper]
+whatIfEnable = "Would enable feature '%{name}'"
+whatIfDisable = "Would disable feature '%{name}' (remove payload: false)"
+whatIfRemove = "Would remove feature '%{name}' (remove payload: true)"