Terraform version detection and v14 (#73)

* 'terraform version' parsing switch to support wrapper as in setup-terraform github action * Repeating v13 tests for v14 * CR: merge 13&14 test suites Co-authored-by: Roni Frantchi <roni-frantchi@users.noreply.github.com>
env0 · Dec 20, 2020 · 1712989 · 1712989
1 parent 1126c12
commit 1712989
Show file tree

Hide file tree

Showing 54 changed files with 292 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        terraform_version: [11,12,13]
+        terraform_version: [11,12,13,14]
 
     steps:
       - name: Set up Go 1.x
@@ -41,7 +41,7 @@ jobs:
           echo "$GITHUB_WORKSPACE/.tfenv/bin" >> $GITHUB_PATH
 
       - name: Install terraform
-        working-directory: test/fixture/terraform_${{ matrix.terraform_version }}
+        working-directory: test/tfenvconf/terraform_${{ matrix.terraform_version }}
         run: |
           tfenv install
           tfenv use

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Maintaining tags across your application is hard, especially when done manually.
 
 ## How?
 ### Prerequisites
-- Terraform 0.11, 0.12 or 0.13
+- Terraform 0.11, 0.12, 0.13 or 0.14
 
 ### Usage
 1. Install from homebrew:

diff --git a/go.mod b/go.mod
@@ -7,11 +7,9 @@ require (
 	github.com/hashicorp/go-hclog v0.9.2
 	github.com/hashicorp/hcl/v2 v2.8.0
 	github.com/hashicorp/logutils v1.0.0
-	github.com/minamijoyo/tfschema v0.5.1-0.20201012140620-226d0de9aed6
+	github.com/minamijoyo/tfschema v0.6.0
 	github.com/onsi/gomega v1.10.1
 	github.com/otiai10/copy v1.2.0
 	github.com/thoas/go-funk v0.5.0
-	github.com/zclconf/go-cty v1.5.1
-	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
-	google.golang.org/protobuf v1.24.0 // indirect
+	github.com/zclconf/go-cty v1.7.0
 )
diff --git a/go.sum b/go.sum
diff --git a/terraform/terraform.go b/terraform/terraform.go
@@ -2,33 +2,43 @@ package terraform
 
 import (
 	"encoding/json"
-	"github.com/bmatcuk/doublestar"
-	"github.com/env0/terratag/errors"
-	"github.com/hashicorp/hcl/v2/hclwrite"
-	"github.com/thoas/go-funk"
 	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
+	"strconv"
 	"strings"
+
+	"github.com/bmatcuk/doublestar"
+	"github.com/env0/terratag/errors"
+	"github.com/hashicorp/hcl/v2/hclwrite"
+	"github.com/thoas/go-funk"
 )
 
 func GetTerraformVersion() int {
 	output, err := exec.Command("terraform", "version").Output()
 	outputAsString := strings.TrimSpace(string(output))
 	errors.PanicOnError(err, &outputAsString)
 
-	if strings.HasPrefix(outputAsString, "Terraform v0.11") {
-		return 11
-	} else if strings.HasPrefix(outputAsString, "Terraform v0.12") {
-		return 12
-	} else if strings.HasPrefix(outputAsString, "Terraform v0.13") {
-		return 13
+	regularExpression := regexp.MustCompile(`Terraform v0\.(\d+)\.\d+`)
+	matches := regularExpression.FindStringSubmatch(outputAsString)
+	if matches == nil {
+		log.Fatalln("Unable to parse 'terraform version'")
+		return -1
+	}
+	minorVersion, err := strconv.Atoi(matches[1])
+	if err != nil {
+		log.Fatalln("Unable to parse ", matches[1], "as integer")
+		return -1
+	}
+	if minorVersion < 11 || minorVersion > 14 {
+		log.Fatalln("Terratag only supports Terraform 0.11.x, 0.12.x, 0.13.x and 0.14.x - your version says ", outputAsString)
+		return -1
 	}
 
-	log.Fatalln("Terratag only supports Terraform 0.11.x, 0.12.x and 0.13.x - your version says ", outputAsString)
-	return -1
+	return minorVersion
 }
 
 func GetResourceType(resource hclwrite.Block) string {

diff --git a/terratag_test.go b/terratag_test.go
@@ -36,7 +36,11 @@ func TestTerraform12(t *testing.T) {
 }
 
 func TestTerraform13(t *testing.T) {
-	testTerraform(t, "13")
+	testTerraform(t, "13_14")
+}
+
+func TestTerraform14(t *testing.T) {
+	testTerraform(t, "13_14")
 }
 
 func testTerraform(t *testing.T, version string) {

diff --git a/...toscaling_group/expected/main.terratag.tf → ...toscaling_group/expected/main.terratag.tf b/...toscaling_group/expected/main.terratag.tf → ...toscaling_group/expected/main.terratag.tf
diff --git a/...ws_autoscaling_group/expected/main.tf.bak → ...ws_autoscaling_group/expected/main.tf.bak b/...ws_autoscaling_group/expected/main.tf.bak → ...ws_autoscaling_group/expected/main.tf.bak
diff --git a/...rm_13/aws_autoscaling_group/input/main.tf → ...13_14/aws_autoscaling_group/input/main.tf b/...rm_13/aws_autoscaling_group/input/main.tf → ...13_14/aws_autoscaling_group/input/main.tf
diff --git a/...ubmodule/expected/child/child.terratag.tf → ...ubmodule/expected/child/child.terratag.tf b/...ubmodule/expected/child/child.terratag.tf → ...ubmodule/expected/child/child.terratag.tf
diff --git a/...aws_submodule/expected/child/child.tf.bak → ...aws_submodule/expected/child/child.tf.bak b/...aws_submodule/expected/child/child.tf.bak → ...aws_submodule/expected/child/child.tf.bak
diff --git a/..._13/aws_submodule/expected/parent/main.tf → ..._14/aws_submodule/expected/parent/main.tf b/..._13/aws_submodule/expected/parent/main.tf → ..._14/aws_submodule/expected/parent/main.tf
diff --git a/...orm_13/aws_submodule/input/child/child.tf → ..._13_14/aws_submodule/input/child/child.tf b/...orm_13/aws_submodule/input/child/child.tf → ..._13_14/aws_submodule/input/child/child.tf
diff --git a/...orm_13/aws_submodule/input/parent/main.tf → ..._13_14/aws_submodule/input/parent/main.tf b/...orm_13/aws_submodule/input/parent/main.tf → ..._13_14/aws_submodule/input/parent/main.tf
diff --git a/.../aws_tags_block/expected/main.terratag.tf → .../aws_tags_block/expected/main.terratag.tf b/.../aws_tags_block/expected/main.terratag.tf → .../aws_tags_block/expected/main.terratag.tf
diff --git a/...rm_13/aws_tags_block/expected/main.tf.bak → ...13_14/aws_tags_block/expected/main.tf.bak b/...rm_13/aws_tags_block/expected/main.tf.bak → ...13_14/aws_tags_block/expected/main.tf.bak
diff --git a/...terraform_13/aws_tags_block/input/main.tf → ...raform_13_14/aws_tags_block/input/main.tf b/...terraform_13/aws_tags_block/input/main.tf → ...raform_13_14/aws_tags_block/input/main.tf
diff --git a/...13/aws_tags_map/expected/main.terratag.tf → ...14/aws_tags_map/expected/main.terratag.tf b/...13/aws_tags_map/expected/main.terratag.tf → ...14/aws_tags_map/expected/main.terratag.tf
diff --git a/...form_13/aws_tags_map/expected/main.tf.bak → ...m_13_14/aws_tags_map/expected/main.tf.bak b/...form_13/aws_tags_map/expected/main.tf.bak → ...m_13_14/aws_tags_map/expected/main.tf.bak
diff --git a/...e/terraform_13/aws_tags_map/input/main.tf → ...erraform_13_14/aws_tags_map/input/main.tf b/...e/terraform_13/aws_tags_map/input/main.tf → ...erraform_13_14/aws_tags_map/input/main.tf
diff --git a/...ernetes_cluster/expected/main.terratag.tf → ...ernetes_cluster/expected/main.terratag.tf b/...ernetes_cluster/expected/main.terratag.tf → ...ernetes_cluster/expected/main.terratag.tf
diff --git a/...m_kubernetes_cluster/expected/main.tf.bak → ...m_kubernetes_cluster/expected/main.tf.bak b/...m_kubernetes_cluster/expected/main.tf.bak → ...m_kubernetes_cluster/expected/main.tf.bak
diff --git a/.../azurerm_kubernetes_cluster/input/main.tf → .../azurerm_kubernetes_cluster/input/main.tf b/.../azurerm_kubernetes_cluster/input/main.tf → .../azurerm_kubernetes_cluster/input/main.tf
diff --git a/...zurerm_tags_map/expected/main.terratag.tf → ...zurerm_tags_map/expected/main.terratag.tf b/...zurerm_tags_map/expected/main.terratag.tf → ...zurerm_tags_map/expected/main.terratag.tf
diff --git a/..._13/azurerm_tags_map/expected/main.tf.bak → ..._14/azurerm_tags_map/expected/main.tf.bak b/..._13/azurerm_tags_map/expected/main.tf.bak → ..._14/azurerm_tags_map/expected/main.tf.bak
diff --git a/...rraform_13/azurerm_tags_map/input/main.tf → ...form_13_14/azurerm_tags_map/input/main.tf b/...rraform_13/azurerm_tags_map/input/main.tf → ...form_13_14/azurerm_tags_map/input/main.tf
diff --git a/...estack_tags_map/expected/main.terratag.tf → ...estack_tags_map/expected/main.terratag.tf b/...estack_tags_map/expected/main.terratag.tf → ...estack_tags_map/expected/main.terratag.tf
diff --git a/.../azurestack_tags_map/expected/main.tf.bak → .../azurestack_tags_map/expected/main.tf.bak b/.../azurestack_tags_map/expected/main.tf.bak → .../azurestack_tags_map/expected/main.tf.bak
diff --git a/...form_13/azurestack_tags_map/input/main.tf → ...m_13_14/azurestack_tags_map/input/main.tf b/...form_13/azurestack_tags_map/input/main.tf → ...m_13_14/azurestack_tags_map/input/main.tf
diff --git a/...provider_not_from_prefix/expected/main.tf → ...provider_not_from_prefix/expected/main.tf b/...provider_not_from_prefix/expected/main.tf → ...provider_not_from_prefix/expected/main.tf
diff --git a/...ma_provider_not_from_prefix/input/main.tf → ...ma_provider_not_from_prefix/input/main.tf b/...ma_provider_not_from_prefix/input/main.tf → ...ma_provider_not_from_prefix/input/main.tf
diff --git a/...in_subfolders/expected/invalid/invalid.tf → ...in_subfolders/expected/invalid/invalid.tf b/...in_subfolders/expected/invalid/invalid.tf → ...in_subfolders/expected/invalid/invalid.tf
diff --git a/...s_in_subfolders/expected/main.terratag.tf → ...s_in_subfolders/expected/main.terratag.tf b/...s_in_subfolders/expected/main.terratag.tf → ...s_in_subfolders/expected/main.terratag.tf
diff --git a/..._files_in_subfolders/expected/main.tf.bak → ..._files_in_subfolders/expected/main.tf.bak b/..._files_in_subfolders/expected/main.tf.bak → ..._files_in_subfolders/expected/main.tf.bak
diff --git a/...es_in_subfolders/input/invalid/invalid.tf → ...es_in_subfolders/input/invalid/invalid.tf b/...es_in_subfolders/input/invalid/invalid.tf → ...es_in_subfolders/input/invalid/invalid.tf
diff --git a/...alid_tf_files_in_subfolders/input/main.tf → ...alid_tf_files_in_subfolders/input/main.tf b/...alid_tf_files_in_subfolders/input/main.tf → ...alid_tf_files_in_subfolders/input/main.tf
diff --git a/...h_closing_paren/expected/main.terratag.tf → ...h_closing_paren/expected/main.terratag.tf b/...h_closing_paren/expected/main.terratag.tf → ...h_closing_paren/expected/main.terratag.tf
diff --git a/...s_with_closing_paren/expected/main.tf.bak → ...s_with_closing_paren/expected/main.tf.bak b/...s_with_closing_paren/expected/main.tf.bak → ...s_with_closing_paren/expected/main.tf.bak
diff --git a/...ine_ends_with_closing_paren/input/main.tf → ...ine_ends_with_closing_paren/input/main.tf b/...ine_ends_with_closing_paren/input/main.tf → ...ine_ends_with_closing_paren/input/main.tf
diff --git a/...liased_provider/expected/main.terratag.tf → ...liased_provider/expected/main.terratag.tf b/...liased_provider/expected/main.terratag.tf → ...liased_provider/expected/main.terratag.tf
diff --git a/...aws_aliased_provider/expected/main.tf.bak → ...aws_aliased_provider/expected/main.tf.bak b/...aws_aliased_provider/expected/main.tf.bak → ...aws_aliased_provider/expected/main.tf.bak
diff --git a/...sue_66_aws_aliased_provider/input/main.tf → ...sue_66_aws_aliased_provider/input/main.tf b/...sue_66_aws_aliased_provider/input/main.tf → ...sue_66_aws_aliased_provider/input/main.tf
diff --git a/...oogle_beta_resource_skip/expected/main.tf → ...oogle_beta_resource_skip/expected/main.tf b/...oogle_beta_resource_skip/expected/main.tf → ...oogle_beta_resource_skip/expected/main.tf
diff --git a/...3/google_beta_resource_skip/input/main.tf → ...4/google_beta_resource_skip/input/main.tf b/...3/google_beta_resource_skip/input/main.tf → ...4/google_beta_resource_skip/input/main.tf
diff --git a/...ntainer_cluster/expected/main.terratag.tf → ...ntainer_cluster/expected/main.terratag.tf b/...ntainer_cluster/expected/main.terratag.tf → ...ntainer_cluster/expected/main.terratag.tf
diff --git a/...le_container_cluster/expected/main.tf.bak → ...le_container_cluster/expected/main.tf.bak b/...le_container_cluster/expected/main.tf.bak → ...le_container_cluster/expected/main.tf.bak
diff --git a/...13/google_container_cluster/input/main.tf → ...14/google_container_cluster/input/main.tf b/...13/google_container_cluster/input/main.tf → ...14/google_container_cluster/input/main.tf
diff --git a/...ogle_labels_map/expected/main.terratag.tf → ...ogle_labels_map/expected/main.terratag.tf b/...ogle_labels_map/expected/main.terratag.tf → ...ogle_labels_map/expected/main.terratag.tf
diff --git a/...13/google_labels_map/expected/main.tf.bak → ...14/google_labels_map/expected/main.tf.bak b/...13/google_labels_map/expected/main.tf.bak → ...14/google_labels_map/expected/main.tf.bak
diff --git a/...raform_13/google_labels_map/input/main.tf → ...orm_13_14/google_labels_map/input/main.tf b/...raform_13/google_labels_map/input/main.tf → ...orm_13_14/google_labels_map/input/main.tf
diff --git a/test/fixture/terraform_11/.terraform-version → ...tfenvconf/terraform_11/.terraform-version b/test/fixture/terraform_11/.terraform-version → ...tfenvconf/terraform_11/.terraform-version
diff --git a/test/fixture/terraform_12/.terraform-version → ...tfenvconf/terraform_12/.terraform-version b/test/fixture/terraform_12/.terraform-version → ...tfenvconf/terraform_12/.terraform-version
diff --git a/test/fixture/terraform_13/.terraform-version → ...tfenvconf/terraform_13/.terraform-version b/test/fixture/terraform_13/.terraform-version → ...tfenvconf/terraform_13/.terraform-version
diff --git a/test/tfenvconf/terraform_14/.terraform-version b/test/tfenvconf/terraform_14/.terraform-version
@@ -0,0 +1 @@
+0.14.2