Skip to content

Commit eb2034e

Browse files
johljujohlju
committed
Fix HQRM
1 parent 2c3233d commit eb2034e

File tree

7 files changed

+36
-24
lines changed

7 files changed

+36
-24
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
- Fix localizations strings that used wrong keys.
2727
- `SqlConfiguration`
2828
- Change the alias command to real command name, to pass HQRM tests.
29+
- `SqlDatabaseUser`
30+
- Change the alias command to real command name, to pass HQRM tests.
31+
- `SqlMaxDop`
32+
- Change the alias command to real command name, to pass HQRM tests.
33+
- `SqlMemory`
34+
- Change the alias command to real command name, to pass HQRM tests.
35+
- `SqlReplication`
36+
- Change the alias command to real command name, to pass HQRM tests.
37+
- `SqlRSSetup`
38+
- Change the alias command to real command name, to pass HQRM tests.
39+
- `SqlServiceAccount`
40+
- Change the alias command to real command name, to pass HQRM tests.
2941

3042
## [17.0.0] - 2024-09-30
3143

‎source/DSCResources/DSC_SqlDatabaseUser/DSC_SqlDatabaseUser.psm1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -687,37 +687,37 @@ function Assert-Parameters
687687
if ($UserType -ne 'Login' -and $PSBoundParameters.ContainsKey('LoginName'))
688688
{
689689
$errorMessage = $script:localizedData.LoginNameProvidedWithWrongUserType -f $UserType
690-
New-InvalidArgumentException -ArgumentName 'Action' -Message $errorMessage
690+
New-ArgumentException -ArgumentName 'Action' -Message $errorMessage
691691
}
692692

693693
if ($UserType -ne 'Certificate' -and $PSBoundParameters.ContainsKey('CertificateName'))
694694
{
695695
$errorMessage = $script:localizedData.CertificateNameProvidedWithWrongUserType -f $UserType
696-
New-InvalidArgumentException -ArgumentName 'Action' -Message $errorMessage
696+
New-ArgumentException -ArgumentName 'Action' -Message $errorMessage
697697
}
698698

699699
if ($UserType -ne 'AsymmetricKey' -and $PSBoundParameters.ContainsKey('AsymmetricKeyName'))
700700
{
701701
$errorMessage = $script:localizedData.AsymmetricKeyNameProvidedWithWrongUserType -f $UserType
702-
New-InvalidArgumentException -ArgumentName 'Action' -Message $errorMessage
702+
New-ArgumentException -ArgumentName 'Action' -Message $errorMessage
703703
}
704704

705705
if ($UserType -eq 'Login' -and -not $PSBoundParameters.ContainsKey('LoginName'))
706706
{
707707
$errorMessage = $script:localizedData.LoginUserTypeWithoutLoginName -f $UserType
708-
New-InvalidArgumentException -ArgumentName 'Action' -Message $errorMessage
708+
New-ArgumentException -ArgumentName 'Action' -Message $errorMessage
709709
}
710710

711711
if ($UserType -eq 'AsymmetricKey' -and -not $PSBoundParameters.ContainsKey('AsymmetricKeyName'))
712712
{
713713
$errorMessage = $script:localizedData.AsymmetricKeyUserTypeWithoutAsymmetricKeyName -f $UserType
714-
New-InvalidArgumentException -ArgumentName 'Action' -Message $errorMessage
714+
New-ArgumentException -ArgumentName 'Action' -Message $errorMessage
715715
}
716716

717717
if ($UserType -eq 'Certificate' -and -not $PSBoundParameters.ContainsKey('CertificateName'))
718718
{
719719
$errorMessage = $script:localizedData.CertificateUserTypeWithoutCertificateName -f $UserType
720-
New-InvalidArgumentException -ArgumentName 'Action' -Message $errorMessage
720+
New-ArgumentException -ArgumentName 'Action' -Message $errorMessage
721721
}
722722
}
723723

