Merge pull request #4665 from Microsoft/Microsoft/users/raagra/sqlAzureUsernameAtSymbolFix117

Microsoft/users/raagra/sql azure username at symbol fix117

Author: rajatagrawal-dev

Tasks/SqlAzureDacpacDeployment/Tests/L0.ts

@@ -83,5 +83,8 @@ describe('SqlAzureDacpacDeployment - Utility Suite', function () {
         it('Validate SQL Package Command Line Arguments (Get-SqlPackageCommandArguments)', (done) => {
             psr.run(path.join(__dirname, 'L0UtilityGetSqlCmdArgs.ps1'), done);
         });
+        it('Validate Username (Get-FormattedSqlUsername)', (done) => {
+            psr.run(path.join(__dirname, 'L0UtilityFormatUsername.ps1'), done);
+        });
     }
 });

Tasks/SqlAzureDacpacDeployment/Tests/L0UtilityFormatUsername.ps1

@@ -0,0 +1,18 @@
+[CmdletBinding()]
+param()
+
+. $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
+. $PSScriptRoot\MockVariable.ps1
+
+#path to Utility.ps1 for SqlAzureDacpacDeployment task
+. "$PSScriptRoot\..\Utility.ps1"
+
+$formattedSqlUsername = Get-FormattedSqlUsername -sqlUserName $sqlUsername -serverName $serverName
+Assert-AreEqual  $sqlUsername $formattedSqlUsername
+
+$formattedSqlUsername = Get-FormattedSqlUsername -sqlUserName $sqlUsernameWithServerName -serverName $serverName
+Assert-AreEqual  $sqlUsernameWithServerName $formattedSqlUsername
+
+$formattedSqlUsername = Get-FormattedSqlUsername -sqlUserName $sqlUsernameWithAtSymbol -serverName $serverName
+$expectedUsername = $sqlUsernameWithAtSymbol + "@" + $serverName
+Assert-AreEqual  $expectedUsername $formattedSqlUsername

Tasks/SqlAzureDacpacDeployment/Tests/MockVariable.ps1

@@ -39,6 +39,8 @@ $serverName = "a0nuel7r2k.database.windows.net"
 $serverFriendlyName = "a0nuel7r2k"
 $databaseName = "TestDatabase"
 $sqlUsername = "TestUser"
+$sqlUsernameWithServerName = "[email protected]"
+$sqlUsernameWithAtSymbol = "TestUser@123"
 $sqlPassword = "TestPassword"
 $publishProfile = "C:\Test\publish.xml"
 $ipDetectionMethodAuto = "AutoDetect"

Tasks/SqlAzureDacpacDeployment/Utility.ps1

@@ -9,6 +9,29 @@ function Check-ServerName
     }
 }
 
+function Get-FormattedSqlUsername
+{
+    param(
+        [String] $sqlUserName,
+        [String] $serverName
+    )
+
+    if ($serverName)
+    {
+        $serverNameSplittedArgs = $serverName.Trim().Split(".")
+        if ($serverNameSplittedArgs.Length -gt 0)
+        {
+            $sqlServerFirstName = $serverNameSplittedArgs[0]
+            if ((-not $sqlUsername.Trim().Contains("@" + $sqlServerFirstName)) -and $sqlUsername.Contains('@'))
+            {
+                $sqlUsername = $sqlUsername + "@" + $serverName 
+            }
+        }
+    }
+
+    return $sqlUsername
+}
+
 function Get-AgentIPRange
 {
     param(
@@ -21,7 +44,15 @@ function Get-AgentIPRange
 
     $sqlCmd = Join-Path -Path $PSScriptRoot -ChildPath "sqlcmd\SQLCMD.exe"
     $env:SQLCMDPASSWORD = $sqlPassword
-    $sqlCmdArgs = "-S `"$serverName`" -U `"$sqlUsername`" -Q `"select getdate()`""
+
+    $formattedSqlUsername = $sqlUserName
+
+    if($sqlUserName)
+    {
+        $formattedSqlUsername = Get-FormattedSqlUsername -sqlUserName $sqlUserName -serverName $serverName
+    }
+
+    $sqlCmdArgs = "-S `"$serverName`" -U `"$formattedSqlUsername`" -Q `"select getdate()`""
 
     Write-Verbose "Reaching SqlServer to check connection by running sqlcmd.exe $sqlCmdArgs"
 
@@ -144,18 +175,7 @@ function Get-SqlPackageCommandArguments
 
         if($sqlUsername)
         {
-            if ($serverName)
-            {
-                $serverNameSplittedArgs = $serverName.Trim().Split(".")
-                if ($serverNameSplittedArgs.Length -gt 0)
-                {
-                    $sqlServerFirstName = $serverNameSplittedArgs[0]
-                    if ((-not $sqlUsername.Trim().Contains("@" + $sqlServerFirstName)) -and $sqlUsername.Contains('@'))
-                    {
-                        $sqlUsername = $sqlUsername + "@" + $serverName 
-                    }
-                }
-            }
+            $sqlUsername = Get-FormattedSqlUsername -sqlUserName $sqlUsername -serverName $serverName
 
             $sqlPackageArguments += @($SqlPackageOptions.TargetUser + "`"$sqlUsername`"")
             if(-not($sqlPassword))

Tasks/SqlAzureDacpacDeployment/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 1,
-        "Patch": 15
+        "Patch": 16
     },
     "demands": [
         "sqlpackage"

Tasks/SqlAzureDacpacDeployment/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 1,
-    "Patch": 15
+    "Patch": 16
   },
   "demands": [
     "sqlpackage"