Refactor resource discovery code

build.ps1

@@ -161,6 +161,8 @@ if (!$SkipBuild) {
     # make sure dependencies are built first so clippy runs correctly
     $windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter")
 
+    $macOS_projects = @("resources/brew")
+
     # projects are in dependency order
     $projects = @(
         "tree-sitter-dscexpression",
@@ -170,7 +172,6 @@ if (!$SkipBuild) {
         "osinfo",
         "powershell-adapter",
         "process",
-        "resources/brew",
         "runcommandonset",
         "tools/dsctest",
         "tools/test_group_resource",
@@ -187,6 +188,10 @@ if (!$SkipBuild) {
         Get-ChildItem -Path $target -Recurse -Hidden | ForEach-Object { $_.Attributes = 'Normal' }
     }
 
+    if ($IsMacOS) {
+        $projects += $macOS_projects
+    }
+
     $failed = $false
     foreach ($project in $projects) {
         ## Build format_json

dsc/src/resource_command.rs

@@ -27,7 +27,7 @@ pub fn get(dsc: &DscManager, resource_type: &str, mut input: String, format: &Op
         if let Some(pr) = get_resource(dsc, requires) {
             resource = pr;
         } else {
-            error!("Adapter {} not found", requires);
+            error!("Adapter '{}' not found", requires);
             return;
         };
     }
@@ -112,7 +112,7 @@ pub fn set(dsc: &DscManager, resource_type: &str, mut input: String, format: &Op
         if let Some(pr) = get_resource(dsc, requires) {
             resource = pr;
         } else {
-            error!("Adapter {} not found", requires);
+            error!("Adapter '{}' not found", requires);
             return;
         };
     }
@@ -149,7 +149,7 @@ pub fn test(dsc: &DscManager, resource_type: &str, mut input: String, format: &O
         if let Some(pr) = get_resource(dsc, requires) {
             resource = pr;
         } else {
-            error!("Adapter {} not found", requires);
+            error!("Adapter '{}' not found", requires);
             return;
         };
     }
@@ -186,7 +186,7 @@ pub fn delete(dsc: &DscManager, resource_type: &str, mut input: String) {
         if let Some(pr) = get_resource(dsc, requires) {
             resource = pr;
         } else {
-            error!("Adapter {} not found", requires);
+            error!("Adapter '{}' not found", requires);
             return;
         };
     }

dsc/src/subcommand.rs

@@ -337,7 +337,7 @@ pub fn validate_config(config: &str) -> Result<(), DscError> {
 
         resource_types.push(type_name.to_lowercase().to_string());
     }
-    dsc.discover_resources(&resource_types);
+    dsc.find_resources(&resource_types);
 
     for resource_block in resources {
         let Some(type_name) = resource_block["type"].as_str() else {
@@ -402,33 +402,33 @@ pub fn resource(subcommand: &ResourceSubCommand, stdin: &Option<String>) {
             list_resources(&mut dsc, resource_name, adapter_name, description, tags, format);
         },
         ResourceSubCommand::Schema { resource , format } => {
-            dsc.discover_resources(&[resource.to_lowercase().to_string()]);
+            dsc.find_resources(&[resource.to_lowercase().to_string()]);
             resource_command::schema(&dsc, resource, format);
         },
         ResourceSubCommand::Export { resource, format } => {
-            dsc.discover_resources(&[resource.to_lowercase().to_string()]);
+            dsc.find_resources(&[resource.to_lowercase().to_string()]);
             resource_command::export(&mut dsc, resource, format);
         },
         ResourceSubCommand::Get { resource, input, path, all, format } => {
-            dsc.discover_resources(&[resource.to_lowercase().to_string()]);
+            dsc.find_resources(&[resource.to_lowercase().to_string()]);
             if *all { resource_command::get_all(&dsc, resource, format); }
             else {
                 let parsed_input = get_input(input, stdin, path);
                 resource_command::get(&dsc, resource, parsed_input, format);
             }
         },
         ResourceSubCommand::Set { resource, input, path, format } => {
-            dsc.discover_resources(&[resource.to_lowercase().to_string()]);
+            dsc.find_resources(&[resource.to_lowercase().to_string()]);
             let parsed_input = get_input(input, stdin, path);
             resource_command::set(&dsc, resource, parsed_input, format);
         },
         ResourceSubCommand::Test { resource, input, path, format } => {
-            dsc.discover_resources(&[resource.to_lowercase().to_string()]);
+            dsc.find_resources(&[resource.to_lowercase().to_string()]);
             let parsed_input = get_input(input, stdin, path);
             resource_command::test(&dsc, resource, parsed_input, format);
         },
         ResourceSubCommand::Delete { resource, input, path } => {
-            dsc.discover_resources(&[resource.to_lowercase().to_string()]);
+            dsc.find_resources(&[resource.to_lowercase().to_string()]);
             let parsed_input = get_input(input, stdin, path);
             resource_command::delete(&dsc, resource, parsed_input);
         },

dsc/tests/dsc_tracing.tests.ps1

@@ -19,7 +19,7 @@ Describe 'tracing tests' {
 
     It 'trace level error does not emit other levels' {
         $logPath = "$TestDrive/dsc_trace.log"
-        $null = '{}' | dsc --trace-level error resource get -r 'DoesNotExist' 2> $logPath
+        $null = '{}' | dsc --trace-level error resource list 'DoesNotExist' 2> $logPath
         $log = Get-Content $logPath -Raw
         $log | Should -Not -BeLikeExactly "* WARNING *"
         $log | Should -Not -BeLikeExactly "* INFO *"
@@ -29,18 +29,18 @@ Describe 'tracing tests' {
 
     It 'trace format plaintext does not emit ANSI' {
         $logPath = "$TestDrive/dsc_trace.log"
-        $null = '{}' | dsc --trace-format plaintext resource get -r 'DoesNotExist' 2> $logPath
+        $null = '{}' | dsc --trace-format plaintext resource list 'DoesNotExist' 2> $logPath
         $log = Get-Content $logPath -Raw
         $log | Should -Not -BeLikeExactly "*``[0m*"
     }
 
     It 'trace format json emits json' {
         $logPath = "$TestDrive/dsc_trace.log"
-        $null = '{}' | dsc --trace-format json resource get -r 'DoesNotExist' 2> $logPath
+        $null = '{}' | dsc --trace-format json resource list 'DoesNotExist' 2> $logPath
         foreach ($line in (Get-Content $logPath)) {
             $trace = $line | ConvertFrom-Json -Depth 10
             $trace.timestamp | Should -Not -BeNullOrEmpty
-            $trace.level | Should -BeIn 'ERROR', 'WARNING', 'INFO', 'DEBUG', 'TRACE'
+            $trace.level | Should -BeIn 'ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE'
             $trace.fields.message | Should -Not -BeNullOrEmpty
         }
     }
@@ -55,12 +55,12 @@ Describe 'tracing tests' {
         param($level, $sourceExpected)
 
         $logPath = "$TestDrive/dsc_trace.log"
-        $null = '{}' | dsc -l $level resource get -r 'DoesNotExist' 2> $logPath
+        $null = '{}' | dsc -l $level resource list 'DoesNotExist' 2> $logPath
         $log = Get-Content $logPath -Raw
         if ($sourceExpected) {
-            $log | Should -BeLike "*dsc*: *"
+            $log | Should -BeLike "*dsc_lib*: *"
         } else {
-            $log | Should -Not -BeLike "*dsc*: *"
+            $log | Should -Not -BeLike "*dsc_lib*: *"
         }
     }
 }

dsc_lib/src/configure/mod.rs

@@ -335,18 +335,18 @@ impl Configurator {
                     resource_type: resource.resource_type.clone(),
                     result: set_result,
                 };
-                result.results.push(resource_result);    
+                result.results.push(resource_result);
             } else if dsc_resource.capabilities.contains(&Capability::Delete) {
                 debug!("Resource implements delete and _exist is false");
                 let before_result = dsc_resource.get(&desired)?;
                 let start_datetime = chrono::Local::now();
                 dsc_resource.delete(&desired)?;
                 let end_datetime = chrono::Local::now();
                 let after_result = dsc_resource.get(&desired)?;
-                // convert get result to set result                
+                // convert get result to set result
                 let set_result = match before_result {
                     GetResult::Resource(before_response) => {
-                        let GetResult::Resource(after_result) = after_result else { 
+                        let GetResult::Resource(after_result) = after_result else {
                             return Err(DscError::NotSupported("Group resources not supported for delete".to_string()))
                         };
                         let before_value = serde_json::to_value(&before_response.actual_state)?;
@@ -614,7 +614,7 @@ impl Configurator {
         let mut required_resources = config.resources.iter().map(|p| p.resource_type.to_lowercase()).collect::<Vec<String>>();
         required_resources.sort_unstable();
         required_resources.dedup();
-        self.discovery.discover_resources(&required_resources);
+        self.discovery.find_resources(&required_resources);
         Ok(config)
     }