From c3d7ec00c670e390a0e1512f27b1c307561444ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Groenewegen=20=E2=98=81=20=F0=9F=9B=A0?= Date: Fri, 26 Jul 2019 10:47:12 -0700 Subject: [PATCH] Remove the planpath from the init because it breaks some scenarios #29 --- Xpirit-Vsts-Release-Terraform/task.json | 4 ++-- Xpirit-Vsts-Release-Terraform/terraform.ps1 | 17 +---------------- extension-manifest.json | 2 +- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Xpirit-Vsts-Release-Terraform/task.json b/Xpirit-Vsts-Release-Terraform/task.json index f3727c9..02d29e9 100644 --- a/Xpirit-Vsts-Release-Terraform/task.json +++ b/Xpirit-Vsts-Release-Terraform/task.json @@ -9,8 +9,8 @@ "author": "Peter Groenewegen - Xpirit", "version": { "Major": 2, - "Minor": 3, - "Patch": 2 + "Minor": 4, + "Patch": 0 }, "demands": [ "azureps" ], "minimumAgentVersion": "1.95.0", diff --git a/Xpirit-Vsts-Release-Terraform/terraform.ps1 b/Xpirit-Vsts-Release-Terraform/terraform.ps1 index c2147b7..ea8d485 100644 --- a/Xpirit-Vsts-Release-Terraform/terraform.ps1 +++ b/Xpirit-Vsts-Release-Terraform/terraform.ps1 @@ -139,22 +139,7 @@ function Initialize-Terraform $arguments = $remoteStateArguments + " $($defaultArgs.Trim())" } - $plandir = (Get-VstsInput -Name PlanPath) - - if (-not ([string]::IsNullOrEmpty($plandir))){ - if (-not ((Get-Item $plandir) -is [System.IO.DirectoryInfo])){ - if (Test-Path -Path $plandir){ - $plandir = (Get-Item $plandir).Directory.FullName - } - else { - Write-Host "##vso[task.logissue type=warning;] PlanPath contains an invalid path/file" - } - } - } - - $args = "$arguments $plandir".Trim() - - Invoke-VstsTool -FileName terraform -arguments "init $args" + Invoke-VstsTool -FileName terraform -arguments "init $arguments" if ($LASTEXITCODE) { diff --git a/extension-manifest.json b/extension-manifest.json index f947e76..bf679a4 100644 --- a/extension-manifest.json +++ b/extension-manifest.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "PeterGroenewegen-Xpirit-Vsts-Release-Terraform", "name": "Terraform", - "version": "2.3.2", + "version": "2.4.0", "publisher": "petergroenewegen", "public": true, "targets": [