Merge pull request #1079 from Gijsreyn/allow-parameters-secret

Allow parameters to use secret() function

Author: SteveL-MSFT

dsc/tests/dsc_extension_secret.tests.ps1

@@ -131,4 +131,40 @@ Describe 'Tests for the secret() function and extensions' {
         $errorMessage = Get-Content -Raw -Path $TestDrive/error.log
         $errorMessage | Should -Match "Extension 'Test/Secret2' returned multiple lines which is not supported for secrets"
     }
+
+    It 'Allows to pass in secret() through parameters' {
+      $configYaml = @'
+          $schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+          parameters:
+            myString:
+              type: secureString
+              defaultValue: "[secret('MySecret')]"
+          resources:
+          - name: Database Connection
+            type: Microsoft.DSC.Debug/Echo
+            properties:
+              output: "[parameters('myString')]"
+'@
+      $out = dsc -l trace config get -i $configYaml 2> $TestDrive/error.log | ConvertFrom-Json
+      $LASTEXITCODE | Should -Be 0
+      $out.results.Count | Should -Be 1
+      $out.results[0].result.actualState.Output | Should -BeExactly 'Hello'
+    }
+
+    It 'Allows to pass in secret() through variables' {
+      $configYaml = @'
+          $schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+          variables:
+            myString: "[secret('MySecret')]"
+          resources:
+          - name: Database Connection
+            type: Microsoft.DSC.Debug/Echo
+            properties:
+              output: "[variables('myString')]"
+'@
+      $out = dsc -l trace config get -i $configYaml 2> $TestDrive/error.log | ConvertFrom-Json
+      $LASTEXITCODE | Should -Be 0
+      $out.results.Count | Should -Be 1
+      $out.results[0].result.actualState.Output | Should -BeExactly 'Hello'
+    }
 }

dsc_lib/src/configure/mod.rs

@@ -699,9 +699,10 @@ impl Configurator {
     /// This function will return an error if the parameters are invalid.
     pub fn set_context(&mut self, parameters_input: Option<&Value>) -> Result<(), DscError> {
         let config = serde_json::from_str::<Configuration>(self.json.as_str())?;
+
+        self.context.extensions = self.discovery.extensions.values().cloned().collect();
         self.set_parameters(parameters_input, &config)?;
         self.set_variables(&config)?;
-        self.context.extensions = self.discovery.extensions.values().cloned().collect();
         Ok(())
     }