Skip to content

Commit 227dfb3

Browse files
committed
Update Invoke-SetupAction and Complete-SqlDscImage to require SqlSvcAccount parameter and adjust examples
1 parent 1721133 commit 227dfb3

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

source/Private/Invoke-SetupAction.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
Prepares the server for using the database engine for an instance named 'MyInstance'.
407407
408408
.EXAMPLE
409-
Invoke-SetupAction -CompleteImage -AcceptLicensingTerms -InstanceId 'MSSQLSERVER' -MediaPath 'E:\'
409+
Invoke-SetupAction -CompleteImage -AcceptLicensingTerms -InstanceId 'MSSQLSERVER' -SqlSvcAccount 'NT Service\MSSQLSERVER' -MediaPath 'E:\'
410410
411411
Completes install on a server that was previously prepared (by using prepare image).
412412
@@ -1013,7 +1013,7 @@ function Invoke-SetupAction
10131013

10141014
[Parameter(ParameterSetName = 'Install')]
10151015
[Parameter(ParameterSetName = 'InstallRole')]
1016-
[Parameter(ParameterSetName = 'CompleteImage')]
1016+
[Parameter(ParameterSetName = 'CompleteImage', Mandatory = $true)]
10171017
[Parameter(ParameterSetName = 'InstallFailoverCluster')]
10181018
[Parameter(ParameterSetName = 'PrepareFailoverCluster')]
10191019
[Parameter(ParameterSetName = 'AddNode')]

source/Public/Complete-SqlDscImage.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
None.
162162
163163
.EXAMPLE
164-
Complete-SqlDscImage -AcceptLicensingTerms -MediaPath 'E:\' -InstanceId 'MSSQLSERVER'
164+
Complete-SqlDscImage -AcceptLicensingTerms -MediaPath 'E:\' -InstanceId 'MSSQLSERVER' -SqlSvcAccount 'NT Service\MSSQLSERVER'
165165
166166
Completes the image installation of the SQL Server default instance that
167167
was prepared using `Install-SqlDscServer` with the parameter `-PrepareImage`.
@@ -270,7 +270,7 @@ function Complete-SqlDscImage
270270
[System.String]
271271
$SqlCollation,
272272

273-
[Parameter()]
273+
[Parameter(Mandatory = $true)]
274274
[System.String]
275275
$SqlSvcAccount,
276276

