Merge branch 'add-skip-function' of https://github.com/Gijsreyn/operation-methods into add-skip-function

Author: Gijsreyn

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(())
     }
 

schemas/2024/04/bundled/config/document.json

@@ -395,4 +395,4 @@
       ]
     }
   }
-}
+}

schemas/2024/04/bundled/config/document.vscode.json

@@ -616,4 +616,4 @@
       }
     }
   }
-}
+}

schemas/2024/04/config/document.metadata.json

@@ -19,4 +19,4 @@
       }
     }
   }
-}
+}

schemas/src/config/document.metadata.yaml

@@ -32,13 +32,13 @@ properties:
     properties:
       securityContext:
         $ref: /<PREFIX>/<VERSION>/metadata/Microsoft.DSC/securityContext.yaml
-        default: Current
+        default: current
         description: >-
           This property defines the security context a configuration requires. If you invoke a DSC
           operation against the configuration document in a security context that conflicts with
           this metadata, DSC raises an error when it validates the configuration document.
 
-          The default security context is `Current`.
+          The default security context is `current`.
         markdownDescription: |
           ***
           [_Online Documentation_][01]
@@ -48,11 +48,11 @@ properties:
           operation against the configuration document in a security context that conflicts with
           this metadata, DSC raises an error when it validates the configuration document.
 
-          The default security context is `Current`.
+          The default security context is `current`.
 
           [01]: <DOCS_BASE_URL>/reference/schemas/config/metadata?<DOCS_VERSION_PIN>#microsoft.dsc
         markdownEnumDescriptions:
-          - | # Current
+          - | # current
             <!-- force a line break -->
 
             > ### Current security context

schemas/v3.0.0/bundled/config/document.json

@@ -339,8 +339,8 @@
           "properties": {
             "securityContext": {
               "$ref": "/PowerShell/DSC/main/schemas/v3.0.0/metadata/Microsoft.DSC/securityContext.json",
-              "default": "Current",
-              "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `Current`."
+              "default": "current",
+              "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `current`."
             }
           }
         }

schemas/v3.0.0/bundled/config/document.vscode.json

@@ -503,9 +503,9 @@
                       "properties": {
                         "securityContext": {
                           "$ref": "#/$defs/PowerShell/DSC/main/schemas/v3.0.0/metadata/Microsoft.DSC/securityContext.json",
-                          "default": "Current",
-                          "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `Current`.",
-                          "markdownDescription": "***\n[_Online Documentation_][01]\n***\n\nThis property defines the security context a configuration requires. If you invoke a DSC\noperation against the configuration document in a security context that conflicts with\nthis metadata, DSC raises an error when it validates the configuration document.\n\nThe default security context is `Current`.\n\n[01]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/metadata?view=dsc-3.0&preserve-view=true#microsoft.dsc\n",
+                          "default": "current",
+                          "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `current`.",
+                          "markdownDescription": "***\n[_Online Documentation_][01]\n***\n\nThis property defines the security context a configuration requires. If you invoke a DSC\noperation against the configuration document in a security context that conflicts with\nthis metadata, DSC raises an error when it validates the configuration document.\n\nThe default security context is `current`.\n\n[01]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/metadata?view=dsc-3.0&preserve-view=true#microsoft.dsc\n",
                           "markdownEnumDescriptions": [
                             "<!-- force a line break -->\n\n> ### Current security context\n>\n> Indicates that the configuration document is usable under any security context. You\n> can invoke DSC operations against the document when elevated as root or an\n> administrator and as a normal user or account.\n",
                             "<!-- force a line break -->\n\n> ### Elevated security context\n>\n> Indicates that the configuration document is usable only in an elevated security\n> context. You can invoke DSC operations against the document when elevated as root or\n> an administrator. When you invoke DSC operations against the document as a\n> non-elevated user or account, DSC raises an error when it validates the configuration\n> document.\n",

schemas/v3.0.0/config/document.metadata.json

@@ -13,8 +13,8 @@
       "properties": {
         "securityContext": {
           "$ref": "/PowerShell/DSC/main/schemas/v3.0.0/metadata/Microsoft.DSC/securityContext.json",
-          "default": "Current",
-          "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `Current`."
+          "default": "current",
+          "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `current`."
         }
       }
     }

schemas/v3.0.1/bundled/config/document.json

@@ -345,8 +345,8 @@
           "properties": {
             "securityContext": {
               "$ref": "/PowerShell/DSC/main/schemas/v3.0.1/metadata/Microsoft.DSC/securityContext.json",
-              "default": "Current",
-              "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `Current`."
+              "default": "current",
+              "description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `current`."
             }
           }
         }