Skip to content

Commit 3cd3564

Browse files
EshitaDEshitaD
authored
Fix to convert ServerName to lowercase in SqlAzureDacPacDeploymentV1 (#20182)
* Fix to convert servername to lower case in SqlAzureDacPacDeploymentV1 * versions bumped due to changes in common: AzureFileCopyV2, AzureFileCopyV3
1 parent 856997c commit 3cd3564

File tree

40 files changed

+90
-92
lines changed

40 files changed

+90
-92
lines changed

‎Tasks/AzureFileCopyV1/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 242,
17-
"Patch": 2
16+
"Minor": 243,
17+
"Patch": 0
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV1/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 242,
17-
"Patch": 2
16+
"Minor": 243,
17+
"Patch": 0
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV2/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV2/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV3/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 3,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV3/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 3,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV4/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 4,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV4/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 4,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV5/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 5,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV5/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 5,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV6/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 6,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/AzureFileCopyV6/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 6,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"

‎Tasks/Common/VstsAzureRestHelpers_/VstsAzureRestHelpers_.psm1

+2-4
Original file line numberDiff line numberDiff line change
@@ -929,10 +929,6 @@ function Get-AzureSqlDatabaseServerResourceId {
929929
$serverType = "Microsoft.Sql/servers"
930930
$subscriptionId = $endpoint.Data.SubscriptionId.ToLower()
931931

932-
if ($serverName -ne $null -and $serverName -ne '') {
933-
$serverName = $serverName.ToLower()
934-
}
935-
936932
Write-Verbose "[Azure Rest Call] Get Resource Groups"
937933
$method = "GET"
938934
$uri = "$($endpoint.Url)/subscriptions/$subscriptionId/resources?api-version=$apiVersion"
@@ -943,6 +939,8 @@ function Get-AzureSqlDatabaseServerResourceId {
943939
$ResourceDetails = Invoke-RestMethod -Uri $uri -Method $method -Headers $headers -ContentType $script:jsonContentType
944940
foreach ($resourceDetail in $ResourceDetails.Value) {
945941
if ($resourceDetail.name -eq $serverName -and $resourceDetail.type -eq $serverType) {
942+
$serverNameLower = $serverName.ToLower()
943+
$resourcedetail.id = $resourcedetail.id.Replace($serverName, $serverNameLower)
946944
return $resourceDetail.id
947945
}
948946
}

‎Tasks/SqlAzureDacpacDeploymentV1/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 1,
19-
"Minor": 242,
20-
"Patch": 1
19+
"Minor": 243,
20+
"Patch": 0
2121
},
2222
"demands": [
2323
"sqlpackage"

‎Tasks/SqlAzureDacpacDeploymentV1/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"author": "Microsoft Corporation",
1717
"version": {
1818
"Major": 1,
19-
"Minor": 242,
20-
"Patch": 1
19+
"Minor": 243,
20+
"Patch": 0
2121
},
2222
"demands": [
2323
"sqlpackage"

‎_generated/AzureFileCopyV2.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|2.243.2
2-
Node20_229_2|2.243.3
1+
Default|2.243.4
2+
Node20_229_2|2.243.5

‎_generated/AzureFileCopyV2/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"
@@ -374,7 +374,7 @@
374374
"ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
375375
},
376376
"_buildConfigMapping": {
377-
"Default": "2.243.2",
378-
"Node20_229_2": "2.243.3"
377+
"Default": "2.243.4",
378+
"Node20_229_2": "2.243.5"
379379
}
380380
}

‎_generated/AzureFileCopyV2/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"
@@ -374,7 +374,7 @@
374374
"ExpiredServicePrincipal": "ms-resource:loc.messages.ExpiredServicePrincipal"
375375
},
376376
"_buildConfigMapping": {
377-
"Default": "2.243.2",
378-
"Node20_229_2": "2.243.3"
377+
"Default": "2.243.4",
378+
"Node20_229_2": "2.243.5"
379379
}
380380
}

‎_generated/AzureFileCopyV2_Node20/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 243,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"demands": [
2020
"azureps"
@@ -378,7 +378,7 @@
378378
"ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
379379
},
380380
"_buildConfigMapping": {
381-
"Default": "2.243.2",
382-
"Node20_229_2": "2.243.3"
381+
"Default": "2.243.4",
382+
"Node20_229_2": "2.243.5"
383383
}
384384
}

