Merge branch 'master' into feature/which-flag

lib/param_parsing/parameters.go

@@ -52,6 +52,7 @@ func GetParameters() Params {
 	// Parse the command line parameters to fetch stuff like chdir
 	getopt.Parse()
 
+	oldLogLevel := params.LogLevel
 	logger = lib.InitLogger(params.LogLevel)
 	var err error
 	// Read configuration files
@@ -72,6 +73,11 @@ func GetParameters() Params {
 		logger.Fatalf("Error parsing configuration file: %q", err)
 	}
 
+	// Logger config was changed by the config files. Reinitialise.
+	if params.LogLevel != oldLogLevel {
+		logger = lib.InitLogger(params.LogLevel)
+	}
+
 	// Parse again to overwrite anything that might by defined on the cli AND in any config file (CLI always wins)
 	getopt.Parse()
 	args := getopt.Args()

lib/param_parsing/terragrunt.go

@@ -25,8 +25,9 @@ func GetVersionFromTerragrunt(params Params) (Params, error) {
 		}
 		var versionFromTerragrunt terragruntVersionConstraints
 		diagnostics = gohcl.DecodeBody(hclFile.Body, nil, &versionFromTerragrunt)
-		if diagnostics.HasErrors() {
-			return params, fmt.Errorf("could not decode body of HCL file %q", filePath)
+		if versionFromTerragrunt.TerraformVersionConstraint == "" {
+			logger.Infof("No terraform version constraint in %q", filePath)
+			return params, nil
 		}
 		version, err := lib.GetSemver(versionFromTerragrunt.TerraformVersionConstraint, params.MirrorURL)
 		if err != nil {

lib/param_parsing/terragrunt_test.go

@@ -3,15 +3,18 @@ package param_parsing
 import (
 	"github.com/hashicorp/go-version"
 	"github.com/warrensbox/terraform-switcher/lib"
-	"strings"
 	"testing"
 )
 
 func TestGetVersionFromTerragrunt(t *testing.T) {
 	var params Params
+	logger = lib.InitLogger("DEBUG")
 	params = initParams(params)
 	params.ChDirPath = "../../test-data/integration-tests/test_terragrunt_hcl"
-	params, _ = GetVersionFromTerragrunt(params)
+	params, err := GetVersionFromTerragrunt(params)
+	if err != nil {
+		t.Fatalf("Got error '%s'", err)
+	}
 	v1, _ := version.NewVersion("0.13")
 	v2, _ := version.NewVersion("0.14")
 	actualVersion, _ := version.NewVersion(params.Version)
@@ -37,12 +40,11 @@ func TestGetVersionFromTerragrunt_erroneous_file(t *testing.T) {
 	params = initParams(params)
 	params.ChDirPath = "../../test-data/skip-integration-tests/test_terragrunt_error_hcl"
 	params, err := GetVersionFromTerragrunt(params)
-	if err == nil {
-		t.Error("Expected error but got none.")
-	} else {
-		expectedError := "could not decode body of HCL file"
-		if !strings.Contains(err.Error(), expectedError) {
-			t.Errorf("Expected error to contain '%q', got '%q'", expectedError, err)
-		}
+	if err != nil {
+		t.Error(err)
+	}
+	expected := ""
+	if params.Version != expected {
+		t.Errorf("Expected version '%s', got '%s'", expected, params.Version)
 	}
 }

test-data/integration-tests/test_terragrunt_hcl/terragrunt.hcl

@@ -1 +1,2 @@
+terragrunt_version_constraint = "= 0.36.2"
 terraform_version_constraint = ">= 0.13, < 0.14"