Skip to content

Commit 8552daa

Browse files
author
Ajay Kumar Yadav
authored
revert external contribution (#7285)
* revert external contribution * Update Publish-AzureCloudDeployment.ps1
1 parent 8e85bef commit 8552daa

File tree

4 files changed

+27
-29
lines changed

4 files changed

+27
-29
lines changed

‎Tasks/AzureCloudPowerShellDeployment/Publish-AzureCloudDeployment.ps1‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,26 @@ try{
102102
#Use -Upgrade -Mode Simultaneous -Force
103103
if ($label)
104104
{
105-
  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration <extensions> -Force"
106-
  $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions -Force
105+
Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration <extensions> -Force"
106+
$azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions -Force
107107
}
108108
else
109109
{
110-
  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration <extensions> -Force"
111-
  $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration $diagnosticExtensions -Force
110+
Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration <extensions> -Force"
111+
$azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration $diagnosticExtensions -Force
112112
}
113113
}
114114
elseif ($AllowUpgrade -eq $true -and $SimultaneousUpgrade -eq $true)
115115
{
116116
#Use -Upgrade -Mode Simultaneous
117117
if ($label)
118118
{
119-
  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration <extensions>"
120-
  $azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions
119+
Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration <extensions>"
120+
$azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -Label $label -ExtensionConfiguration $diagnosticExtensions
121121
}
122122
else
123123
{
124-
  Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration <extensions>"
124+
Write-Host "##[command]Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration <extensions>"
125125
$azureDeployment = Set-AzureDeployment -Upgrade -ServiceName $ServiceName -Package $servicePackageFile -Configuration $serviceConfigFile -Slot $Slot -Mode Simultaneous -ExtensionConfiguration $diagnosticExtensions
126126
}
127127
}
@@ -172,8 +172,6 @@ try{
172172

173173

174174
} finally {
175-
Write-Verbose "Validate-ServiceStatus -ServiceName $ServiceName -Slot $Slot"
176-
Validate-ServiceStatus -ServiceName $ServiceName -Slot $Slot
177-
Trace-VstsLeavingInvocation $MyInvocation
175+
Trace-VstsLeavingInvocation $MyInvocation
178176
}
179177

‎Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/en-US/resources.resjson‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@
3636
"loc.input.help.NewServiceAdditionalArguments": "Pass in additional arguments while creating a brand new service. These will be passed on to `New-AzureService` cmdlet. Eg: `-Label 'MyTestService'`",
3737
"loc.input.label.NewServiceAffinityGroup": "Affinity group",
3838
"loc.input.help.NewServiceAffinityGroup": "While creating new service, this affinity group will be considered instead of using service location.",
39-
"loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "'{0}' could not be parsed into parts for registering diagnostics extensions.",
40-
"loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
41-
"loc.messages.AllInstancesReadyRole0status": "All instances are in ReadyRole state now, and instances count is '{0}' ",
42-
"loc.messages.Applyinganyconfigureddiagnosticsextensions": "Applying any configured diagnostics extensions.",
4339
"loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "Could not get the primary storage key for storage account '{0}'. Unable to apply any diagnostics extensions.",
4440
"loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "Could not get the primary storage key for the public config storage account '{0}'. Unable to apply any diagnostics extensions.",
41+
"loc.messages.Applyinganyconfigureddiagnosticsextensions": "Applying any configured diagnostics extensions.",
42+
"loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "'{0}' could not be parsed into parts for registering diagnostics extensions.",
43+
"loc.messages.Nofileswerefoundtodeploywithsearchpattern0": "No files were found to deploy with search pattern {0}",
44+
"loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Found more than one file to deploy with search pattern {0}. There can be only one.",
45+
"loc.messages.Storagekeysaredefinedininvalidformat": "Storage keys are defined in invalid format.",
46+
"loc.messages.Unabletofind0usingprovidedsubscription": "Unable to find {0} using provided subscription",
4547
"loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Current version of azure powershell does not support external storage account for configuring diagnostics.",
4648
"loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format.",
49+
"loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
50+
"loc.messages.AllInstancesReadyRole0status": "All instances are in ReadyRole state now, and instances count is '{0}' ",
4751
"loc.messages.EachInstancesNameAndStatus0": "Status is 'ReadyRole' for the Instance name '{0}'",
48-
"loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Found more than one file to deploy with search pattern {0}. There can be only one.",
4952
"loc.messages.Instance0Name": "Service instance name {0} to find status",
50-
"loc.messages.Nofileswerefoundtodeploywithsearchpattern0": "No files were found to deploy with search pattern '{0}'",
51-
"loc.messages.RetryForService0Availablity": "Retried for service availablity for 4 times, 30 secs each, after 4 retries still srevice not avilable, check teh srevice dpeloyment again",
53+
"loc.messages.RetryForService0Availablity": "Retried for service availability for 4 times, 30 secs each, after 4 retries still service not available, check teh service deployment again",
5254
"loc.messages.Role0OrRoleInstanceNotfound": "Either Role or Role Instance not found for a service '{0}'",
5355
"loc.messages.ServiceNotFound0": "Either Service not found or Test AzureName returned nothing for service '{0}'",
54-
"loc.messages.Storagekeysaredefinedininvalidformat": "Storage keys are defined in invalid format.",
55-
"loc.messages.Unabletofind0usingprovidedsubscription": "Unable to find {0} using provided subscription",
5656
"loc.messages.Unabletofindservicestatus0": "Status is not 'ReadyRole' for instance name '{0}'",
5757
"loc.messages.WaitingForInstance0Beforefindstatus": "Service not yet ready sleeping for 120 seconds ...Waiting for roles of '{0}' to come on-line..",
5858
"loc.messages.WaitingForService0Available": "Service not yet ready sleeping for 210 seconds ... retry the task again"

‎Tasks/AzureCloudPowerShellDeployment/task.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"version": {
1717
"Major": 1,
1818
"Minor": 3,
19-
"Patch": 4
19+
"Patch": 5
2020
},
2121
"demands": [
2222
"azureps"

‎Tasks/AzureCloudPowerShellDeployment/task.loc.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"version": {
1717
"Major": 1,
1818
"Minor": 3,
19-
"Patch": 4
19+
"Patch": 5
2020
},
2121
"demands": [
2222
"azureps"
@@ -222,23 +222,23 @@
222222
}
223223
},
224224
"messages": {
225-
"_0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "ms-resource:loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions",
226-
"Addinganyconfiguredcustomcertificates": "ms-resource:loc.messages.Addinganyconfiguredcustomcertificates",
227-
"AllInstancesReadyRole0status": "ms-resource:loc.messages.AllInstancesReadyRole0status",
228-
"Applyinganyconfigureddiagnosticsextensions": "ms-resource:loc.messages.Applyinganyconfigureddiagnosticsextensions",
229225
"Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "ms-resource:loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions",
230226
"Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "ms-resource:loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions",
227+
"Applyinganyconfigureddiagnosticsextensions": "ms-resource:loc.messages.Applyinganyconfigureddiagnosticsextensions",
228+
"_0couldnotbeparsedintopartsforregisteringdiagnosticsextensions": "ms-resource:loc.messages._0couldnotbeparsedintopartsforregisteringdiagnosticsextensions",
229+
"Nofileswerefoundtodeploywithsearchpattern0": "ms-resource:loc.messages.Nofileswerefoundtodeploywithsearchpattern0",
230+
"Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "ms-resource:loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone",
231+
"Storagekeysaredefinedininvalidformat": "ms-resource:loc.messages.Storagekeysaredefinedininvalidformat",
232+
"Unabletofind0usingprovidedsubscription": "ms-resource:loc.messages.Unabletofind0usingprovidedsubscription",
231233
"Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "ms-resource:loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics",
232234
"Customcertificatesaredefinedininvalidformat": "ms-resource:loc.messages.Customcertificatesaredefinedininvalidformat",
235+
"Addinganyconfiguredcustomcertificates": "ms-resource:loc.messages.Addinganyconfiguredcustomcertificates",
236+
"AllInstancesReadyRole0status": "ms-resource:loc.messages.AllInstancesReadyRole0status",
233237
"EachInstancesNameAndStatus0": "ms-resource:loc.messages.EachInstancesNameAndStatus0",
234-
"Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "ms-resource:loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone",
235238
"Instance0Name": "ms-resource:loc.messages.Instance0Name",
236-
"Nofileswerefoundtodeploywithsearchpattern0": "ms-resource:loc.messages.Nofileswerefoundtodeploywithsearchpattern0",
237239
"RetryForService0Availablity": "ms-resource:loc.messages.RetryForService0Availablity",
238240
"Role0OrRoleInstanceNotfound": "ms-resource:loc.messages.Role0OrRoleInstanceNotfound",
239241
"ServiceNotFound0": "ms-resource:loc.messages.ServiceNotFound0",
240-
"Storagekeysaredefinedininvalidformat": "ms-resource:loc.messages.Storagekeysaredefinedininvalidformat",
241-
"Unabletofind0usingprovidedsubscription": "ms-resource:loc.messages.Unabletofind0usingprovidedsubscription",
242242
"Unabletofindservicestatus0": "ms-resource:loc.messages.Unabletofindservicestatus0",
243243
"WaitingForInstance0Beforefindstatus": "ms-resource:loc.messages.WaitingForInstance0Beforefindstatus",
244244
"WaitingForService0Available": "ms-resource:loc.messages.WaitingForService0Available"

0 commit comments

Comments
 (0)