tests/Unit/Private/Invoke-SetupAction.Tests.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Describe 'Invoke-SetupAction' -Tag 'Private' {
8282
@{
8383
MockParameterSetName = 'CompleteImage'
8484
# cSpell: disable-next
85-
MockExpectedParameters = '-CompleteImage -AcceptLicensingTerms -MediaPath <string> -InstanceId <string> [-InstanceName <string>] [-Enu] [-PBEngSvcAccount <string>] [-PBEngSvcPassword <securestring>] [-PBEngSvcStartupType <string>] [-PBStartPortRange <ushort>] [-PBEndPortRange <ushort>] [-PBScaleOut] [-ProductKey <string>] [-AgtSvcAccount <string>] [-AgtSvcPassword <securestring>] [-AgtSvcStartupType <string>] [-BrowserSvcStartupType <string>] [-EnableRanU] [-InstallSqlDataDir <string>] [-SqlBackupDir <string>] [-SecurityMode <string>] [-SAPwd <securestring>] [-SqlCollation <string>] [-SqlSvcAccount <string>] [-SqlSvcPassword <securestring>] [-SqlSvcStartupType <string>] [-SqlSysAdminAccounts <string[]>] [-SqlTempDbDir <string>] [-SqlTempDbLogDir <string>] [-SqlTempDbFileCount <ushort>] [-SqlTempDbFileSize <ushort>] [-SqlTempDbFileGrowth <ushort>] [-SqlTempDbLogFileSize <ushort>] [-SqlTempDbLogFileGrowth <ushort>] [-SqlUserDbDir <string>] [-SqlUserDbLogDir <string>] [-FileStreamLevel <ushort>] [-FileStreamShareName <string>] [-NpEnabled] [-TcpEnabled] [-RsInstallMode <string>] [-RSSvcAccount <string>] [-RSSvcPassword <securestring>] [-RSSvcStartupType <string>] [-ProductCoveredBySA] [-Timeout <uint>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]'
85+
MockExpectedParameters = '-CompleteImage -AcceptLicensingTerms -MediaPath <string> -InstanceId <string> -SqlSvcAccount <string> [-InstanceName <string>] [-Enu] [-PBEngSvcAccount <string>] [-PBEngSvcPassword <securestring>] [-PBEngSvcStartupType <string>] [-PBStartPortRange <ushort>] [-PBEndPortRange <ushort>] [-PBScaleOut] [-ProductKey <string>] [-AgtSvcAccount <string>] [-AgtSvcPassword <securestring>] [-AgtSvcStartupType <string>] [-BrowserSvcStartupType <string>] [-EnableRanU] [-InstallSqlDataDir <string>] [-SqlBackupDir <string>] [-SecurityMode <string>] [-SAPwd <securestring>] [-SqlCollation <string>] [-SqlSvcPassword <securestring>] [-SqlSvcStartupType <string>] [-SqlSysAdminAccounts <string[]>] [-SqlTempDbDir <string>] [-SqlTempDbLogDir <string>] [-SqlTempDbFileCount <ushort>] [-SqlTempDbFileSize <ushort>] [-SqlTempDbFileGrowth <ushort>] [-SqlTempDbLogFileSize <ushort>] [-SqlTempDbLogFileGrowth <ushort>] [-SqlUserDbDir <string>] [-SqlUserDbLogDir <string>] [-FileStreamLevel <ushort>] [-FileStreamShareName <string>] [-NpEnabled] [-TcpEnabled] [-RsInstallMode <string>] [-RSSvcAccount <string>] [-RSSvcPassword <securestring>] [-RSSvcStartupType <string>] [-ProductCoveredBySA] [-Timeout <uint>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]'
8686
}
8787
@{
8888
MockParameterSetName = 'Upgrade'
@@ -3227,6 +3227,7 @@ Describe 'Invoke-SetupAction' -Tag 'Private' {
32273227
AcceptLicensingTerms = $true
32283228
MediaPath = '\SqlMedia'
32293229
InstanceId = 'MSSQLSERVER'
3230+
SqlSvcAccount = 'NT Service\MSSQLSERVER'
32303231
}
32313232
}
32323233
}
@@ -3286,6 +3287,7 @@ Describe 'Invoke-SetupAction' -Tag 'Private' {
32863287
AcceptLicensingTerms = $true
32873288
MediaPath = '\SqlMedia'
32883289
InstanceId = 'MSSQLSERVER'
3290+
SqlSvcAccount = 'NT Service\MSSQLSERVER'
32893291
Force = $true
32903292
PBStartPortRange = 16450
32913293
PBEndPortRange = 16460
@@ -3510,6 +3512,7 @@ Describe 'Invoke-SetupAction' -Tag 'Private' {
35103512
AcceptLicensingTerms = $true
35113513
MediaPath = '\SqlMedia'
35123514
InstanceId = 'MSSQLSERVER'
3515+
SqlSvcAccount = 'NT Service\MSSQLSERVER'
35133516
Force = $true
35143517
}
35153518
}

