diff --git a/images/win/scripts/Installers/Validate-SQLExpress.ps1 b/images/win/scripts/Installers/Validate-SQLExpress.ps1
index fc54a4d0..106a5b7d 100644
--- a/images/win/scripts/Installers/Validate-SQLExpress.ps1
+++ b/images/win/scripts/Installers/Validate-SQLExpress.ps1
@@ -2,29 +2,30 @@
## File: Validate-SQLExpress.ps1
## Desc: Validate Microsoft SQL Express installation
################################################################################
+
+#Parameters for database access
+$sqlUser = "sa"
+$sqlPassword = "P@ssword!!"
+$sqlInstance = "SQL2019"
+
function Test-SqlConnection {
param(
[Parameter(Mandatory)]
[string]$ServerName,
-
[Parameter(Mandatory)]
[string]$IntegratedSecurity,
-
[Parameter(Mandatory)]
[string]$UserName,
-
[Parameter(Mandatory)]
[string]$Password
)
-
$ErrorActionPreference = 'Stop'
-
try {
$connectionString = 'Server={0};Integrated Security={1};User ID={2};Password={3}' -f $ServerName,$IntegratedSecurity,$UserName,$Password
Write-Host -Object "Trying to connect to SQL Express instance: $ServerName"
$sqlConnection = New-Object System.Data.SqlClient.SqlConnection $connectionString
$sqlConnection.Open()
- Write-Host -Object "Connection to database: {0} in in was successful. Version of SQL Express is: {1}" -f $sqlConnection.Database,$sqlConnection.ServerVersion
+ Write-Host -Object "Connection to database: {0} was successful. Version of SQL Express is: {1}" -f $sqlConnection.Database,$sqlConnection.ServerVersion
return $sqlConnection.ServerVersion
} catch {
Write-Host -Object "Connection to SQL Express cannot be established."
@@ -34,17 +35,16 @@ function Test-SqlConnection {
$sqlConnection.Close()
}
}
-$instanceName = "$env:computername\SQL2019"
-$version = Test-SqlConnection -ServerName $instanceName -IntegratedSecurity "false" -UserName "sa" -Password "P@ssword!!"
+$instanceName = "$env:computername\$sqlInstance"
+$version = Test-SqlConnection -ServerName $instanceName -IntegratedSecurity "false" -UserName $sqlUser -Password $sqlPassword
# Adding description of the software to Markdown
$SoftwareName = "Git"
-
$Description = @"
_Version:_ $version
-_InstanceName:_ SQL2019
-_Username:_ sa
-_Password:_ P@ssword!!
+_InstanceName:_ $sqlInstance
+_Username:_ $sqlUser
+_Password:_ $sqlPassword
_Default Path:_ C:\Program Files (x86)\Microsoft SQL Server
"@