From 3bb7c8d52fcae42e4fc84495fe8b3c1ceede5f3d Mon Sep 17 00:00:00 2001 From: Luke Kysow <1034429+lkysow@users.noreply.github.com> Date: Fri, 4 Jan 2019 09:26:06 -0500 Subject: [PATCH] Fix version detection so it works with tf 0.12alph --- server/events/terraform/terraform_client.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/events/terraform/terraform_client.go b/server/events/terraform/terraform_client.go index cab3baaef..19019a62a 100644 --- a/server/events/terraform/terraform_client.go +++ b/server/events/terraform/terraform_client.go @@ -41,8 +41,13 @@ type DefaultClient struct { const terraformPluginCacheDirName = "plugin-cache" -// zeroPointNine constrains the version to be 0.9.* -var versionRegex = regexp.MustCompile("Terraform v(.*)\n") +// versionRegex extracts the version from `terraform version` output. +// Terraform v0.12.0-alpha4 (2c36829d3265661d8edbd5014de8090ea7e2a076) +// => 0.12.0-alpha4 +// +// Terraform v0.11.10 +// => 0.11.10 +var versionRegex = regexp.MustCompile("Terraform v(.*?)(\\s.*)?\n") func NewClient(dataDir string) (*DefaultClient, error) { _, err := exec.LookPath("terraform")