fix to return error if specified adapter isn't found

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

dsc/tests/dsc_adapter.tests.ps1

@@ -94,7 +94,7 @@ Describe 'Tests for adapter support' {
                 `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
                 resources:
                 - name: Test
-                  type: Microsoft.DSC.Debug/Echo
+                  type: Test/Invalid
                   properties:
                     output: '1'
                   metadata:
@@ -104,7 +104,7 @@ Describe 'Tests for adapter support' {
             $out = dsc config get -i $config_yaml 2>$TestDrive/error.log
             $LASTEXITCODE | Should -Be 2 -Because (Get-Content $TestDrive/error.log | Out-String)
             $errorContent = Get-Content $TestDrive/error.log -Raw
-            $errorContent | Should -Match "Adapter resource 'InvalidAdapter/Invalid' not found" -Because $errorContent
+            $errorContent | Should -Match "Adapter not found: InvalidAdapter/Invalid" -Because $errorContent
             $out | Should -BeNullOrEmpty -Because $errorContent
         }
     }

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

@@ -84,7 +84,6 @@ skippingOutput = "Skipping output for '%{name}' due to condition evaluating to f
 secureOutputSkipped = "Secure output '%{name}' is skipped"
 outputTypeNotMatch = "Output '%{name}' type does not match expected type '%{expected_type}'"
 copyNotSupported = "Copy for output '%{name}' is currently not supported"
-requireAdapter = "Resource '%{resource}' requires adapter '%{adapter}'"
 
 [configure.parameters]
 importingParametersFromComplexInput = "Importing parameters from complex input"

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

@@ -282,17 +282,6 @@ fn get_metadata_from_result(mut context: Option<&mut Context>, result: &mut Valu
     Ok(())
 }
 
-fn get_require_adapter_from_metadata(resource_metadata: &Option<Metadata>) -> Option<String> {
-    if let Some(resource_metadata) = resource_metadata {
-        if let Some(microsoft_metadata) = &resource_metadata.microsoft {
-            if let Some(require_adapter) = &microsoft_metadata.require_adapter {
-                return Some(require_adapter.clone());
-            }
-        }
-    }
-    None
-}
-
 impl Configurator {
     /// Create a new `Configurator` instance.
     ///
@@ -351,6 +340,20 @@ impl Configurator {
         }
     }
 
+    fn get_require_adapter_from_metadata(&mut self, resource_metadata: &Option<Metadata>) -> Result<Option<String>, DscError> {
+        if let Some(resource_metadata) = resource_metadata {
+            if let Some(microsoft_metadata) = &resource_metadata.microsoft {
+                if let Some(require_adapter) = &microsoft_metadata.require_adapter {
+                    if self.discovery.find_adapter(require_adapter).is_none() {
+                        return Err(DscError::AdapterNotFound(require_adapter.clone()));
+                    }
+                    return Ok(Some(require_adapter.clone()));
+                }
+            }
+        }
+        Ok(None)
+    }
+
     /// Invoke the get operation on a resource.
     ///
     /// # Returns
@@ -374,7 +377,7 @@ impl Configurator {
                 progress.write_increment(1);
                 continue;
             }
-            let adapter = get_require_adapter_from_metadata(&resource.metadata);
+            let adapter = self.get_require_adapter_from_metadata(&resource.metadata)?;
             let Some(dsc_resource) = discovery.find_resource(&DiscoveryFilter::new(&resource.resource_type, resource.api_version.as_deref(), adapter.as_deref())) else {
                 return Err(DscError::ResourceNotFound(resource.resource_type, resource.api_version.as_deref().unwrap_or("").to_string()));
             };
@@ -459,7 +462,7 @@ impl Configurator {
                 progress.write_increment(1);
                 continue;
             }
-            let adapter = get_require_adapter_from_metadata(&resource.metadata);
+            let adapter = self.get_require_adapter_from_metadata(&resource.metadata)?;
             let Some(dsc_resource) = discovery.find_resource(&DiscoveryFilter::new(&resource.resource_type, resource.api_version.as_deref(), adapter.as_deref())) else {
                 return Err(DscError::ResourceNotFound(resource.resource_type, resource.api_version.as_deref().unwrap_or("").to_string()));
             };
@@ -628,7 +631,7 @@ impl Configurator {
                 progress.write_increment(1);
                 continue;
             }
-            let adapter = get_require_adapter_from_metadata(&resource.metadata);
+            let adapter = self.get_require_adapter_from_metadata(&resource.metadata)?;
             let Some(dsc_resource) = discovery.find_resource(&DiscoveryFilter::new(&resource.resource_type, resource.api_version.as_deref(), adapter.as_deref())) else {
                 return Err(DscError::ResourceNotFound(resource.resource_type, resource.api_version.as_deref().unwrap_or("").to_string()));
             };
@@ -712,7 +715,7 @@ impl Configurator {
                 progress.write_increment(1);
                 continue;
             }
-            let adapter = get_require_adapter_from_metadata(&resource.metadata);
+            let adapter = self.get_require_adapter_from_metadata(&resource.metadata)?;
             let Some(dsc_resource) = discovery.find_resource(&DiscoveryFilter::new(&resource.resource_type, resource.api_version.as_deref(), adapter.as_deref())) else {
                 return Err(DscError::ResourceNotFound(resource.resource_type.clone(), resource.api_version.as_deref().unwrap_or("").to_string()));
             };
@@ -997,7 +1000,7 @@ impl Configurator {
         let mut discovery_filter: Vec<DiscoveryFilter> = Vec::new();
         let config_copy = config.clone();
         for resource in config_copy.resources {
-            let adapter = get_require_adapter_from_metadata(&resource.metadata);
+            let adapter = self.get_require_adapter_from_metadata(&resource.metadata)?;
             let filter = DiscoveryFilter::new(&resource.resource_type, resource.api_version.as_deref(), adapter.as_deref());
             if !discovery_filter.contains(&filter) {
                 discovery_filter.push(filter);

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

@@ -5,6 +5,7 @@ pub mod command_discovery;
 pub mod discovery_trait;
 
 use crate::discovery::discovery_trait::{DiscoveryKind, ResourceDiscovery, DiscoveryFilter};
+use crate::dscresources::resource_manifest::Kind;
 use crate::extensions::dscextension::{Capability, DscExtension};
 use crate::{dscresources::dscresource::DscResource, progress::ProgressFormat};
 use core::result::Result::Ok;
@@ -86,6 +87,18 @@ impl Discovery {
             .collect()
     }
 
+    pub fn find_adapter(&mut self, adapter: &str) -> Option<&DscResource> {
+        if self.resources.is_empty() {
+            self.find_resources(&[DiscoveryFilter::new(adapter, None, None)], ProgressFormat::None);
+        }
+        for resource in &self.resources {
+            if resource.0.eq_ignore_ascii_case(adapter) && resource.1.first().unwrap().kind == Kind::Adapter {
+                return resource.1.first();
+            }
+        }
+        None
+    }
+
     #[must_use]
     pub fn find_resource(&mut self, filter: &DiscoveryFilter) -> Option<&DscResource> {
         if self.resources.is_empty() {