Merge branch 'gh-1207/main/fix-support-securestring' of https://github.com/Gijsreyn/operation-methods into gh-1207/main/fix-support-securestring

Author: Gijsreyn

build.data.json

@@ -389,25 +389,7 @@
       "TestOnly": true,
       "CopyFiles": {
         "All": [
-          "dscdelete.dsc.resource.json",
-          "dscexist.dsc.resource.json",
-          "dscexitcode.dsc.resource.json",
-          "dscexport.dsc.resource.json",
-          "dscexporter.dsc.resource.json",
-          "dscget.dsc.resource.json",
-          "dscindesiredstate.dsc.resource.json",
-          "dscoperation.dsc.resource.json",
-          "dscsleep.dsc.resource.json",
-          "dsctrace.dsc.resource.json",
-          "dscwhatif.dsc.resource.json",
-          "metadata.dsc.resource.json",
-          "resourceadapter.dsc.resource.json",
-          "version1.1.2.dsc.resource.json",
-          "version1.1.3.dsc.resource.json",
-          "version1.1.dsc.resource.json",
-          "version2.1p1.dsc.resource.json",
-          "version2.1p2.dsc.resource.json",
-          "version2.dsc.resource.json"
+          "dsctest.dsc.manifests.json"
         ]
       }
     },

build.ps1

@@ -499,11 +499,11 @@ if (!$SkipBuild) {
             }
 
             if ($IsWindows) {
-                Copy-Item "*.dsc.resource.json" $target -Force -ErrorAction Ignore
+                Copy-Item "*.dsc.resource.*","*.dsc.manifests.*" $target -Force -ErrorAction Ignore
             }
             else { # don't copy WindowsPowerShell resource manifest
                 $exclude = @('windowspowershell.dsc.resource.json', 'winpsscript.dsc.resource.json')
-                Copy-Item "*.dsc.resource.json" $target -Exclude $exclude -Force -ErrorAction Ignore
+                Copy-Item "*.dsc.resource.*","*.dsc.manifests.*" $target -Exclude $exclude -Force -ErrorAction Ignore
             }
 
             # be sure that the files that should be executable are executable

dsc/src/args.rs

@@ -289,20 +289,21 @@ pub enum ResourceSubCommand {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
 pub enum SchemaType {
-    GetResult,
-    SetResult,
-    TestResult,
-    ResolveResult,
-    DscResource,
-    Resource,
-    ResourceManifest,
-    Include,
     Configuration,
     ConfigurationGetResult,
     ConfigurationSetResult,
     ConfigurationTestResult,
-    ExtensionManifest,
+    DscResource,
     ExtensionDiscoverResult,
+    ExtensionManifest,
     FunctionDefinition,
-    RestartRequired
+    GetResult,
+    Include,
+    ManifestList,
+    ResolveResult,
+    Resource,
+    ResourceManifest,
+    RestartRequired,
+    SetResult,
+    TestResult,
 }

dsc/src/util.rs

@@ -17,7 +17,10 @@ use dsc_lib::{
             ResourceTestResult,
         },
     },
