Merge pull request #844 from SteveL-MSFT/dupe-trace

Fix error message when duplicate resource names are detected

Author: SteveL-MSFT

dsc/tests/dsc_config_test.tests.ps1

@@ -61,4 +61,28 @@ Describe 'dsc config test tests' {
             $out.results[0].result.differingProperties | Should -Be @('valueOne', 'valueTwo')
         }
     }
+
+    It 'Duplicate resource names are not allowed' {
+        $configYaml = @'
+  $schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+  resources:
+    - name: MyTest
+      type: Microsoft.DSC.Debug/Echo
+      properties:
+        output: 1
+    - name: Test2
+      type: Microsoft.DSC.Debug/Echo
+      properties:
+        output: 2
+    - name: MyTest
+      type: Microsoft.DSC.Debug/Echo
+      properties:
+        output: 2
+'@
+
+        $null = dsc config test -i $configYaml 2> "$TestDrive/trace.log"
+        $LASTEXITCODE | Should -Be 2
+        $log = Get-Content "$TestDrive/trace.log" -Raw
+        $log | Should -Match ".*Resource named 'MyTest' is specified more than once.*" -Because ($log | Out-String)
+    }
 }

dsc_lib/src/configure/depends_on.rs

@@ -29,7 +29,7 @@ pub fn get_resource_invocation_order(config: &Configuration, parser: &mut Statem
     for resource in &config.resources {
         // validate that the resource isn't specified more than once in the config
         if config.resources.iter().filter(|r| r.name == resource.name && r.resource_type == resource.resource_type).count() > 1 {
-            return Err(DscError::Validation(t!("configure.dependsOn.duplicateResource", resource_name = resource.name).to_string()));
+            return Err(DscError::Validation(t!("configure.dependsOn.duplicateResource", name = resource.name).to_string()));
         }
 
         let mut dependency_already_in_order = true;