fix copilot feedback

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

.vscode/settings.json

@@ -23,11 +23,5 @@
         "."
     ],
     "azure-pipelines.1ESPipelineTemplatesSchemaFile": true,
-    "powershell.codeFormatting.preset": "OTBS",
-    "chat.tools.terminal.autoApprove": {
-        "cargo check": true,
-        "cargo test": true,
-        "cargo clippy": true,
-        "Invoke-Pester": true
-    }
-}
+    "powershell.codeFormatting.preset": "OTBS"
+}

resources/dism_dsc/featureondemand.dsc.resource.json

@@ -69,10 +69,10 @@
                         "type": "object",
                         "additionalProperties": false,
                         "properties": {
-                            "name": {
+                            "identity": {
                                 "type": "string",
-                                "title": "Capability name",
-                                "description": "The name of the Windows capability (Feature on Demand). Required for get operation. For export operation, this is optional and wildcards (*) are supported for case-insensitive filtering."
+                                "title": "Capability identity",
+                                "description": "The identity of the Windows capability (Feature on Demand). Required for get and set operations. For export operation, this is optional and wildcards (*) are supported for case-insensitive filtering."
                             },
                             "_exist": {
                                 "type": "boolean",
@@ -92,7 +92,7 @@
                                     "PartiallyInstalled"
                                 ],
                                 "title": "Capability state",
-                                "description": "The current state of the capability. For set operations, only Installed and NotPresent are accepted; other states are returned by get and export operations and are not valid inputs for set."
+                                "description": "The current state of the capability. For set operations, this property is required and only Installed and NotPresent are accepted; other states are returned by get and export operations and are not valid inputs for set."
                             },
                             "displayName": {
                                 "type": "string",

resources/dism_dsc/locales/en-us.toml

@@ -21,7 +21,7 @@ failedSerializeOutput = "Failed to serialize output: %{err}"
 [fod_get]
 failedParseInput = "Failed to parse input: %{err}"
 capabilitiesArrayEmpty = "Capabilities array cannot be empty for get operation"
-nameRequired = "name is required for get operation"
+identityRequired = "identity is required for get operation"
 failedSerializeOutput = "Failed to serialize output: %{err}"
 
 [fod_export]
@@ -31,9 +31,9 @@ failedSerializeOutput = "Failed to serialize output: %{err}"
 [fod_set]
 failedParseInput = "Failed to parse input: %{err}"
 capabilitiesArrayEmpty = "Capabilities array cannot be empty for set operation"
-nameRequired = "name is required for set operation"
+identityRequired = "identity is required for set operation"
 stateRequired = "state is required for set operation"
-capabilityNotFound = "Capability '%{name}' was not found on this system"
+capabilityNotFound = "Capability '%{identity}' was not found on this system"
 unsupportedDesiredState = "Unsupported desired state '%{state}'. Supported states for set are: Installed, NotPresent"
 failedSerializeOutput = "Failed to serialize output: %{err}"
 
@@ -54,7 +54,7 @@ getFeatureInfoFailed = "DismGetFeatureInfo failed for '%{name}': HRESULT %{hr}"
 enableFeatureFailed = "DismEnableFeature failed for '%{name}': HRESULT %{hr}"
 disableFeatureFailed = "DismDisableFeature failed for '%{name}': HRESULT %{hr}"
 getFeaturesFailed = "DismGetFeatures failed: HRESULT %{hr}"
-capabilitiesNotSupported = "Capability operations are not supported on this system. DismGetCapabilities not found in dismapi.dll."
+capabilitiesNotSupported = "Capability operations are not supported on this system. Capability APIs not available in dismapi.dll."
 getCapabilitiesFailed = "DismGetCapabilities failed: HRESULT %{hr}"
 getCapabilityInfoFailed = "DismGetCapabilityInfo failed for '%{name}': HRESULT %{hr}"
 addCapabilityFailed = "DismAddCapability failed for '%{name}': HRESULT %{hr}"

resources/dism_dsc/src/feature_on_demand/export.rs

@@ -27,9 +27,9 @@ pub fn handle_export(input: &str) -> Result<String, String> {
 
     let mut results = Vec::new();
 
-    let (filters_with_name, filters_without_name): (Vec<&FeatureOnDemandInfo>, Vec<&FeatureOnDemandInfo>) =
+    let (filters_with_identity, filters_without_identity): (Vec<&FeatureOnDemandInfo>, Vec<&FeatureOnDemandInfo>) =
         if needs_full_info {
-            filters.iter().partition(|f| f.name.is_some())
+            filters.iter().partition(|f| f.identity.is_some())
         } else {
             (Vec::new(), Vec::new())
         };
@@ -38,11 +38,11 @@ pub fn handle_export(input: &str) -> Result<String, String> {
         let state = CapabilityState::from_dism(*state_val);
 
         if needs_full_info {
-            let mut should_get_full = !filters_without_name.is_empty();
+            let mut should_get_full = !filters_without_identity.is_empty();
             if !should_get_full {
-                for f in &filters_with_name {
-                    if let Some(ref filter_name) = f.name {
-                        if matches_wildcard(name, filter_name) {
+                for f in &filters_with_identity {
+                    if let Some(ref filter_identity) = f.identity {
+                        if matches_wildcard(name, filter_identity) {
                             should_get_full = true;
                             break;
                         }
@@ -55,7 +55,7 @@ pub fn handle_export(input: &str) -> Result<String, String> {
 
             let info = match session.get_capability_info(name) {
                 Ok(raw) if !raw.unknown => FeatureOnDemandInfo {
-                    name: Some(raw.name),
+                    identity: Some(raw.name),
                     exist: None,
                     state: CapabilityState::from_dism(raw.state),
                     display_name: Some(raw.display_name),
@@ -64,7 +64,7 @@ pub fn handle_export(input: &str) -> Result<String, String> {
                     install_size: Some(raw.install_size),
                 },
                 _ => FeatureOnDemandInfo {
-                    name: Some(name.clone()),
+                    identity: Some(name.clone()),
                     exist: None,
                     state,
                     display_name: None,
@@ -78,10 +78,10 @@ pub fn handle_export(input: &str) -> Result<String, String> {
                 results.push(info);
             }
         } else {
-            // Fast path: only need name and state for filtering, skip expensive
+            // Fast path: only need identity and state for filtering, skip expensive
             // per-capability DismGetCapabilityInfo calls to match dism /online /get-capabilities speed.
             let basic = FeatureOnDemandInfo {
-                name: Some(name.clone()),
+                identity: Some(name.clone()),
                 state: state.clone(),
                 ..FeatureOnDemandInfo::default()
             };

resources/dism_dsc/src/feature_on_demand/get.rs

@@ -18,21 +18,21 @@ pub fn handle_get(input: &str) -> Result<String, String> {
     let mut results = Vec::new();
 
     for cap_input in &capability_list.capabilities {
-        let name = cap_input
-            .name
+        let identity = cap_input
+            .identity
             .as_ref()
-            .ok_or_else(|| t!("fod_get.nameRequired").to_string())?;
+            .ok_or_else(|| t!("fod_get.identityRequired").to_string())?;
 
-        let raw = session.get_capability_info(name)?;
+        let raw = session.get_capability_info(identity)?;
         let info = if raw.unknown {
             FeatureOnDemandInfo {
-                name: Some(name.clone()),
+                identity: Some(identity.clone()),
                 exist: Some(false),
                 ..FeatureOnDemandInfo::default()
             }
         } else {
             FeatureOnDemandInfo {
-                name: Some(raw.name),
+                identity: Some(raw.name),
                 state: CapabilityState::from_dism(raw.state),
                 display_name: Some(raw.display_name),
                 description: Some(raw.description),

resources/dism_dsc/src/feature_on_demand/set.rs

@@ -21,20 +21,20 @@ pub fn handle_set(input: &str) -> Result<String, String> {
     let mut reboot_required = false;
 
     for cap_input in &capability_list.capabilities {
-        let name = cap_input
-            .name
+        let identity = cap_input
+            .identity
             .as_ref()
-            .ok_or_else(|| t!("fod_set.nameRequired").to_string())?;
+            .ok_or_else(|| t!("fod_set.identityRequired").to_string())?;
 
         let desired_state = cap_input
             .state
             .as_ref()
             .ok_or_else(|| t!("fod_set.stateRequired").to_string())?;
 
-        let current = session.get_capability_info(name)?;
+        let current = session.get_capability_info(identity)?;
 
         if current.unknown {
-            return Err(t!("fod_set.capabilityNotFound", name = name).to_string());
+            return Err(t!("fod_set.capabilityNotFound", identity = identity).to_string());
         }
 
         let current_state = CapabilityState::from_dism(current.state);
@@ -43,13 +43,13 @@ pub fn handle_set(input: &str) -> Result<String, String> {
             CapabilityState::Installed => {
                 match current_state {
                     Some(CapabilityState::Installed) => false,
-                    _ => session.add_capability(name)?,
+                    _ => session.add_capability(identity)?,
                 }
             }
             CapabilityState::NotPresent => {
                 match current_state {
                     Some(CapabilityState::NotPresent) | Some(CapabilityState::Removed) => false,
-                    _ => session.remove_capability(name)?,
+                    _ => session.remove_capability(identity)?,
                 }
             }
             _ => {
@@ -63,9 +63,9 @@ pub fn handle_set(input: &str) -> Result<String, String> {
 
         reboot_required = reboot_required || needs_reboot;
 
-        let raw = session.get_capability_info(name)?;
+        let raw = session.get_capability_info(identity)?;
         let info = FeatureOnDemandInfo {
-            name: Some(raw.name),
+            identity: Some(raw.name),
             state: CapabilityState::from_dism(raw.state),
             display_name: Some(raw.display_name),
             description: Some(raw.description),

resources/dism_dsc/src/feature_on_demand/types.rs

@@ -20,7 +20,7 @@ pub struct FeatureOnDemandList {
 #[serde(rename_all = "camelCase")]
 pub struct FeatureOnDemandInfo {
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
+    pub identity: Option<String>,
     #[serde(rename = "_exist", skip_serializing_if = "Option::is_none")]
     pub exist: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -37,7 +37,7 @@ pub struct FeatureOnDemandInfo {
 
 impl WildcardFilterable for FeatureOnDemandInfo {
     fn matches_filter(&self, filter: &Self) -> bool {
-        matches_optional_wildcard(&self.name, &filter.name)
+        matches_optional_wildcard(&self.identity, &filter.identity)
             && matches_optional_exact(&self.state, &filter.state)
             && matches_optional_wildcard(&self.display_name, &filter.display_name)
             && matches_optional_wildcard(&self.description, &filter.description)

resources/dism_dsc/src/optional_feature/mod.rs

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 mod types;
-pub mod dism;
+pub(crate) mod dism;
 mod get;
 mod export;
 mod set;

resources/dism_dsc/src/util.rs

@@ -79,7 +79,7 @@ pub fn matches_wildcard(text: &str, pattern: &str) -> bool {
         if part.is_empty() {
             continue;
         }
-        match text_lower[pos..end].find(part) {
+        match text_lower.get(pos..end).and_then(|s| s.find(part)) {
             Some(idx) => pos += idx + part.len(),
             None => return false,
         }

resources/dism_dsc/tests/featureOnDemand_export.tests.ps1

@@ -26,7 +26,7 @@ Describe 'Microsoft.Windows/FeatureOnDemandList - export operation' -Skip:(!$IsW
         $knownCapabilityNameTwo = $notPresentMatches[0].Matches[0].Groups[1].Value
 
         # Get the displayName for the known installed capability to use in wildcard displayName tests
-        $fullInfoJson = '{"capabilities":[{"name":"' + $knownCapabilityNameOne + '","displayName":"*"}]}'
+        $fullInfoJson = '{"capabilities":[{"identity":"' + $knownCapabilityNameOne + '","displayName":"*"}]}'
         $fullInfoOutput = dsc resource export -r Microsoft.Windows/FeatureOnDemandList -i $fullInfoJson | ConvertFrom-Json
         $knownDisplayName = $fullInfoOutput.resources[0].properties.capabilities[0].displayName
         if (-not $knownDisplayName) {
@@ -43,36 +43,36 @@ Describe 'Microsoft.Windows/FeatureOnDemandList - export operation' -Skip:(!$IsW
         $capabilities = $output.resources[0].properties.capabilities
         $capabilities | Should -Not -BeNullOrEmpty
         $capabilities.Count | Should -BeGreaterThan 0
-        $capabilities[0].name | Should -Not -BeNullOrEmpty
+        $capabilities[0].identity | Should -Not -BeNullOrEmpty
         $capabilities[0].state | Should -BeIn @(
             'NotPresent', 'UninstallPending', 'Staged', 'Removed',
             'Installed', 'InstallPending', 'Superseded', 'PartiallyInstalled'
         )
     }
 
-    It 'exports capabilities filtered by exact name' -Skip:(!$isElevated) {
-        $inputJson = '{"capabilities":[{"name":"' + $knownCapabilityNameOne + '"}]}'
+    It 'exports capabilities filtered by exact identity' -Skip:(!$isElevated) {
+        $inputJson = '{"capabilities":[{"identity":"' + $knownCapabilityNameOne + '"}]}'
         $output = dsc resource export -r Microsoft.Windows/FeatureOnDemandList -i $inputJson | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         $capabilities = $output.resources[0].properties.capabilities
         $capabilities | Should -Not -BeNullOrEmpty
         $capabilities.Count | Should -Be 1
         $cap = $capabilities[0]
-        $cap.name | Should -BeExactly $knownCapabilityNameOne
+        $cap.identity | Should -BeExactly $knownCapabilityNameOne
         $cap.state | Should -BeIn @(
             'NotPresent', 'UninstallPending', 'Staged', 'Removed',
             'Installed', 'InstallPending', 'Superseded', 'PartiallyInstalled'
         )
     }
 
-    It 'exports capabilities filtered by wildcard name' -Skip:(!$isElevated) {
-        $inputJson = '{"capabilities":[{"name":"Language.Basic*"}]}'
+    It 'exports capabilities filtered by wildcard identity' -Skip:(!$isElevated) {
+        $inputJson = '{"capabilities":[{"identity":"Language.Basic*"}]}'
         $output = dsc resource export -r Microsoft.Windows/FeatureOnDemandList -i $inputJson | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         $capabilities = $output.resources[0].properties.capabilities
         $capabilities | Should -Not -BeNullOrEmpty
         foreach ($cap in $capabilities) {
-            $cap.name | Should -BeLike 'Language.Basic*'
+            $cap.identity | Should -BeLike 'Language.Basic*'
         }
     }
 
@@ -87,8 +87,8 @@ Describe 'Microsoft.Windows/FeatureOnDemandList - export operation' -Skip:(!$IsW
         }
     }
 
-    It 'exports capabilities with combined name and state filter' -Skip:(!$isElevated) {
-        $inputJson = '{"capabilities":[{"name":"*","state":"Installed"}]}'
+    It 'exports capabilities with combined identity and state filter' -Skip:(!$isElevated) {
+        $inputJson = '{"capabilities":[{"identity":"*","state":"Installed"}]}'
         $output = dsc resource export -r Microsoft.Windows/FeatureOnDemandList -i $inputJson | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         $capabilities = $output.resources[0].properties.capabilities
@@ -110,18 +110,18 @@ Describe 'Microsoft.Windows/FeatureOnDemandList - export operation' -Skip:(!$IsW
     }
 
     It 'exports capabilities with multiple filters using OR logic' -Skip:(!$isElevated) {
-        $inputJson = '{"capabilities":[{"name":"' + $knownCapabilityNameOne + '"},{"name":"' + $knownCapabilityNameTwo + '"}]}'
+        $inputJson = '{"capabilities":[{"identity":"' + $knownCapabilityNameOne + '"},{"identity":"' + $knownCapabilityNameTwo + '"}]}'
         $output = dsc resource export -r Microsoft.Windows/FeatureOnDemandList -i $inputJson | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         $capabilities = $output.resources[0].properties.capabilities
         $capabilities | Should -Not -BeNullOrEmpty
-        $names = $capabilities | ForEach-Object { $_.name }
-        $names | Should -Contain $knownCapabilityNameOne
-        $names | Should -Contain $knownCapabilityNameTwo
+        $identities = $capabilities | ForEach-Object { $_.identity }
+        $identities | Should -Contain $knownCapabilityNameOne
+        $identities | Should -Contain $knownCapabilityNameTwo
     }
 
     It 'returns empty results for non-matching wildcard filter' -Skip:(!$isElevated) {
-        $inputJson = '{"capabilities":[{"name":"ZZZNonExistent*"}]}'
+        $inputJson = '{"capabilities":[{"identity":"ZZZNonExistent*"}]}'
         $output = dsc resource export -r Microsoft.Windows/FeatureOnDemandList -i $inputJson | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         $capabilities = $output.resources[0].properties.capabilities
@@ -137,13 +137,13 @@ Describe 'Microsoft.Windows/FeatureOnDemandList - export operation' -Skip:(!$IsW
     }
 
     It 'returns complete capability properties when full-info filter is used' -Skip:(!$isElevated) {
-        $inputJson = '{"capabilities":[{"name":"' + $knownCapabilityNameOne + '","displayName":"*"}]}'
+        $inputJson = '{"capabilities":[{"identity":"' + $knownCapabilityNameOne + '","displayName":"*"}]}'
         $output = dsc resource export -r Microsoft.Windows/FeatureOnDemandList -i $inputJson | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         $capabilities = $output.resources[0].properties.capabilities
         $capabilities.Count | Should -Be 1
         $cap = $capabilities[0]
-        $cap.name | Should -BeExactly $knownCapabilityNameOne
+        $cap.identity | Should -BeExactly $knownCapabilityNameOne
         $cap.state | Should -BeIn @(
             'NotPresent', 'UninstallPending', 'Staged', 'Removed',
             'Installed', 'InstallPending', 'Superseded', 'PartiallyInstalled'