Updated 'Set-TargetResource' in 'SqlLogin' to update 'PasswordPolicyE…

…nforced' and 'PasswordExpirationEnabled' as a single update.
dsccommunity · Jan 11, 2021 · d0d0120 · d0d0120
1 parent d2db2e0
commit d0d0120
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/source/DSCResources/DSC_SqlLogin/DSC_SqlLogin.psm1 b/source/DSCResources/DSC_SqlLogin/DSC_SqlLogin.psm1
@@ -201,25 +201,20 @@ function Set-TargetResource
                         New-InvalidOperationException -Message $errorMessage
                     }
 
-                    # This must always be updated before `PasswordExpirationEnabled`
-                    if ( $login.PasswordPolicyEnforced -ne $LoginPasswordPolicyEnforced )
+                    # `PasswordPolicyEnforced and `PasswordExpirationEnabled` must be updated together (if one or both are not in the desired state)
+                    if ( $login.PasswordPolicyEnforced -ne $LoginPasswordPolicyEnforced -or
+                         $login.PasswordExpirationEnabled -ne $LoginPasswordExpirationEnabled )
                     {
                         Write-Verbose -Message (
                             $script:localizedData.SetPasswordPolicyEnforced -f $LoginPasswordPolicyEnforced, $Name, $ServerName, $InstanceName
                         )
-
-                        $login.PasswordPolicyEnforced = $LoginPasswordPolicyEnforced
-                        Update-SQLServerLogin -Login $login
-                    }
-
-                    # This must always be updated after `PasswordPolicyEnforced`
-                    if ( $login.PasswordExpirationEnabled -ne $LoginPasswordExpirationEnabled )
-                    {
                         Write-Verbose -Message (
                             $script:localizedData.SetPasswordExpirationEnabled -f $LoginPasswordExpirationEnabled, $Name, $ServerName, $InstanceName
                         )
 
+                        $login.PasswordPolicyEnforced = $LoginPasswordPolicyEnforced
                         $login.PasswordExpirationEnabled = $LoginPasswordExpirationEnabled
+
                         Update-SQLServerLogin -Login $login
                     }