Merge branch 'main' into fix/more-analyzer-rules

dsccommunity · Jun 14, 2022 · 157cc20 · 157cc20
2 parents 2a2b3f2 + 344ac44
commit 157cc20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -193,6 +193,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     that was not available.
   - The loop that evaluates what features are installed did an unnecessary
     step for each iteration. A line of code was moved outside of the loop.
+  - The `SourcePath` parameter is now mandatory for all `*-TargetResource`
+    ([issue #1755](https://github.com/dsccommunity/SqlServerDsc/issues/1755)).
 
 ## [15.2.0] - 2021-09-01
 

diff --git a/source/DSCResources/DSC_SqlSetup/DSC_SqlSetup.psm1 b/source/DSCResources/DSC_SqlSetup/DSC_SqlSetup.psm1
@@ -58,7 +58,7 @@ function Get-TargetResource
         [System.String]
         $Action = 'Install',
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [System.String]
         $SourcePath,
 
@@ -655,7 +655,7 @@ function Set-TargetResource
         [System.String]
         $Action = 'Install',
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [System.String]
         $SourcePath,
 
@@ -1867,7 +1867,7 @@ function Test-TargetResource
         [System.String]
         $Action = 'Install',
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [System.String]
         $SourcePath,
 

diff --git a/source/DSCResources/DSC_SqlSetup/DSC_SqlSetup.schema.mof b/source/DSCResources/DSC_SqlSetup/DSC_SqlSetup.schema.mof
@@ -2,7 +2,7 @@
 class DSC_SqlSetup : OMI_BaseResource
 {
     [Write, Description("The action to be performed. Default value is `'Install'`. **NOTE: AddNode is not currently functional.**"), ValueMap{"Install","Upgrade","InstallFailoverCluster","AddNode","PrepareFailoverCluster","CompleteFailoverCluster"}, Values{"Install","Upgrade","InstallFailoverCluster","AddNode","PrepareFailoverCluster","CompleteFailoverCluster"}] String Action;
-    [Write, Description("The path to the root of the source files for installation. I.e and UNC path to a shared resource. Environment variables can be used in the path.")] String SourcePath;
+    [Required, Description("The path to the root of the source files for installation. I.e and UNC path to a shared resource. Environment variables can be used in the path.")] String SourcePath;
     [Write, EmbeddedInstance("MSFT_Credential"), Description("Credentials used to access the path set in the parameter **SourcePath**. See section [Considerations](#considerations) regarding the parameter **SourceCredential**.")] String SourceCredential;
     [Write, Description("Suppresses reboot.")] Boolean SuppressReboot;
     [Write, Description("Forces reboot.")] Boolean ForceReboot;