‎source/DSCResources/DSC_SqlMaxDop/DSC_SqlMaxDop.psm1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ function Set-TargetResource
144144
if ($MaxDop)
145145
{
146146
$errorMessage = $script:localizedData.MaxDopParamMustBeNull
147-
New-InvalidArgumentException -ArgumentName 'MaxDop' -Message $errorMessage
147+
New-ArgumentException -ArgumentName 'MaxDop' -Message $errorMessage
148148
}
149149

150150
$targetMaxDop = Get-SqlDscDynamicMaxDop -SqlServerObject $sqlServerObject
@@ -302,7 +302,7 @@ function Test-TargetResource
302302
if ($MaxDop)
303303
{
304304
$errorMessage = $script:localizedData.MaxDopParamMustBeNull
305-
New-InvalidArgumentException -ArgumentName 'MaxDop' -Message $errorMessage
305+
New-ArgumentException -ArgumentName 'MaxDop' -Message $errorMessage
306306
}
307307

308308
$MaxDop = Get-SqlDscDynamicMaxDop

‎source/DSCResources/DSC_SqlMemory/DSC_SqlMemory.psm1‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,13 @@ function Set-TargetResource
166166
if ($MaxMemory)
167167
{
168168
$errorMessage = $script:localizedData.MaxMemoryParamMustBeNull
169-
New-InvalidArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
169+
New-ArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
170170
}
171171

172172
if ($MaxMemoryPercent)
173173
{
174174
$errorMessage = $script:localizedData.MaxMemoryPercentParamMustBeNull
175-
New-InvalidArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
175+
New-ArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
176176
}
177177

178178
$MaxMemory = Get-SqlDscDynamicMaxMemory
@@ -186,7 +186,7 @@ function Set-TargetResource
186186
if ($PSBoundParameters.ContainsKey('MaxMemory') -and -not $MaxMemory)
187187
{
188188
$errorMessage = $script:localizedData.MaxMemoryParamMustNotBeNull
189-
New-InvalidArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
189+
New-ArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
190190
}
191191
}
192192

@@ -195,7 +195,7 @@ function Set-TargetResource
195195
if ($MaxMemoryPercent)
196196
{
197197
$errorMessage = $script:localizedData.MaxMemoryPercentParamMustBeNull
198-
New-InvalidArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
198+
New-ArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
199199
}
200200

201201
$sqlServerObject.Configuration.MaxServerMemory.ConfigValue = $MaxMemory
@@ -220,7 +220,7 @@ function Set-TargetResource
220220
if ($MinMemoryPercent)
221221
{
222222
$errorMessage = $script:localizedData.MinMemoryPercentParamMustBeNull
223-
New-InvalidArgumentException -ArgumentName 'MinMemoryPercent' -Message $errorMessage
223+
New-ArgumentException -ArgumentName 'MinMemoryPercent' -Message $errorMessage
224224
}
225225

226226
$sqlServerObject.Configuration.MinServerMemory.ConfigValue = $MinMemory
@@ -420,13 +420,13 @@ function Test-TargetResource
420420
if ($MaxMemory)
421421
{
422422
$errorMessage = $script:localizedData.MaxMemoryParamMustBeNull
423-
New-InvalidArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
423+
New-ArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
424424
}
425425

426426
if ($MaxMemoryPercent)
427427
{
428428
$errorMessage = $script:localizedData.MaxMemoryPercentParamMustBeNull
429-
New-InvalidArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
429+
New-ArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
430430
}
431431

432432
$MaxMemory = Get-SqlDscDynamicMaxMemory
@@ -440,7 +440,7 @@ function Test-TargetResource
440440
if ($PSBoundParameters.ContainsKey('MaxMemory') -and -not $MaxMemory)
441441
{
442442
$errorMessage = $script:localizedData.MaxMemoryParamMustNotBeNull
443-
New-InvalidArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
443+
New-ArgumentException -ArgumentName 'MaxMemory' -Message $errorMessage
444444
}
445445
}
446446

@@ -449,7 +449,7 @@ function Test-TargetResource
449449
if ($MaxMemory -and $MaxMemoryPercent)
450450
{
451451
$errorMessage = $script:localizedData.MaxMemoryPercentParamMustBeNull
452-
New-InvalidArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
452+
New-ArgumentException -ArgumentName 'MaxMemoryPercent' -Message $errorMessage
453453
}
454454

