pkg/terraform: improvements

pkg/terraform/executor.go

@@ -534,10 +534,8 @@ func (ex *Executor) checkVersion() error {
 		return fmt.Errorf("checking Terraform version: %w", err)
 	}
 
-	constraints, err := version.NewConstraint(requiredVersion)
-	if err != nil {
-		return fmt.Errorf("checking Terraform version: %w", err)
-	}
+	// requiredVersion is const, so we test it in unit tests.
+	constraints, _ := version.NewConstraint(requiredVersion)
 
 	if !constraints.Check(v) {
 		return fmt.Errorf("version '%s' of Terraform not supported. Needed %s", v, constraints)

pkg/terraform/executor_test.go → pkg/terraform/executor_e2e_test.go

@@ -1,28 +1,34 @@
 //+build e2e
 
-package terraform
+package terraform_test
 
 import (
 	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
+
+	"github.com/kinvolk/lokomotive/pkg/terraform"
 )
 
-func executor(t *testing.T) *Executor {
+func executor(t *testing.T) *terraform.Executor {
 	tmpDir, err := ioutil.TempDir("", "lokoctl-tests-")
 	if err != nil {
 		t.Fatalf("Creating tmp dir should succeed, got: %v", err)
 	}
 
-	defer os.RemoveAll(tmpDir)
+	t.Cleanup(func() {
+		if err := os.RemoveAll(tmpDir); err != nil {
+			t.Logf("Removing directory %q: %v", tmpDir, err)
+		}
+	})
 
-	conf := Config{
+	conf := terraform.Config{
 		Verbose:    false,
 		WorkingDir: tmpDir,
 	}
 
-	ex, err := NewExecutor(conf)
+	ex, err := terraform.NewExecutor(conf)
 	if err != nil {
 		t.Fatalf("Creating new executor should succeed, got: %v", err)
 	}

pkg/terraform/executor_internal_test.go

@@ -0,0 +1,27 @@
+// Copyright 2020 The Lokomotive Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package terraform
+
+import (
+	"testing"
+
+	"github.com/hashicorp/go-version"
+)
+
+func TestRequiredVersion(t *testing.T) {
+	if _, err := version.NewConstraint(requiredVersion); err != nil {
+		t.Fatalf("requiredVersion const must be valid version constraint, got: %v", err)
+	}
+}