-    discovery::Discovery,
+    discovery::{
+        command_discovery::ManifestList,
+        Discovery,
+    },
     dscerror::DscError,
     dscresources::{
         command_resource::TraceLevel,
@@ -157,30 +160,6 @@ pub fn add_fields_to_json(json: &str, fields_to_add: &HashMap<String, String>) -
 #[must_use]
 pub fn get_schema(schema: SchemaType) -> Schema {
     match schema {
-        SchemaType::GetResult => {
-            schema_for!(GetResult)
-        },
-        SchemaType::SetResult => {
-            schema_for!(SetResult)
-        },
-        SchemaType::TestResult => {
-            schema_for!(TestResult)
-        },
-        SchemaType::ResolveResult => {
-            schema_for!(ResolveResult)
-        }
-        SchemaType::DscResource => {
-            schema_for!(DscResource)
-        },
-        SchemaType::Resource => {
-            schema_for!(Resource)
-        },
-        SchemaType::ResourceManifest => {
-            schema_for!(ResourceManifest)
-        },
-        SchemaType::Include => {
-            schema_for!(Include)
-        },
         SchemaType::Configuration => {
             schema_for!(Configuration)
         },
@@ -193,18 +172,45 @@ pub fn get_schema(schema: SchemaType) -> Schema {
         SchemaType::ConfigurationTestResult => {
             schema_for!(ConfigurationTestResult)
         },
-        SchemaType::ExtensionManifest => {
-            schema_for!(ExtensionManifest)
+        SchemaType::DscResource => {
+            schema_for!(DscResource)
         },
         SchemaType::ExtensionDiscoverResult => {
             schema_for!(DiscoverResult)
         },
+        SchemaType::ExtensionManifest => {
+            schema_for!(ExtensionManifest)
+        },
         SchemaType::FunctionDefinition => {
             schema_for!(FunctionDefinition)
         },
+        SchemaType::GetResult => {
+            schema_for!(GetResult)
+        },
+        SchemaType::Include => {
+            schema_for!(Include)
+        },
+        SchemaType::ManifestList => {
+            schema_for!(ManifestList)
+        },
+        SchemaType::ResolveResult => {
+            schema_for!(ResolveResult)
+        },
+        SchemaType::Resource => {
+            schema_for!(Resource)
+        },
+        SchemaType::ResourceManifest => {
+            schema_for!(ResourceManifest)
+        },
         SchemaType::RestartRequired => {
             schema_for!(RestartRequired)
-        }
+        },
+        SchemaType::SetResult => {
+            schema_for!(SetResult)
+        },
+        SchemaType::TestResult => {
+            schema_for!(TestResult)
+        },
     }
 }
 

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

@@ -259,13 +259,22 @@ impl RegistryHelper {
     ///
     /// * `RegistryError` - The error that occurred.
     pub fn remove(&self) -> Result<Option<Registry>, RegistryError> {
-        let (reg_key, _subkey) = match self.open(Security::AllAccess) {
+        // For deleting a value, we need SetValue permission (KEY_SET_VALUE).
+        // Try to open with the minimal required permission.
+        // If that fails due to permission, try with AllAccess as a fallback.
+        let (reg_key, _subkey) = match self.open(Security::SetValue) {
             Ok(reg_key) => reg_key,
             // handle NotFound error
             Err(RegistryError::RegistryKeyNotFound(_)) => {
                 eprintln!("{}", t!("registry_helper.removeErrorKeyNotExist"));
                 return Ok(None);
             },
+            Err(RegistryError::RegistryKey(key::Error::PermissionDenied(_, _))) => {
+                match self.open(Security::AllAccess) {
+                    Ok(reg_key) => reg_key,
+                    Err(e) => return self.handle_error_or_what_if(e),
+                }
+            },
             Err(e) => return self.handle_error_or_what_if(e),
         };
 
@@ -289,10 +298,11 @@ impl RegistryHelper {
                 Err(e) => return self.handle_error_or_what_if(RegistryError::RegistryValue(e)),
             }
         } else {
-            // to delete the key, we need to open the parent key first
+            // to delete the key, we need to open the parent key with CreateSubKey permission
+            // which includes the ability to delete subkeys
             let parent_path = get_parent_key_path(&self.config.key_path);
             let (hive, parent_subkey) = get_hive_from_path(parent_path)?;
-            let parent_reg_key = match hive.open(parent_subkey, Security::AllAccess) {
+            let parent_reg_key = match hive.open(parent_subkey, Security::CreateSubKey) {
                 Ok(k) => k,
                 Err(e) => return self.handle_error_or_what_if(RegistryError::RegistryKey(e)),
             };

lib/dsc-lib/locales/en-us.toml

@@ -98,13 +98,16 @@ discoverResources = "Discovering '%{kind}' using filter: %{filter}"
 invalidAdapterFilter = "Could not build Regex filter for adapter name"
 progressSearching = "Searching for resources"
 extensionSearching = "Searching for extensions"
-foundResourceManifest = "Found resource manifest: %{path}"
+foundManifest = "Found manifest: %{path}"
 extensionFound = "Extension '%{extension}' version %{version} found"
 adapterFound = "Resource adapter '%{adapter}' version %{version} found"
 resourceFound = "Resource '%{resource}' version %{version} found"
 executableNotFound = "Executable '%{executable}' not found for operation '%{operation}' for resource '%{resource}'"
 extensionInvalidVersion = "Extension '%{extension}' version '%{version}' is invalid"
-invalidManifest = "Invalid manifest for resource '%{resource}'"
+invalidResourceManifest = "Invalid manifest for resource '%{resource}'"
+invalidExtensionManifest = "Invalid manifest for extension '%{extension}'"
+invalidManifestList = "Invalid manifest list '%{resource}': %{err}"
+invalidManifestFile = "Invalid manifest file '%{resource}': %{err}"
 extensionResourceFound = "Extension found resource '%{resource}'"
 callingExtension = "Calling extension '%{extension}' to discover resources"
 extensionFoundResources = "Extension '%{extension}' found %{count} resources"
@@ -677,3 +680,4 @@ notFoundSetting = "Setting '%{name}' not found in %{path}"
 failedToGetExePath = "Can't get 'dsc' executable path"
 settingNotFound = "Setting '%{name}' not found"
 failedToAbsolutizePath = "Failed to absolutize path '%{path}'"
+invalidExitCodeKey = "Invalid exit code key '%{key}'"