tests/Unit/Public/Complete-SqlDscImage.Tests.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Describe 'Complete-SqlDscImage' -Tag 'Public' {
5252
@{
5353
MockParameterSetName = '__AllParameterSets'
5454
# cSpell: disable-next
55-
MockExpectedParameters = '[-MediaPath] <string> [[-InstanceName] <string>] [-InstanceId] <string> [[-PBEngSvcAccount] <string>] [[-PBEngSvcPassword] <securestring>] [[-PBEngSvcStartupType] <string>] [[-PBStartPortRange] <ushort>] [[-PBEndPortRange] <ushort>] [[-ProductKey] <string>] [[-AgtSvcAccount] <string>] [[-AgtSvcPassword] <securestring>] [[-AgtSvcStartupType] <string>] [[-BrowserSvcStartupType] <string>] [[-InstallSqlDataDir] <string>] [[-SqlBackupDir] <string>] [[-SecurityMode] <string>] [[-SAPwd] <securestring>] [[-SqlCollation] <string>] [[-SqlSvcAccount] <string>] [[-SqlSvcPassword] <securestring>] [[-SqlSvcStartupType] <string>] [[-SqlSysAdminAccounts] <string[]>] [[-SqlTempDbDir] <string>] [[-SqlTempDbLogDir] <string>] [[-SqlTempDbFileCount] <ushort>] [[-SqlTempDbFileSize] <ushort>] [[-SqlTempDbFileGrowth] <ushort>] [[-SqlTempDbLogFileSize] <ushort>] [[-SqlTempDbLogFileGrowth] <ushort>] [[-SqlUserDbDir] <string>] [[-SqlUserDbLogDir] <string>] [[-FileStreamLevel] <ushort>] [[-FileStreamShareName] <string>] [[-RsInstallMode] <string>] [[-RSSvcAccount] <string>] [[-RSSvcPassword] <securestring>] [[-RSSvcStartupType] <string>] [[-Timeout] <uint>] -AcceptLicensingTerms [-Enu] [-PBScaleOut] [-EnableRanU] [-NpEnabled] [-TcpEnabled] [-ProductCoveredBySA] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]'
55+
MockExpectedParameters = '[-MediaPath] <string> [[-InstanceName] <string>] [-InstanceId] <string> [[-PBEngSvcAccount] <string>] [[-PBEngSvcPassword] <securestring>] [[-PBEngSvcStartupType] <string>] [[-PBStartPortRange] <ushort>] [[-PBEndPortRange] <ushort>] [[-ProductKey] <string>] [[-AgtSvcAccount] <string>] [[-AgtSvcPassword] <securestring>] [[-AgtSvcStartupType] <string>] [[-BrowserSvcStartupType] <string>] [[-InstallSqlDataDir] <string>] [[-SqlBackupDir] <string>] [[-SecurityMode] <string>] [[-SAPwd] <securestring>] [[-SqlCollation] <string>] [-SqlSvcAccount] <string> [[-SqlSvcPassword] <securestring>] [[-SqlSvcStartupType] <string>] [[-SqlSysAdminAccounts] <string[]>] [[-SqlTempDbDir] <string>] [[-SqlTempDbLogDir] <string>] [[-SqlTempDbFileCount] <ushort>] [[-SqlTempDbFileSize] <ushort>] [[-SqlTempDbFileGrowth] <ushort>] [[-SqlTempDbLogFileSize] <ushort>] [[-SqlTempDbLogFileGrowth] <ushort>] [[-SqlUserDbDir] <string>] [[-SqlUserDbLogDir] <string>] [[-FileStreamLevel] <ushort>] [[-FileStreamShareName] <string>] [[-RsInstallMode] <string>] [[-RSSvcAccount] <string>] [[-RSSvcPassword] <securestring>] [[-RSSvcStartupType] <string>] [[-Timeout] <uint>] -AcceptLicensingTerms [-Enu] [-PBScaleOut] [-EnableRanU] [-NpEnabled] [-TcpEnabled] [-ProductCoveredBySA] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]'
5656
}
5757
) {
5858
$result = (Get-Command -Name 'Complete-SqlDscImage').ParameterSets |
@@ -95,6 +95,7 @@ Describe 'Complete-SqlDscImage' -Tag 'Public' {
9595
AcceptLicensingTerms = $true
9696
MediaPath = '\SqlMedia'
9797
InstanceId = 'MSSQLSERVER'
98+
SqlSvcAccount = 'NT Service\MSSQLSERVER'
9899
ErrorAction = 'Stop'
99100
}
100101
}
@@ -144,6 +145,7 @@ Describe 'Complete-SqlDscImage' -Tag 'Public' {
144145
AcceptLicensingTerms = $true
145146
MediaPath = '\SqlMedia'
146147
InstanceId = 'MSSQLSERVER'
148+
SqlSvcAccount = 'NT Service\MSSQLSERVER'
147149
Force = $true
148150
PBStartPortRange = 16450
149151
PBEndPortRange = 16460
@@ -358,6 +360,7 @@ Describe 'Complete-SqlDscImage' -Tag 'Public' {
358360
AcceptLicensingTerms = $true
359361
MediaPath = '\SqlMedia'
360362
InstanceId = 'MSSQLSERVER'
363+
SqlSvcAccount = 'NT Service\MSSQLSERVER'
361364
Force = $true
362365
ErrorAction = 'Stop'
363366
}

0 commit comments

Comments
 (0)