diff --git a/CHANGELOG.md b/CHANGELOG.md index b0749b6da..4258a7bd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,9 @@ - Resources that did not have a description in the README.md now has one. - Resources that missed links to the examples in the README.md now has those links. + - Style changes in all examples, removing type [System.Management.Automation.Credential()] + from credential parameters ([issue #1003](https://github.com/PowerShell/SqlServerDsc/issues/1003)), + and renamed the credential parameter so it is not using abbreviation. - Changes to SqlAlias - Fixed issue where exception was thrown if reg keys did not exist ([issue #949](https://github.com/PowerShell/SqlServerDsc/issues/949)). diff --git a/Examples/Resources/SqlAG/1-CreateAvailabilityGroup.ps1 b/Examples/Resources/SqlAG/1-CreateAvailabilityGroup.ps1 index 8fc545904..5cdd6fe19 100644 --- a/Examples/Resources/SqlAG/1-CreateAvailabilityGroup.ps1 +++ b/Examples/Resources/SqlAG/1-CreateAvailabilityGroup.ps1 @@ -32,8 +32,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -47,7 +47,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = $Node.NodeName InstanceName = $Node.InstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Add the required permissions to the cluster service login @@ -59,7 +59,7 @@ Configuration Example InstanceName = $Node.InstanceName Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Create a DatabaseMirroring endpoint @@ -70,7 +70,7 @@ Configuration Example Port = 5022 ServerName = $Node.NodeName InstanceName = $Node.InstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } if ( $Node.Role -eq 'PrimaryReplica' ) @@ -83,7 +83,7 @@ Configuration Example InstanceName = $Node.InstanceName ServerName = $Node.NodeName DependsOn = '[SqlServerEndpoint]HADREndpoint', '[SqlServerPermission]AddNTServiceClusSvcPermissions' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAG/2-RemoveAvailabilityGroup.ps1 b/Examples/Resources/SqlAG/2-RemoveAvailabilityGroup.ps1 index 1a865e5f7..6d0e326ce 100644 --- a/Examples/Resources/SqlAG/2-RemoveAvailabilityGroup.ps1 +++ b/Examples/Resources/SqlAG/2-RemoveAvailabilityGroup.ps1 @@ -32,8 +32,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -48,7 +48,7 @@ Configuration Example Name = 'TestAG' InstanceName = $Node.InstanceName ServerName = $Node.NodeName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAG/3-CreateAvailabilityGroupDetailed.ps1 b/Examples/Resources/SqlAG/3-CreateAvailabilityGroupDetailed.ps1 index bb48fe131..8672f42ae 100644 --- a/Examples/Resources/SqlAG/3-CreateAvailabilityGroupDetailed.ps1 +++ b/Examples/Resources/SqlAG/3-CreateAvailabilityGroupDetailed.ps1 @@ -50,8 +50,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -65,7 +65,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = $Node.NodeName InstanceName = $Node.InstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Add the required permissions to the cluster service login @@ -77,7 +77,7 @@ Configuration Example InstanceName = $Node.InstanceName Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Create a DatabaseMirroring endpoint @@ -88,7 +88,7 @@ Configuration Example Port = 5022 ServerName = $Node.NodeName InstanceName = $Node.InstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } if ( $Node.Role -eq 'PrimaryReplica' ) @@ -116,7 +116,7 @@ Configuration Example DtcSupportEnabled = $Node.DtcSupportEnabled DependsOn = '[SqlServerEndpoint]HADREndpoint', '[SqlServerPermission]AddNTServiceClusSvcPermissions' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGDatabase/1-AddDatabaseToAvailabilityGroup.ps1 b/Examples/Resources/SqlAGDatabase/1-AddDatabaseToAvailabilityGroup.ps1 index 94f850e24..1e780fed6 100644 --- a/Examples/Resources/SqlAGDatabase/1-AddDatabaseToAvailabilityGroup.ps1 +++ b/Examples/Resources/SqlAGDatabase/1-AddDatabaseToAvailabilityGroup.ps1 @@ -42,8 +42,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -57,7 +57,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Add the required permissions to the cluster service login @@ -69,7 +69,7 @@ Configuration Example InstanceName = $Node.SqlInstanceName Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Create a DatabaseMirroring endpoint @@ -80,7 +80,7 @@ Configuration Example Port = 5022 ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } if ( $Node.Role -eq 'PrimaryReplica' ) @@ -93,7 +93,7 @@ Configuration Example InstanceName = $Node.SQLInstanceName ServerName = $Node.NodeName DependsOn = '[SqlServerEndpoint]HADREndpoint', '[SqlServerPermission]AddNTServiceClusSvcPermissions' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } @@ -123,7 +123,7 @@ Configuration Example ServerName = $Node.NodeName Ensure = 'Present' ProcessOnlyOnActiveNode = $true - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGDatabase/2-RemoveDatabaseFromAvailabilityGroup.ps1 b/Examples/Resources/SqlAGDatabase/2-RemoveDatabaseFromAvailabilityGroup.ps1 index aafde2253..665b15272 100644 --- a/Examples/Resources/SqlAGDatabase/2-RemoveDatabaseFromAvailabilityGroup.ps1 +++ b/Examples/Resources/SqlAGDatabase/2-RemoveDatabaseFromAvailabilityGroup.ps1 @@ -38,8 +38,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -53,7 +53,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Add the required permissions to the cluster service login @@ -65,7 +65,7 @@ Configuration Example InstanceName = $Node.SqlInstanceName Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Create a DatabaseMirroring endpoint @@ -76,7 +76,7 @@ Configuration Example Port = 5022 ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } if ( $Node.Role -eq 'PrimaryReplica' ) @@ -89,7 +89,7 @@ Configuration Example InstanceName = $Node.SQLInstanceName ServerName = $Node.NodeName DependsOn = '[SqlServerEndpoint]HADREndpoint', '[SqlServerPermission]AddNTServiceClusSvcPermissions' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } @@ -118,7 +118,7 @@ Configuration Example InstanceName = $Node.SQLInstanceName ServerName = $Node.NodeName Ensure = 'Absent' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGDatabase/3-MatchDefinedDatabaseInAvailabilityGroup.ps1 b/Examples/Resources/SqlAGDatabase/3-MatchDefinedDatabaseInAvailabilityGroup.ps1 index 1b5b59d27..a2d8dcaf2 100644 --- a/Examples/Resources/SqlAGDatabase/3-MatchDefinedDatabaseInAvailabilityGroup.ps1 +++ b/Examples/Resources/SqlAGDatabase/3-MatchDefinedDatabaseInAvailabilityGroup.ps1 @@ -38,8 +38,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -53,7 +53,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Add the required permissions to the cluster service login @@ -65,7 +65,7 @@ Configuration Example InstanceName = $Node.SqlInstanceName Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Create a DatabaseMirroring endpoint @@ -76,7 +76,7 @@ Configuration Example Port = 5022 ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } if ( $Node.Role -eq 'PrimaryReplica' ) @@ -89,7 +89,7 @@ Configuration Example InstanceName = $Node.SQLInstanceName ServerName = $Node.NodeName DependsOn = '[SqlServerEndpoint]HADREndpoint', '[SqlServerPermission]AddNTServiceClusSvcPermissions' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } @@ -119,7 +119,7 @@ Configuration Example ServerName = $Node.NodeName Ensure = 'Present' Force = $true - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGListener/1-AddAvailabilityGroupListenerWithSameNameAsVCO.ps1 b/Examples/Resources/SqlAGListener/1-AddAvailabilityGroupListenerWithSameNameAsVCO.ps1 index 40383be59..10f070892 100644 --- a/Examples/Resources/SqlAGListener/1-AddAvailabilityGroupListenerWithSameNameAsVCO.ps1 +++ b/Examples/Resources/SqlAGListener/1-AddAvailabilityGroupListenerWithSameNameAsVCO.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -26,7 +25,7 @@ Configuration Example IpAddress = '192.168.0.73/255.255.255.0' Port = 5301 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGListener/2-AddAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 b/Examples/Resources/SqlAGListener/2-AddAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 index 7e09db5e0..0c8326e4b 100644 --- a/Examples/Resources/SqlAGListener/2-AddAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 +++ b/Examples/Resources/SqlAGListener/2-AddAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -26,7 +25,7 @@ Configuration Example IpAddress = '192.168.0.74/255.255.255.0' Port = 5302 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGListener/3-RemoveAvailabilityGroupListenerWithSameNameAsVCO.ps1 b/Examples/Resources/SqlAGListener/3-RemoveAvailabilityGroupListenerWithSameNameAsVCO.ps1 index a1f54f65b..87683db07 100644 --- a/Examples/Resources/SqlAGListener/3-RemoveAvailabilityGroupListenerWithSameNameAsVCO.ps1 +++ b/Examples/Resources/SqlAGListener/3-RemoveAvailabilityGroupListenerWithSameNameAsVCO.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example AvailabilityGroup = 'AvailabilityGroup-01' Name = 'AG-01' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGListener/4-RemoveAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 b/Examples/Resources/SqlAGListener/4-RemoveAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 index aeba220af..b1c822454 100644 --- a/Examples/Resources/SqlAGListener/4-RemoveAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 +++ b/Examples/Resources/SqlAGListener/4-RemoveAvailabilityGroupListenerWithDifferentNameAsVCO.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example AvailabilityGroup = 'AG-01' Name = "AG-01" - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGListener/5-AddAvailabilityGroupListenerUsingDHCPWithDefaultServerSubnet.ps1 b/Examples/Resources/SqlAGListener/5-AddAvailabilityGroupListenerUsingDHCPWithDefaultServerSubnet.ps1 index ea373748b..59de8667f 100644 --- a/Examples/Resources/SqlAGListener/5-AddAvailabilityGroupListenerUsingDHCPWithDefaultServerSubnet.ps1 +++ b/Examples/Resources/SqlAGListener/5-AddAvailabilityGroupListenerUsingDHCPWithDefaultServerSubnet.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -26,7 +25,7 @@ Configuration Example DHCP = $true # Also not specifying parameter DHCP will default to using DHCP with the default server subnet. Port = 5301 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGListener/6-AddAvailabilityGroupListenerUsingDHCPWithSpecificSubnet.ps1 b/Examples/Resources/SqlAGListener/6-AddAvailabilityGroupListenerUsingDHCPWithSpecificSubnet.ps1 index 34102d7e3..3cb8ff512 100644 --- a/Examples/Resources/SqlAGListener/6-AddAvailabilityGroupListenerUsingDHCPWithSpecificSubnet.ps1 +++ b/Examples/Resources/SqlAGListener/6-AddAvailabilityGroupListenerUsingDHCPWithSpecificSubnet.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -27,7 +26,7 @@ Configuration Example IpAddress = '192.168.0.1/255.255.252.0' Port = 5301 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAGReplica/1-CreateAvailabilityGroupReplica.ps1 b/Examples/Resources/SqlAGReplica/1-CreateAvailabilityGroupReplica.ps1 index 931c7566a..e36fca4d2 100644 --- a/Examples/Resources/SqlAGReplica/1-CreateAvailabilityGroupReplica.ps1 +++ b/Examples/Resources/SqlAGReplica/1-CreateAvailabilityGroupReplica.ps1 @@ -44,8 +44,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -59,7 +59,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Add the required permissions to the cluster service login @@ -71,7 +71,7 @@ Configuration Example InstanceName = $Node.SqlInstanceName Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Create a DatabaseMirroring endpoint @@ -82,7 +82,7 @@ Configuration Example Port = 5022 ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } if ( $Node.Role -eq 'PrimaryReplica' ) @@ -95,7 +95,7 @@ Configuration Example InstanceName = $Node.SQLInstanceName ServerName = $Node.NodeName DependsOn = '[SqlServerEndpoint]HADREndpoint', '[SqlServerPermission]AddNTServiceClusSvcPermissions' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } diff --git a/Examples/Resources/SqlAGReplica/2-RemoveAvailabilityGroupReplica.ps1 b/Examples/Resources/SqlAGReplica/2-RemoveAvailabilityGroupReplica.ps1 index f8da07c7b..f9e485e12 100644 --- a/Examples/Resources/SqlAGReplica/2-RemoveAvailabilityGroupReplica.ps1 +++ b/Examples/Resources/SqlAGReplica/2-RemoveAvailabilityGroupReplica.ps1 @@ -38,8 +38,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -53,7 +53,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Add the required permissions to the cluster service login @@ -65,7 +65,7 @@ Configuration Example InstanceName = $Node.SqlInstanceName Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Create a DatabaseMirroring endpoint @@ -76,7 +76,7 @@ Configuration Example Port = 5022 ServerName = $Node.NodeName InstanceName = $Node.SQLInstanceName - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } if ( $Node.Role -eq 'PrimaryReplica' ) @@ -89,7 +89,7 @@ Configuration Example InstanceName = $Node.SQLInstanceName ServerName = $Node.NodeName DependsOn = '[SqlServerEndpoint]HADREndpoint', '[SqlServerPermission]AddNTServiceClusSvcPermissions' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } diff --git a/Examples/Resources/SqlAlias/1-AddSqlAlias.ps1 b/Examples/Resources/SqlAlias/1-AddSqlAlias.ps1 index fc1b270bf..0992fa9ce 100644 --- a/Examples/Resources/SqlAlias/1-AddSqlAlias.ps1 +++ b/Examples/Resources/SqlAlias/1-AddSqlAlias.ps1 @@ -8,8 +8,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +22,7 @@ Configuration Example ServerName = 'sqltest.company.local\DSC' Protocol = 'TCP' TcpPort = 1777 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlAlias Add_SqlAlias_TCPUseDynamicTcpPort @@ -32,7 +32,7 @@ Configuration Example ServerName = 'sqltest.company.local\DSC' Protocol = 'TCP' UseDynamicTcpPort = $true - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlAlias Add_SqlAlias_NP @@ -41,7 +41,7 @@ Configuration Example Name = 'SQLDSC-NP' ServerName = '\\sqlnode\PIPE\sql\query' Protocol = 'NP' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAlias/2-RemoveSqlAlias.ps1 b/Examples/Resources/SqlAlias/2-RemoveSqlAlias.ps1 index ed9de5eea..30a93b25e 100644 --- a/Examples/Resources/SqlAlias/2-RemoveSqlAlias.ps1 +++ b/Examples/Resources/SqlAlias/2-RemoveSqlAlias.ps1 @@ -8,8 +8,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +22,7 @@ Configuration Example ServerName = 'sqltest.company.local\DSC' Protocol = 'TCP' TcpPort = 1777 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlAlias Remove_SqlAlias_NP @@ -31,7 +31,7 @@ Configuration Example Name = 'SQLDSC-NP' ServerName = '\\sqlnode\PIPE\sql\query' Protocol = 'NP' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAlwaysOnService/1-EnableAlwaysOn.ps1 b/Examples/Resources/SqlAlwaysOnService/1-EnableAlwaysOn.ps1 index 2846902bf..c7d0acd83 100644 --- a/Examples/Resources/SqlAlwaysOnService/1-EnableAlwaysOn.ps1 +++ b/Examples/Resources/SqlAlwaysOnService/1-EnableAlwaysOn.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example InstanceName = 'MSSQLSERVER' RestartTimeout = 120 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlAlwaysOnService/2-DisableAlwaysOn.ps1 b/Examples/Resources/SqlAlwaysOnService/2-DisableAlwaysOn.ps1 index 311d116fb..ba8876e6d 100644 --- a/Examples/Resources/SqlAlwaysOnService/2-DisableAlwaysOn.ps1 +++ b/Examples/Resources/SqlAlwaysOnService/2-DisableAlwaysOn.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example InstanceName = 'MSSQLSERVER' RestartTimeout = 120 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabase/1-CreateDatabase.ps1 b/Examples/Resources/SqlDatabase/1-CreateDatabase.ps1 index 97dd3f43d..e3ce99289 100644 --- a/Examples/Resources/SqlDatabase/1-CreateDatabase.ps1 +++ b/Examples/Resources/SqlDatabase/1-CreateDatabase.ps1 @@ -12,8 +12,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc diff --git a/Examples/Resources/SqlDatabase/2-DeleteDatabase.ps1 b/Examples/Resources/SqlDatabase/2-DeleteDatabase.ps1 index d85ec08a1..482c454f4 100644 --- a/Examples/Resources/SqlDatabase/2-DeleteDatabase.ps1 +++ b/Examples/Resources/SqlDatabase/2-DeleteDatabase.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc diff --git a/Examples/Resources/SqlDatabaseDefaultLocation/1-SetDatabaseDefaultLocation.ps1 b/Examples/Resources/SqlDatabaseDefaultLocation/1-SetDatabaseDefaultLocation.ps1 index 3e558c06d..c97a9af9f 100644 --- a/Examples/Resources/SqlDatabaseDefaultLocation/1-SetDatabaseDefaultLocation.ps1 +++ b/Examples/Resources/SqlDatabaseDefaultLocation/1-SetDatabaseDefaultLocation.ps1 @@ -13,7 +13,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -27,7 +27,7 @@ Configuration Example ProcessOnlyOnActiveNode = $true Type = 'Data' Path = 'C:\Program Files\Microsoft SQL Server' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabaseDefaultLocation Set_SqlDatabaseDefaultDirectory_Log @@ -37,7 +37,7 @@ Configuration Example ProcessOnlyOnActiveNode = $true Type = 'Log' Path = 'C:\Program Files\Microsoft SQL Server' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabaseDefaultLocation Set_SqlDatabaseDefaultDirectory_Backup @@ -47,7 +47,7 @@ Configuration Example ProcessOnlyOnActiveNode = $true Type = 'Backup' Path = 'C:\Program Files\Microsoft SQL Server' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabaseOwner/1-SetDatabaseOwner.ps1 b/Examples/Resources/SqlDatabaseOwner/1-SetDatabaseOwner.ps1 index 3c1386778..ff3450ac3 100644 --- a/Examples/Resources/SqlDatabaseOwner/1-SetDatabaseOwner.ps1 +++ b/Examples/Resources/SqlDatabaseOwner/1-SetDatabaseOwner.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabaseOwner Set_SqlDatabaseOwner_SQLAdmin @@ -33,7 +32,7 @@ Configuration Example Database = 'AdventureWorks' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabasePermission/1-GrantDatabasePermissions.ps1 b/Examples/Resources/SqlDatabasePermission/1-GrantDatabasePermissions.ps1 index f680ab17b..218e356b1 100644 --- a/Examples/Resources/SqlDatabasePermission/1-GrantDatabasePermissions.ps1 +++ b/Examples/Resources/SqlDatabasePermission/1-GrantDatabasePermissions.ps1 @@ -8,8 +8,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +22,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerLogin Add_SqlServerLogin_SQLUser @@ -32,7 +32,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabasePermission Grant_SqlDatabasePermissions_SQLAdmin_Db01 @@ -44,7 +44,7 @@ Configuration Example Permissions = 'Connect', 'Update' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabasePermission Grant_SqlDatabasePermissions_SQLUser_Db01 @@ -56,7 +56,7 @@ Configuration Example Permissions = 'Connect', 'Update' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabasePermission Grant_SqlDatabasePermissions_SQLAdmin_Db02 @@ -68,7 +68,7 @@ Configuration Example Permissions = 'Connect', 'Update' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabasePermission/2-RevokeDatabasePermissions.ps1 b/Examples/Resources/SqlDatabasePermission/2-RevokeDatabasePermissions.ps1 index b451a5f0a..bc0d052a6 100644 --- a/Examples/Resources/SqlDatabasePermission/2-RevokeDatabasePermissions.ps1 +++ b/Examples/Resources/SqlDatabasePermission/2-RevokeDatabasePermissions.ps1 @@ -8,8 +8,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +24,7 @@ Configuration Example Permissions = 'Connect', 'Update' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabasePermission RevokeDeny_SqlDatabasePermissions_SQLAdmin @@ -36,7 +36,7 @@ Configuration Example Permissions = 'Select', 'Create Table' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabasePermission/3-DenyDatabasePermissions.ps1 b/Examples/Resources/SqlDatabasePermission/3-DenyDatabasePermissions.ps1 index e1c71c6aa..672bf4d74 100644 --- a/Examples/Resources/SqlDatabasePermission/3-DenyDatabasePermissions.ps1 +++ b/Examples/Resources/SqlDatabasePermission/3-DenyDatabasePermissions.ps1 @@ -8,8 +8,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +22,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerLogin Add_SqlServerLogin_SQLUser @@ -32,7 +32,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabasePermission Deny_SqlDatabasePermissions_SQLAdmin_Db01 @@ -44,7 +44,7 @@ Configuration Example Permissions = 'Select', 'Create Table' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabasePermission Deny_SqlDatabasePermissions_SQLUser_Db01 @@ -56,7 +56,7 @@ Configuration Example Permissions = 'Select', 'Create Table' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabasePermission Deny_SqlDatabasePermissions_SQLAdmin_Db02 @@ -68,7 +68,7 @@ Configuration Example Permissions = 'Select', 'Create Table' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabaseRecoveryModel/1-SetDatabaseRecoveryModel.ps1 b/Examples/Resources/SqlDatabaseRecoveryModel/1-SetDatabaseRecoveryModel.ps1 index 5775490d6..afc8483e5 100644 --- a/Examples/Resources/SqlDatabaseRecoveryModel/1-SetDatabaseRecoveryModel.ps1 +++ b/Examples/Resources/SqlDatabaseRecoveryModel/1-SetDatabaseRecoveryModel.ps1 @@ -10,8 +10,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example Name = 'Adventureworks' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabase Add_SqlDatabaseAdventureWorks2012 @@ -33,7 +32,7 @@ Configuration Example Name = 'AdventureWorks2012' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabaseRecoveryModel Set_SqlDatabaseRecoveryModel_Adventureworks @@ -42,7 +41,7 @@ Configuration Example RecoveryModel = 'Full' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlDatabaseRecoveryModel Set_SqlDatabaseRecoveryModel_AdventureWorks2012 @@ -51,7 +50,7 @@ Configuration Example RecoveryModel = 'Simple' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabaseRole/1-AddDatabaseRole.ps1 b/Examples/Resources/SqlDatabaseRole/1-AddDatabaseRole.ps1 index f4d1e6ba3..3e8d23d75 100644 --- a/Examples/Resources/SqlDatabaseRole/1-AddDatabaseRole.ps1 +++ b/Examples/Resources/SqlDatabaseRole/1-AddDatabaseRole.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -25,7 +24,7 @@ Configuration Example Name = 'CONTOSO\SQLAdmin' Role = 'MyRole', 'MySecondRole' Database = 'AdventureWorks' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlDatabaseRole/2-RemoveDatabaseRole.ps1 b/Examples/Resources/SqlDatabaseRole/2-RemoveDatabaseRole.ps1 index 184b76e7d..cf088c6c3 100644 --- a/Examples/Resources/SqlDatabaseRole/2-RemoveDatabaseRole.ps1 +++ b/Examples/Resources/SqlDatabaseRole/2-RemoveDatabaseRole.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -25,7 +24,7 @@ Configuration Example Name = 'CONTOSO\SQLAdmin' Role = 'DeleteRole' Database = 'AdventureWorks' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlScript/1-RunScriptUsingSQLAuthentication.ps1 b/Examples/Resources/SqlScript/1-RunScriptUsingSQLAuthentication.ps1 index ff0458a1a..98948682f 100644 --- a/Examples/Resources/SqlScript/1-RunScriptUsingSQLAuthentication.ps1 +++ b/Examples/Resources/SqlScript/1-RunScriptUsingSQLAuthentication.ps1 @@ -7,7 +7,7 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] + [System.Management.Automation.PSCredential] $SqlCredential ) diff --git a/Examples/Resources/SqlScript/2-RunScriptUsingWindowsAuthentication.ps1 b/Examples/Resources/SqlScript/2-RunScriptUsingWindowsAuthentication.ps1 index dcb5f6cfb..7acc588cc 100644 --- a/Examples/Resources/SqlScript/2-RunScriptUsingWindowsAuthentication.ps1 +++ b/Examples/Resources/SqlScript/2-RunScriptUsingWindowsAuthentication.ps1 @@ -8,7 +8,7 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] + [System.Management.Automation.PSCredential] $WindowsCredential ) diff --git a/Examples/Resources/SqlServerEndpoint/1-CreateEndpointWithDefaultValues.ps1 b/Examples/Resources/SqlServerEndpoint/1-CreateEndpointWithDefaultValues.ps1 index 45fafb065..be4ee6a8a 100644 --- a/Examples/Resources/SqlServerEndpoint/1-CreateEndpointWithDefaultValues.ps1 +++ b/Examples/Resources/SqlServerEndpoint/1-CreateEndpointWithDefaultValues.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +21,7 @@ Configuration Example EndpointName = 'HADR' InstanceName = 'INST1' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerEndpoint SQLConfigureEndpoint-Instances2 @@ -30,7 +29,7 @@ Configuration Example EndpointName = 'HADR' InstanceName = 'INST2' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerEndpoint/2-CreateEndpointWithSpecificPortAndIPAddress.ps1 b/Examples/Resources/SqlServerEndpoint/2-CreateEndpointWithSpecificPortAndIPAddress.ps1 index e88baa91c..973332ab9 100644 --- a/Examples/Resources/SqlServerEndpoint/2-CreateEndpointWithSpecificPortAndIPAddress.ps1 +++ b/Examples/Resources/SqlServerEndpoint/2-CreateEndpointWithSpecificPortAndIPAddress.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -27,7 +26,7 @@ Configuration Example ServerName = 'server1.company.local' InstanceName = 'INST1' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerEndpoint/3-RemoveEndpoint.ps1 b/Examples/Resources/SqlServerEndpoint/3-RemoveEndpoint.ps1 index 1f2ca5254..b792bb17a 100644 --- a/Examples/Resources/SqlServerEndpoint/3-RemoveEndpoint.ps1 +++ b/Examples/Resources/SqlServerEndpoint/3-RemoveEndpoint.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example EndpointName = 'HADR' InstanceName = 'INST1' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerEndpoint SQLConfigureEndpoint-Instance2 @@ -34,7 +33,7 @@ Configuration Example EndpointName = 'HADR' InstanceName = 'INST2' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerEndpointPermission/1-AddConnectPermission.ps1 b/Examples/Resources/SqlServerEndpointPermission/1-AddConnectPermission.ps1 index e229b5031..6679dbc56 100644 --- a/Examples/Resources/SqlServerEndpointPermission/1-AddConnectPermission.ps1 +++ b/Examples/Resources/SqlServerEndpointPermission/1-AddConnectPermission.ps1 @@ -9,12 +9,10 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount, + $SqlAdministratorCredential, [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceCredential ) @@ -31,7 +29,7 @@ Configuration Example Principal = $SqlServiceCredential.UserName Permission = 'CONNECT' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerEndpointPermission/2-RemoveConnectPermission.ps1 b/Examples/Resources/SqlServerEndpointPermission/2-RemoveConnectPermission.ps1 index fd424d42e..59e2c4287 100644 --- a/Examples/Resources/SqlServerEndpointPermission/2-RemoveConnectPermission.ps1 +++ b/Examples/Resources/SqlServerEndpointPermission/2-RemoveConnectPermission.ps1 @@ -9,12 +9,10 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount, + $SqlAdministratorCredential, [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceCredential ) @@ -31,7 +29,7 @@ Configuration Example Principal = $SqlServiceCredential.UserName Permission = 'CONNECT' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerEndpointPermission/3-AddConnectPermissionToTwoReplicasEachWithDifferentServiceAccount.ps1 b/Examples/Resources/SqlServerEndpointPermission/3-AddConnectPermissionToTwoReplicasEachWithDifferentServiceAccount.ps1 index 4012813f4..801e7e8c5 100644 --- a/Examples/Resources/SqlServerEndpointPermission/3-AddConnectPermissionToTwoReplicasEachWithDifferentServiceAccount.ps1 +++ b/Examples/Resources/SqlServerEndpointPermission/3-AddConnectPermissionToTwoReplicasEachWithDifferentServiceAccount.ps1 @@ -40,17 +40,14 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount, + $SqlAdministratorCredential, [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceNode1Credential, [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceNode2Credential ) @@ -67,7 +64,7 @@ Configuration Example Principal = $SqlServiceNode1Credential.UserName Permission = 'CONNECT' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerEndpointPermission SQLConfigureEndpointPermissionSecondary @@ -79,7 +76,7 @@ Configuration Example Principal = $SqlServiceNode2Credential.UserName Permission = 'CONNECT' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } @@ -94,7 +91,7 @@ Configuration Example Principal = $SqlServiceNode1Credential.UserName Permission = 'CONNECT' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerEndpointPermission SQLConfigureEndpointPermissionSecondary @@ -106,7 +103,7 @@ Configuration Example Principal = $SqlServiceNode2Credential.UserName Permission = 'CONNECT' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerEndpointPermission/4-RemoveConnectPermissionForTwoReplicasEachWithDifferentServiceAccount.ps1 b/Examples/Resources/SqlServerEndpointPermission/4-RemoveConnectPermissionForTwoReplicasEachWithDifferentServiceAccount.ps1 index dc47b884b..ef654671f 100644 --- a/Examples/Resources/SqlServerEndpointPermission/4-RemoveConnectPermissionForTwoReplicasEachWithDifferentServiceAccount.ps1 +++ b/Examples/Resources/SqlServerEndpointPermission/4-RemoveConnectPermissionForTwoReplicasEachWithDifferentServiceAccount.ps1 @@ -40,17 +40,14 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAdministratorCredential, [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceNode1Credential, [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceNode2Credential ) diff --git a/Examples/Resources/SqlServerEndpointState/1-MakeSureEndpointIsStarted.ps1 b/Examples/Resources/SqlServerEndpointState/1-MakeSureEndpointIsStarted.ps1 index 21f34abc6..dee93c44c 100644 --- a/Examples/Resources/SqlServerEndpointState/1-MakeSureEndpointIsStarted.ps1 +++ b/Examples/Resources/SqlServerEndpointState/1-MakeSureEndpointIsStarted.ps1 @@ -17,8 +17,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -33,7 +32,7 @@ Configuration Example Name = 'DefaultMirrorEndpoint' State = 'Started' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Start the HADR in the default instance @@ -44,7 +43,7 @@ Configuration Example Name = 'HADR' State = 'Started' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } # Start the DefaultMirrorEndpoint in the named instance INSTANCE1 @@ -55,7 +54,7 @@ Configuration Example Name = 'DefaultMirrorEndpoint' State = 'Started' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerEndpointState/2-MakeSureEndpointIsStopped.ps1 b/Examples/Resources/SqlServerEndpointState/2-MakeSureEndpointIsStopped.ps1 index 882fd32c8..1d49755aa 100644 --- a/Examples/Resources/SqlServerEndpointState/2-MakeSureEndpointIsStopped.ps1 +++ b/Examples/Resources/SqlServerEndpointState/2-MakeSureEndpointIsStopped.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -23,7 +22,7 @@ Configuration Example Name = 'DefaultMirrorEndpoint' State = 'Stopped' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } diff --git a/Examples/Resources/SqlServerLogin/1-AddLogin.ps1 b/Examples/Resources/SqlServerLogin/1-AddLogin.ps1 index 35a714917..c7c5f7dfe 100644 --- a/Examples/Resources/SqlServerLogin/1-AddLogin.ps1 +++ b/Examples/Resources/SqlServerLogin/1-AddLogin.ps1 @@ -13,11 +13,11 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount, + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential, [Parameter(Mandatory = $true)] - [PSCredential] + [System.Management.Automation.PSCredential] $LoginCredential ) @@ -31,7 +31,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = 'TestServer.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerLogin Add_DisabledWindowsUser @@ -41,7 +41,7 @@ Configuration Example LoginType = 'WindowsUser' ServerName = 'TestServer.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential Disabled = $true } @@ -52,7 +52,7 @@ Configuration Example LoginType = 'WindowsGroup' ServerName = 'TestServer.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerLogin Add_SqlLogin @@ -66,7 +66,7 @@ Configuration Example LoginMustChangePassword = $false LoginPasswordExpirationEnabled = $true LoginPasswordPolicyEnforced = $true - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerMaxDop/1-SetMaxDopToOne.ps1 b/Examples/Resources/SqlServerMaxDop/1-SetMaxDopToOne.ps1 index 695643cc2..d4f7335ca 100644 --- a/Examples/Resources/SqlServerMaxDop/1-SetMaxDopToOne.ps1 +++ b/Examples/Resources/SqlServerMaxDop/1-SetMaxDopToOne.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example MaxDop = 1 ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerMaxDop/2-SetMaxDopToAuto.ps1 b/Examples/Resources/SqlServerMaxDop/2-SetMaxDopToAuto.ps1 index ad0ccacef..01806cc43 100644 --- a/Examples/Resources/SqlServerMaxDop/2-SetMaxDopToAuto.ps1 +++ b/Examples/Resources/SqlServerMaxDop/2-SetMaxDopToAuto.ps1 @@ -14,8 +14,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -28,7 +27,7 @@ Configuration Example DynamicAlloc = $true ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential ProcessOnlyOnActiveNode = $true } } diff --git a/Examples/Resources/SqlServerMaxDop/3-SetMaxDopToDefault.ps1 b/Examples/Resources/SqlServerMaxDop/3-SetMaxDopToDefault.ps1 index 1b81a8b38..caca57b29 100644 --- a/Examples/Resources/SqlServerMaxDop/3-SetMaxDopToDefault.ps1 +++ b/Examples/Resources/SqlServerMaxDop/3-SetMaxDopToDefault.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +21,7 @@ Configuration Example Ensure = 'Absent' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerMemory/1-SetMaxMemoryTo12GB.ps1 b/Examples/Resources/SqlServerMemory/1-SetMaxMemoryTo12GB.ps1 index 525e20233..8db53fc66 100644 --- a/Examples/Resources/SqlServerMemory/1-SetMaxMemoryTo12GB.ps1 +++ b/Examples/Resources/SqlServerMemory/1-SetMaxMemoryTo12GB.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -25,7 +24,7 @@ Configuration Example MaxMemory = 12288 ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerMemory/2-SetMaxMemoryToAuto.ps1 b/Examples/Resources/SqlServerMemory/2-SetMaxMemoryToAuto.ps1 index 9c2bdb99b..9fef55ba4 100644 --- a/Examples/Resources/SqlServerMemory/2-SetMaxMemoryToAuto.ps1 +++ b/Examples/Resources/SqlServerMemory/2-SetMaxMemoryToAuto.ps1 @@ -14,8 +14,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -28,7 +27,7 @@ Configuration Example DynamicAlloc = $true ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential ProcessOnlyOnActiveNode = $true } } diff --git a/Examples/Resources/SqlServerMemory/3-SetMinMemoryToFixedValueAndMaxMemoryToAuto.ps1 b/Examples/Resources/SqlServerMemory/3-SetMinMemoryToFixedValueAndMaxMemoryToAuto.ps1 index 449aef519..e2fa5d5d7 100644 --- a/Examples/Resources/SqlServerMemory/3-SetMinMemoryToFixedValueAndMaxMemoryToAuto.ps1 +++ b/Examples/Resources/SqlServerMemory/3-SetMinMemoryToFixedValueAndMaxMemoryToAuto.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -24,7 +23,7 @@ Configuration Example ServerName = 'sqltest.company.local' InstanceName = 'DSC' MinMemory = 2048 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerMemory/4-SetMaxMemoryToDefault.ps1 b/Examples/Resources/SqlServerMemory/4-SetMaxMemoryToDefault.ps1 index c7718a071..0ac941c8d 100644 --- a/Examples/Resources/SqlServerMemory/4-SetMaxMemoryToDefault.ps1 +++ b/Examples/Resources/SqlServerMemory/4-SetMaxMemoryToDefault.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +21,7 @@ Configuration Example Ensure = 'Absent' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerNetwork/1-EnableTcpIpWithStaticPort.ps1 b/Examples/Resources/SqlServerNetwork/1-EnableTcpIpWithStaticPort.ps1 index 25ebcd95d..2722e5a1e 100644 --- a/Examples/Resources/SqlServerNetwork/1-EnableTcpIpWithStaticPort.ps1 +++ b/Examples/Resources/SqlServerNetwork/1-EnableTcpIpWithStaticPort.ps1 @@ -10,7 +10,6 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SystemAdministratorAccount ) diff --git a/Examples/Resources/SqlServerNetwork/2-EnableTcpIpWithDynamicPort.ps1 b/Examples/Resources/SqlServerNetwork/2-EnableTcpIpWithDynamicPort.ps1 index ecaf41133..6be3708eb 100644 --- a/Examples/Resources/SqlServerNetwork/2-EnableTcpIpWithDynamicPort.ps1 +++ b/Examples/Resources/SqlServerNetwork/2-EnableTcpIpWithDynamicPort.ps1 @@ -10,7 +10,6 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SystemAdministratorAccount ) diff --git a/Examples/Resources/SqlServerPermission/1-AddServerPermissionForLogin.ps1 b/Examples/Resources/SqlServerPermission/1-AddServerPermissionForLogin.ps1 index 15603c426..460474b4a 100644 --- a/Examples/Resources/SqlServerPermission/1-AddServerPermissionForLogin.ps1 +++ b/Examples/Resources/SqlServerPermission/1-AddServerPermissionForLogin.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDSC @@ -26,7 +25,7 @@ Configuration Example Principal = 'NT AUTHORITY\SYSTEM' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlServerPermission 'SQLConfigureServerPermission-ClusSvc' @@ -37,7 +36,7 @@ Configuration Example Principal = 'NT SERVICE\ClusSvc' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerPermission/2-RemoveServerPermissionForLogin.ps1 b/Examples/Resources/SqlServerPermission/2-RemoveServerPermissionForLogin.ps1 index b433ba877..50ac429cd 100644 --- a/Examples/Resources/SqlServerPermission/2-RemoveServerPermissionForLogin.ps1 +++ b/Examples/Resources/SqlServerPermission/2-RemoveServerPermissionForLogin.ps1 @@ -9,8 +9,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDSC @@ -26,7 +25,7 @@ Configuration Example Principal = 'NT AUTHORITY\SYSTEM' Permission = 'AlterAnyAvailabilityGroup', 'ViewServerState' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerReplication/1-ConfigureInstanceAsDistributor.ps1 b/Examples/Resources/SqlServerReplication/1-ConfigureInstanceAsDistributor.ps1 index 25d71253b..39575dd8a 100644 --- a/Examples/Resources/SqlServerReplication/1-ConfigureInstanceAsDistributor.ps1 +++ b/Examples/Resources/SqlServerReplication/1-ConfigureInstanceAsDistributor.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -20,11 +19,11 @@ Configuration Example { Ensure = 'Present' InstanceName = 'MSSQLSERVER' - AdminLinkCredentials = $SysAdminAccount + AdminLinkCredentials = $SqlAdministratorCredential DistributorMode = 'Local' WorkingDirectory = 'C:\Temp' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerReplication/2-ConfigureInstanceAsPublisher.ps1 b/Examples/Resources/SqlServerReplication/2-ConfigureInstanceAsPublisher.ps1 index 30737e9a8..f4c3c6378 100644 --- a/Examples/Resources/SqlServerReplication/2-ConfigureInstanceAsPublisher.ps1 +++ b/Examples/Resources/SqlServerReplication/2-ConfigureInstanceAsPublisher.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -20,12 +19,12 @@ Configuration Example { Ensure = 'Present' InstanceName = 'PUBLISHER' - AdminLinkCredentials = $SysAdminAccount + AdminLinkCredentials = $SqlAdministratorCredential DistributorMode = 'Remote' RemoteDistributor = 'distsqlsrv.company.local' WorkingDirectory = 'C:\Temp' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerRole/1-AddServerRole.ps1 b/Examples/Resources/SqlServerRole/1-AddServerRole.ps1 index 0546bfdfb..e5bdb02a0 100644 --- a/Examples/Resources/SqlServerRole/1-AddServerRole.ps1 +++ b/Examples/Resources/SqlServerRole/1-AddServerRole.ps1 @@ -8,7 +8,7 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] + [System.Management.Automation.PSCredential] $SysAdminAccount ) diff --git a/Examples/Resources/SqlServerRole/2-RemoveServerRole.ps1 b/Examples/Resources/SqlServerRole/2-RemoveServerRole.ps1 index 407055246..889787633 100644 --- a/Examples/Resources/SqlServerRole/2-RemoveServerRole.ps1 +++ b/Examples/Resources/SqlServerRole/2-RemoveServerRole.ps1 @@ -8,8 +8,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -21,7 +21,7 @@ Configuration Example ServerRoleName = 'serverRoleToDelete' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerRole/3-AddMembersToServerRole.ps1 b/Examples/Resources/SqlServerRole/3-AddMembersToServerRole.ps1 index 5e7c0c35a..f9724238a 100644 --- a/Examples/Resources/SqlServerRole/3-AddMembersToServerRole.ps1 +++ b/Examples/Resources/SqlServerRole/3-AddMembersToServerRole.ps1 @@ -9,8 +9,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -23,7 +23,7 @@ Configuration Example Members = 'CONTOSO\SQLAdmin', 'CONTOSO\SQLAdminBI' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerRole/4-MembersToIncludeInServerRole.ps1 b/Examples/Resources/SqlServerRole/4-MembersToIncludeInServerRole.ps1 index 86400f4ca..68340166c 100644 --- a/Examples/Resources/SqlServerRole/4-MembersToIncludeInServerRole.ps1 +++ b/Examples/Resources/SqlServerRole/4-MembersToIncludeInServerRole.ps1 @@ -9,8 +9,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -23,7 +23,7 @@ Configuration Example MembersToInclude = 'CONTOSO\John', 'CONTOSO\Kelly' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServerRole/5-MembersToExcludeInServerRole.ps1 b/Examples/Resources/SqlServerRole/5-MembersToExcludeInServerRole.ps1 index 0594a2f34..de1a45517 100644 --- a/Examples/Resources/SqlServerRole/5-MembersToExcludeInServerRole.ps1 +++ b/Examples/Resources/SqlServerRole/5-MembersToExcludeInServerRole.ps1 @@ -9,8 +9,8 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] - $SysAdminAccount + [System.Management.Automation.PSCredential] + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -23,7 +23,7 @@ Configuration Example MembersToExclude = 'CONTOSO\Mark', 'CONTOSO\Lucy' ServerName = 'sqltest.company.local' InstanceName = 'DSC' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlServiceAccount/1-ConfigureServiceAccount-UserAccount.ps1 b/Examples/Resources/SqlServiceAccount/1-ConfigureServiceAccount-UserAccount.ps1 index 9c48e84e2..f5eff93db 100644 --- a/Examples/Resources/SqlServiceAccount/1-ConfigureServiceAccount-UserAccount.ps1 +++ b/Examples/Resources/SqlServiceAccount/1-ConfigureServiceAccount-UserAccount.ps1 @@ -8,7 +8,7 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] + [System.Management.Automation.PSCredential] $ServiceAccountCredential ) diff --git a/Examples/Resources/SqlServiceAccount/2-ConfigureServiceAccount-VirtualAccount.ps1 b/Examples/Resources/SqlServiceAccount/2-ConfigureServiceAccount-VirtualAccount.ps1 index 4a4e6f5c0..60257b6ee 100644 --- a/Examples/Resources/SqlServiceAccount/2-ConfigureServiceAccount-VirtualAccount.ps1 +++ b/Examples/Resources/SqlServiceAccount/2-ConfigureServiceAccount-VirtualAccount.ps1 @@ -11,7 +11,7 @@ Configuration Example { param( [Parameter(Mandatory = $true)] - [PSCredential] + [System.Management.Automation.PSCredential] $ServiceAccountCredential ) diff --git a/Examples/Resources/SqlSetup/1-InstallDefaultInstanceSingleServer.ps1 b/Examples/Resources/SqlSetup/1-InstallDefaultInstanceSingleServer.ps1 index 6e188f171..578666d09 100644 --- a/Examples/Resources/SqlSetup/1-InstallDefaultInstanceSingleServer.ps1 +++ b/Examples/Resources/SqlSetup/1-InstallDefaultInstanceSingleServer.ps1 @@ -14,25 +14,21 @@ Configuration Example [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlInstallCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAdministratorCredential = $SqlInstallCredential, [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAgentServiceCredential = $SqlServiceCredential ) diff --git a/Examples/Resources/SqlSetup/2-InstallNamedInstanceSingleServer.ps1 b/Examples/Resources/SqlSetup/2-InstallNamedInstanceSingleServer.ps1 index a754fffe6..56fcfbb65 100644 --- a/Examples/Resources/SqlSetup/2-InstallNamedInstanceSingleServer.ps1 +++ b/Examples/Resources/SqlSetup/2-InstallNamedInstanceSingleServer.ps1 @@ -13,25 +13,21 @@ Configuration Example [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlInstallCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAdministratorCredential = $SqlInstallCredential, [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAgentServiceCredential = $SqlServiceCredential ) diff --git a/Examples/Resources/SqlSetup/3-InstallNamedInstanceSingleServerFromUncPathUsingSourceCredential.ps1 b/Examples/Resources/SqlSetup/3-InstallNamedInstanceSingleServerFromUncPathUsingSourceCredential.ps1 index bdd01187b..2d640738d 100644 --- a/Examples/Resources/SqlSetup/3-InstallNamedInstanceSingleServerFromUncPathUsingSourceCredential.ps1 +++ b/Examples/Resources/SqlSetup/3-InstallNamedInstanceSingleServerFromUncPathUsingSourceCredential.ps1 @@ -17,25 +17,21 @@ Configuration Example [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlInstallCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAdministratorCredential = $SqlInstallCredential, [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAgentServiceCredential = $SqlServiceCredential ) diff --git a/Examples/Resources/SqlSetup/4-InstallNamedInstanceInFailoverClusterFirstNode.ps1 b/Examples/Resources/SqlSetup/4-InstallNamedInstanceInFailoverClusterFirstNode.ps1 index 8ddd54537..4a4168fbd 100644 --- a/Examples/Resources/SqlSetup/4-InstallNamedInstanceInFailoverClusterFirstNode.ps1 +++ b/Examples/Resources/SqlSetup/4-InstallNamedInstanceInFailoverClusterFirstNode.ps1 @@ -37,25 +37,21 @@ Configuration Example [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlInstallCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAdministratorCredential = $SqlInstallCredential, [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAgentServiceCredential = $SqlServiceCredential ) diff --git a/Examples/Resources/SqlSetup/5-InstallNamedInstanceInFailoverClusterSecondNode.ps1 b/Examples/Resources/SqlSetup/5-InstallNamedInstanceInFailoverClusterSecondNode.ps1 index 3bf76ce91..2929986a9 100644 --- a/Examples/Resources/SqlSetup/5-InstallNamedInstanceInFailoverClusterSecondNode.ps1 +++ b/Examples/Resources/SqlSetup/5-InstallNamedInstanceInFailoverClusterSecondNode.ps1 @@ -33,25 +33,21 @@ Configuration Example [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlInstallCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAdministratorCredential = $SqlInstallCredential, [Parameter(Mandatory = $true)] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlServiceCredential, [Parameter()] [ValidateNotNullorEmpty()] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] $SqlAgentServiceCredential = $SqlServiceCredential ) diff --git a/Examples/Resources/SqlWaitForAG/1-WaitForASingleClusterGroup.ps1 b/Examples/Resources/SqlWaitForAG/1-WaitForASingleClusterGroup.ps1 index d1566a51e..b45834f80 100644 --- a/Examples/Resources/SqlWaitForAG/1-WaitForASingleClusterGroup.ps1 +++ b/Examples/Resources/SqlWaitForAG/1-WaitForASingleClusterGroup.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +21,7 @@ Configuration Example RetryIntervalSec = 20 RetryCount = 30 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlWaitForAG/2-WaitForMultipleClusterGroups.ps1 b/Examples/Resources/SqlWaitForAG/2-WaitForMultipleClusterGroups.ps1 index ef25ba152..2f264dbbb 100644 --- a/Examples/Resources/SqlWaitForAG/2-WaitForMultipleClusterGroups.ps1 +++ b/Examples/Resources/SqlWaitForAG/2-WaitForMultipleClusterGroups.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -22,7 +21,7 @@ Configuration Example RetryIntervalSec = 20 RetryCount = 30 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlWaitForAG SQLConfigureAG-WaitAGTest2 @@ -31,7 +30,7 @@ Configuration Example RetryIntervalSec = 20 RetryCount = 30 - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlWindowsFirewall/1-CreateInboundFirewallRules.ps1 b/Examples/Resources/SqlWindowsFirewall/1-CreateInboundFirewallRules.ps1 index 3333b28c2..1fad36414 100644 --- a/Examples/Resources/SqlWindowsFirewall/1-CreateInboundFirewallRules.ps1 +++ b/Examples/Resources/SqlWindowsFirewall/1-CreateInboundFirewallRules.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -23,7 +22,7 @@ Configuration Example InstanceName = 'SQL2012' SourcePath = '\\files.company.local\images\SQL2012' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlWindowsFirewall Create_FirewallRules_For_SQL2016 @@ -33,7 +32,7 @@ Configuration Example InstanceName = 'SQL2016' SourcePath = '\\files.company.local\images\SQL2016' - SourceCredential = $SysAdminAccount + SourceCredential = $SqlAdministratorCredential } } } diff --git a/Examples/Resources/SqlWindowsFirewall/2-RemoveInboundFirewallRules.ps1 b/Examples/Resources/SqlWindowsFirewall/2-RemoveInboundFirewallRules.ps1 index 3ba7fac4c..5d5d40d3b 100644 --- a/Examples/Resources/SqlWindowsFirewall/2-RemoveInboundFirewallRules.ps1 +++ b/Examples/Resources/SqlWindowsFirewall/2-RemoveInboundFirewallRules.ps1 @@ -8,8 +8,7 @@ Configuration Example ( [Parameter(Mandatory = $true)] [System.Management.Automation.PSCredential] - [System.Management.Automation.Credential()] - $SysAdminAccount + $SqlAdministratorCredential ) Import-DscResource -ModuleName SqlServerDsc @@ -23,7 +22,7 @@ Configuration Example InstanceName = 'SQL2012' SourcePath = '\\files.company.local\images\SQL2012' - PsDscRunAsCredential = $SysAdminAccount + PsDscRunAsCredential = $SqlAdministratorCredential } SqlWindowsFirewall Remove_FirewallRules_For_SQL2016 @@ -33,7 +32,7 @@ Configuration Example InstanceName = 'SQL2016' SourcePath = '\\files.company.local\images\SQL2016' - SourceCredential = $SysAdminAccount + SourceCredential = $SqlAdministratorCredential } } }