‎_generated/AzureFileCopyV2_Node20/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 243,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"demands": [
2020
"azureps"
@@ -378,7 +378,7 @@
378378
"ExpiredServicePrincipal": "ms-resource:loc.messages.ExpiredServicePrincipal"
379379
},
380380
"_buildConfigMapping": {
381-
"Default": "2.243.2",
382-
"Node20_229_2": "2.243.3"
381+
"Default": "2.243.4",
382+
"Node20_229_2": "2.243.5"
383383
}
384384
}

‎_generated/AzureFileCopyV3.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|3.243.2
2-
Node20_229_2|3.243.3
1+
Default|3.243.4
2+
Node20_229_2|3.243.5

‎_generated/AzureFileCopyV3/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 3,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"
@@ -313,7 +313,7 @@
313313
"ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
314314
},
315315
"_buildConfigMapping": {
316-
"Default": "3.243.2",
317-
"Node20_229_2": "3.243.3"
316+
"Default": "3.243.4",
317+
"Node20_229_2": "3.243.5"
318318
}
319319
}

‎_generated/AzureFileCopyV3/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 3,
1616
"Minor": 243,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [
2020
"azureps"
@@ -313,7 +313,7 @@
313313
"ExpiredServicePrincipal": "ms-resource:loc.messages.ExpiredServicePrincipal"
314314
},
315315
"_buildConfigMapping": {
316-
"Default": "3.243.2",
317-
"Node20_229_2": "3.243.3"
316+
"Default": "3.243.4",
317+
"Node20_229_2": "3.243.5"
318318
}
319319
}

‎_generated/AzureFileCopyV3_Node20/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 3,
1616
"Minor": 243,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"demands": [
2020
"azureps"
@@ -317,7 +317,7 @@
317317
"ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
318318
},
319319
"_buildConfigMapping": {
320-
"Default": "3.243.2",
321-
"Node20_229_2": "3.243.3"
320+
"Default": "3.243.4",
321+
"Node20_229_2": "3.243.5"
322322
}
323323
}

‎_generated/AzureFileCopyV3_Node20/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 3,
1616
"Minor": 243,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"demands": [
2020
"azureps"
@@ -317,7 +317,7 @@
317317
"ExpiredServicePrincipal": "ms-resource:loc.messages.ExpiredServicePrincipal"
318318
},
319319
"_buildConfigMapping": {
320-
"Default": "3.243.2",
321-
"Node20_229_2": "3.243.3"
320+
"Default": "3.243.4",
321+
"Node20_229_2": "3.243.5"
322322
}
323323
}

‎_generated/AzureFileCopyV4.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|4.243.0
2-
Node20_229_2|4.243.1
1+
Default|4.243.2
2+
Node20_229_2|4.243.3

‎_generated/AzureFileCopyV4/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 4,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"
@@ -301,7 +301,7 @@
301301
"ServicePrincipalError": "There was an error with the service principal used for the deployment."
302302
},
303303
"_buildConfigMapping": {
304-
"Default": "4.243.0",
305-
"Node20_229_2": "4.243.1"
304+
"Default": "4.243.2",
305+
"Node20_229_2": "4.243.3"
306306
}
307307
}

‎_generated/AzureFileCopyV4/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 4,
1616
"Minor": 243,
17-
"Patch": 0
17+
"Patch": 2
1818
},
1919
"demands": [
2020
"azureps"
@@ -301,7 +301,7 @@
301301
"ServicePrincipalError": "ms-resource:loc.messages.ServicePrincipalError"
302302
},
303303
"_buildConfigMapping": {
304-
"Default": "4.243.0",
305-
"Node20_229_2": "4.243.1"
304+
"Default": "4.243.2",
305+
"Node20_229_2": "4.243.3"
306306
}
307307
}

‎_generated/AzureFileCopyV4_Node20/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 4,
1616
"Minor": 243,
17-
"Patch": 1
17+
"Patch": 3
1818
},
1919
"demands": [
2020
"azureps"
@@ -305,7 +305,7 @@
305305
"ServicePrincipalError": "There was an error with the service principal used for the deployment."
306306
},
307307
"_buildConfigMapping": {
308-
"Default": "4.243.0",
309-
"Node20_229_2": "4.243.1"
308+
"Default": "4.243.2",
309+
"Node20_229_2": "4.243.3"
310310
}
311311
}

0 commit comments

Comments
 (0)