LastDeploymentFailed behaviour fixed + version 2.x bump

keesschollaart81 · Nov 18, 2017 · fff830e · fff830e
1 parent 0d36632
commit fff830e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/arm-outputs/arm-outputs.ps1 b/arm-outputs/arm-outputs.ps1
@@ -2,12 +2,13 @@ Write-Verbose "Entering script arm-outputs.ps1"
 
 Write-Debug "ResourceGroupName= $resourceGroupName"
 
+$lastResourceGroupDeployments = Get-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName | Sort-Object Timestamp -Descending       
 $lastResourceGroupDeployment = $lastResourceGroupDeployments | Select-Object -First 1      
 
 if ($whenLastDeploymentIsFailed -eq "latestSuccesful" ) {
     $lastDeploymentStatus = $lastResourceGroupDeployment.ProvisioningState
     if ($lastResourceGroupDeployment -and $lastDeploymentStatus -ne "Succeeded") {
-        Write-Debug "Last deployment of Resource Group '$resourceGroupName' did not succeed ('$lastDeploymentStatus'), ingoring this deployment and finding latest succesful deployment"
+        Write-Verbose "Last deployment of Resource Group '$resourceGroupName' did not succeed ('$lastDeploymentStatus'), ingoring this deployment and finding latest succesful deployment"
     }
     $lastResourceGroupDeployments = $lastResourceGroupDeployments | Where-Object {$_.ProvisioningState -eq "Succeeded"} 
 }
@@ -20,8 +21,7 @@ if (!$lastResourceGroupDeployment) {
 
 $lastDeploymentStatus = $lastResourceGroupDeployment.ProvisioningState
 if ($whenLastDeploymentIsFailed -eq "fail" -and $lastDeploymentStatus -ne "Succeeded") {
-    Write-Error "Last deployment of Resource Group '$resourceGroupName' did not succeed (status '$lastDeploymentStatus')"
-    return;
+    throw "Last deployment of Resource Group '$resourceGroupName' did not succeed (status '$lastDeploymentStatus')"
 }
 
 if (!$lastResourceGroupDeployment.Outputs) {

diff --git a/arm-outputs/run-vsts.ps1 b/arm-outputs/run-vsts.ps1
@@ -6,5 +6,6 @@ Initialize-Azure
 $resourceGroupName = Get-VstsInput -Name resourceGroupName -Require
 $prefix = Get-VstsInput -Name prefix
 $outputNames = Get-VstsInput -Name outputNames
+$whenLastDeploymentIsFailed = Get-VstsInput -Name whenLastDeploymentIsFailed
 
 .\arm-outputs.ps1
diff --git a/arm-outputs/task.json b/arm-outputs/task.json
@@ -11,9 +11,9 @@
     ],
     "author": "Kees Schollaart",
     "version": {
-        "Major": 1,
-        "Minor": 15,
-        "Patch": 0
+        "Major": 2,
+        "Minor": 0,
+        "Patch": 2
     },
     "demands": [
         "azureps"

diff --git a/vss-extension.json b/vss-extension.json
@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "arm-outputs",
     "name": "ARM Outputs",
-    "version": "1.1.2",
+    "version": "2.0.6",
     "publisher": "keesschollaart",
     "public": true,
     "helpMarkDown": "[More Information](https://github.com/keesschollaart81/vsts-arm-outputs)",