add test, fix clippy

Author: SteveL-MSFT

dsc/tests/dsc_variables.tests.ps1

@@ -0,0 +1,46 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Configruation variables tests' {
+    It 'Variables example config works' {
+        $configFile = "$PSSCriptRoot/../examples/variables.dsc.yaml"
+        $out = dsc config get -p $configFile | ConvertFrom-Json
+        $LASTEXITCODE | Should -Be 0
+        $out.results[0].result.actualState.output | Should -BeExactly 'myOutput is: Hello world!, myObject is: baz'
+    }
+
+    It 'Duplicated variable takes last value' {
+        $configYaml = @'
+$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.json
+variables:
+  myVariable: foo
+  myVariable: bar
+resources:
+- name: test
+  type: Test/Echo
+  properties:
+    output: "[variables('myVariable')]"
+'@
+        $out = dsc config get -d $configYaml | ConvertFrom-Json
+        Write-Verbose -Verbose $out
+        $LASTEXITCODE | Should -Be 0
+        $out.results[0].result.actualState.output | Should -Be 'bar'
+    }
+
+    It 'Missing variable returns error' {
+        $configYaml = @'
+$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.json
+variables:
+  hello: world
+resources:
+- name: test
+  type: Test/Echo
+  properties:
+    output: "[variables('myVariable')]"
+'@
+        $out = dsc config get -d $configYaml 2>&1 | Out-String
+        Write-Verbose -Verbose $out
+        $LASTEXITCODE | Should -Be 2
+        $out | Should -BeLike "*Variable 'myVariable' does not exist or has not been initialized yet*"
+    }
+}

dsc_lib/src/configure/config_doc.rs

@@ -4,7 +4,7 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
-use std::collections::HashMap;
+use std::{collections::HashMap, hash::Hash};
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
 pub enum ContextKind {

dsc_lib/src/configure/mod.rs

@@ -519,7 +519,7 @@ impl Configurator {
                 } else {
                     default_value.clone()
                 };
-                Configurator::validate_parameter_type(&name, &value, &parameter.parameter_type)?;
+                Configurator::validate_parameter_type(name, &value, &parameter.parameter_type)?;
                 self.context.parameters.insert(name.clone(), (value, parameter.parameter_type.clone()));
             }
         }
@@ -569,28 +569,28 @@ impl Configurator {
         Ok(())
     }
 
-pub fn set_variables(&mut self, config: &Configuration) -> Result<(), DscError> {
-    let Some(variables) = &config.variables else {
-        debug!("No variables defined in configuration");
-        return Ok(());
-    };
-
-    for (name, value) in variables {
-        let new_value = if let Some(string) = value.as_str() {
-            self.statement_parser.parse_and_execute(string, &self.context)?
-        }
-        else {
-            value.clone()
+    fn set_variables(&mut self, config: &Configuration) -> Result<(), DscError> {
+        let Some(variables) = &config.variables else {
+            debug!("No variables defined in configuration");
+            return Ok(());
         };
-        info!("Set variable '{name}' to '{new_value}'");
-        if self.context.variables.contains_key(name) {
-            return Err(DscError::Validation(format!("Variable '{name}' defined mnore than once")));
-        }
 
-        self.context.variables.insert(name.to_string(), new_value);
+        for (name, value) in variables {
+            let new_value = if let Some(string) = value.as_str() {
+                self.statement_parser.parse_and_execute(string, &self.context)?
+            }
+            else {
+                value.clone()
+            };
+            info!("Set variable '{name}' to '{new_value}'");
+            if self.context.variables.contains_key(name) {
+                return Err(DscError::Validation(format!("Variable '{name}' defined mnore than once")));
+            }
+
+            self.context.variables.insert(name.to_string(), new_value);
+        }
+        Ok(())
     }
-    Ok(())
-}
 
     fn get_result_metadata(&self, operation: Operation) -> Metadata {
         let end_datetime = chrono::Local::now();