455455
if ($MaxMemoryPercent)
@@ -472,7 +472,7 @@ function Test-TargetResource
472472
if ($MinMemory -and $MinMemoryPercent)
473473
{
474474
$errorMessage = $script:localizedData.MinMemoryPercentParamMustBeNull
475-
New-InvalidArgumentException -ArgumentName 'MinMemoryPercent' -Message $errorMessage
475+
New-ArgumentException -ArgumentName 'MinMemoryPercent' -Message $errorMessage
476476
}
477477

478478
if ($MinMemoryPercent)

‎source/DSCResources/DSC_SqlRSSetup/DSC_SqlRSSetup.psm1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,20 +287,20 @@ function Set-TargetResource
287287
if ($Action -eq 'Install' -and $PSBoundParameters.ContainsKey('Edition') -and $PSBoundParameters.ContainsKey('ProductKey'))
288288
{
289289
$errorMessage = $script:localizedData.EditionInvalidParameter
290-
New-InvalidArgumentException -ArgumentName 'Edition, ProductKey' -Message $errorMessage
290+
New-ArgumentException -ArgumentName 'Edition, ProductKey' -Message $errorMessage
291291
}
292292

293293
# Must either choose ProductKey or Edition, not none.
294294
if ($Action -eq 'Install' -and -not $PSBoundParameters.ContainsKey('Edition') -and -not $PSBoundParameters.ContainsKey('ProductKey'))
295295
{
296296
$errorMessage = $script:localizedData.EditionMissingParameter
297-
New-InvalidArgumentException -ArgumentName 'Edition, ProductKey' -Message $errorMessage
297+
New-ArgumentException -ArgumentName 'Edition, ProductKey' -Message $errorMessage
298298
}
299299

300300
if (-not (Test-Path -Path $SourcePath) -or (Get-Item -Path $SourcePath).Extension -ne '.exe')
301301
{
302302
$errorMessage = $script:localizedData.SourcePathNotFound -f $SourcePath
303-
New-InvalidArgumentException -ArgumentName 'SourcePath' -Message $errorMessage
303+
New-ArgumentException -ArgumentName 'SourcePath' -Message $errorMessage
304304
}
305305

306306
$InstanceName = $InstanceName.ToUpper()

‎source/DSCResources/DSC_SqlReplication/DSC_SqlReplication.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function Set-TargetResource
232232
if (($DistributorMode -eq 'Remote') -and (-not $RemoteDistributor))
233233
{
234234
$errorMessage = $script:localizedData.NoRemoteDistributor
235-
New-InvalidArgumentException -ArgumentName 'RemoteDistributor' -Message $errorMessage
235+
New-ArgumentException -ArgumentName 'RemoteDistributor' -Message $errorMessage
236236
}
237237

238238
$sqlMajorVersion = Get-SqlInstanceMajorVersion -InstanceName $InstanceName

‎source/DSCResources/DSC_SqlServiceAccount/DSC_SqlServiceAccount.psm1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ function Get-ServiceObject
322322
if (($ServiceType -eq 'IntegrationServices') -and ([String]::IsNullOrEmpty($VersionNumber)))
323323
{
324324
$errorMessage = $script:localizedData.MissingParameter -f $ServiceType
325-
New-InvalidArgumentException -Message $errorMessage -ArgumentName 'VersionNumber'
325+
New-ArgumentException -Message $errorMessage -ArgumentName 'VersionNumber'
326326
}
327327

328328
# Load the SMO libraries
@@ -578,7 +578,7 @@ function Get-SqlServiceName
578578
else
579579
{
580580
$errorMessage = $script:localizedData.UnknownServiceType -f $ServiceType
581-
New-InvalidArgumentException -Message $errorMessage -ArgumentName 'ServiceType'
581+
New-ArgumentException -Message $errorMessage -ArgumentName 'ServiceType'
582582
}
583583

584584
if ([System.String]::IsNullOrEmpty($serviceNamingScheme))

0 commit comments

Comments
 (0)