fix tests and copilot feedback

Author: SteveL-MSFT

dsc/src/util.rs

@@ -498,10 +498,9 @@ pub fn get_input(input: Option<&String>, file: Option<&String>, parameters_from_
             // see if an extension should handle this file
             let mut discovery = Discovery::new();
             for extension in discovery.get_extensions(&Capability::Import) {
-                let Ok(content) = extension.import(path) else {
-                    continue;
-                };
-                return content;
+                if let Ok(content) = extension.import(path) {
+                    return content;
+                }
             }
             match std::fs::read_to_string(path) {
                 Ok(input) => {

dsc/tests/dsc_extension_discover.tests.ps1

@@ -15,11 +15,15 @@ Describe 'Discover extension tests' {
     It 'Discover extensions' {
         $out = dsc extension list | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
-        $out.Count | Should -Be 1
-        $out.type | Should -BeExactly 'Test/Discover'
-        $out.version | Should -BeExactly '0.1.0'
-        $out.capabilities | Should -BeExactly @('discover')
-        $out.manifest | Should -Not -BeNullOrEmpty
+        $out.Count | Should -Be 2 -Because ($out | Out-String)
+        $out[0].type | Should -Be 'Microsoft.DSC.Extension/Bicep'
+        $out[0].version | Should -Be '0.1.0'
+        $out[0].capabilities | Should -BeExactly @('import')
+        $out[0].manifest | Should -Not -BeNullOrEmpty
+        $out[1].type | Should -BeExactly 'Test/Discover'
+        $out[1].version | Should -BeExactly '0.1.0'
+        $out[1].capabilities | Should -BeExactly @('discover')
+        $out[1].manifest | Should -Not -BeNullOrEmpty
     }
 
     It 'Filtering works for extension discovered resources' {

dsc_lib/locales/en-us.toml

@@ -186,6 +186,8 @@ extensionReturnedSecret = "Extension '%{extension}' returned secret"
 extensionReturnedNoSecret = "Extension '%{extension}' did not return a secret"
 secretNoResults = "Extension '%{extension}' returned no output"
 importingFile = "Importing file '%{file}' with extension '%{extension}'"
+importNotSupported = "Import is not supported by extension '%{extension}' for file '%{file}'"
+importNoResults = "Extension '%{extension}' returned no results for import"
 
 [extensions.extension_manifest]
 extensionManifestSchemaTitle = "Extension manifest schema URI"
@@ -456,3 +458,4 @@ foundSetting = "Found setting '%{name}' in %{path}"
 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}'"

dsc_lib/src/extensions/dscextension.rs

@@ -152,7 +152,8 @@ impl DscExtension {
     pub fn import(&self, file: &str) -> Result<String, DscError> {
         if self.capabilities.contains(&Capability::Import) {
             let file_path = Path::new(file);
-            if self.import_extensions.as_ref().is_some_and(|exts| exts.contains(&file_path.extension().and_then(|s| s.to_str()).unwrap_or_default().to_string())) {
+            let file_extension = file_path.extension().and_then(|s| s.to_str()).unwrap_or_default().to_string();
+            if self.import_extensions.as_ref().is_some_and(|exts| exts.contains(&file_extension)) {
                 debug!("{}", t!("extensions.dscextension.importingFile", file = file, extension = self.type_name));
             } else {
                 debug!("{}", t!("extensions.dscextension.importNotSupported", file = file, extension = self.type_name));
@@ -267,7 +268,7 @@ fn process_import_args(args: Option<&Vec<ImportArgKind>>, file: &str) -> Result<
     // make path absolute
     let path = Path::new(file);
     let Ok(full_path) = path.absolutize() else {
-        return Err(DscError::Extension(t!("util.failedToAbsolutizePath").to_string()));
+        return Err(DscError::Extension(t!("util.failedToAbsolutizePath", path = path : {:?}).to_string()));
     };
 
     let mut processed_args = Vec::<String>::new();

extensions/bicep/bicep.tests.ps1

@@ -17,4 +17,19 @@ Describe 'Bicep extension tests' -Skip:(!$foundBicep) {
         $out.results[0].result.actualState.output | Should -BeExactly 'Hello, world!'
         (Get-Content -Path $TestDrive/error.log -Raw) | Should -Match "Importing file '$bicepFile' with extension 'Microsoft.DSC.Extension/Bicep'"
     }
+
+    It 'Invalid bicep file returns error' {
+        $bicepFile = "$TestDrive/invalid.bicep"
+        Set-Content -Path $bicepFile -Value @"
+        myresource invalid 'Microsoft.DSC.Extension/Bicep:1.0' = {
+            name: 'invalid'
+            properties: {
+                output: 'This is invalid'
+"@
+        $out = dsc -l trace config get -f $bicepFile 2>$TestDrive/error.log | ConvertFrom-Json
+        $LASTEXITCODE | Should -Be 4 -Because (Get-Content -Path $TestDrive/error.log -Raw | Out-String)
+        $content = (Get-Content -Path $TestDrive/error.log -Raw)
+        $content | Should -Match "Importing file '$bicepFile' with extension 'Microsoft.DSC.Extension/Bicep'"
+        $content | Should -Match "BCP279: Expected a type at this location"
+    }
 }