fix: Remove incorrect minimumTerraformVersion variable

mafredri · mafredri · commit 5cbb7123fd8e · 2022-08-17T11:35:39.000+03:00
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -116,11 +116,11 @@ func (e executor) checkMinVersion(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	if !v.GreaterThanOrEqual(minimumTerraformVersion) {
+	if !v.GreaterThanOrEqual(minTerraformVersion) {
 		return xerrors.Errorf(
 			"terraform version %q is too old. required >= %q",
 			v.String(),
-			minimumTerraformVersion.String())
+			minTerraformVersion.String())
 	}
 	return nil
 }
@@ -435,9 +435,6 @@ func provisionReadAndLog(logr logger, reader io.Reader, done chan<- any) {
 
 		// If the diagnostic is provided, let's provide a bit more info!
 		logLevel = convertTerraformLogLevel(log.Diagnostic.Severity, logr)
-		if err != nil {
-			continue
-		}
 		err = logr.Log(&proto.Log{Level: logLevel, Output: log.Diagnostic.Detail})
 		if err != nil {
 			// Not much we can do.  We can't log because logging is itself breaking!
diff --git a/provisioner/terraform/serve.go b/provisioner/terraform/serve.go
@@ -15,26 +15,16 @@ import (
 	"github.com/coder/coder/provisionersdk"
 )
 
-// This is the exact version of Terraform used internally
-// when Terraform is missing on the system.
-var terraformVersion = version.Must(version.NewVersion("1.2.1"))
-var minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
-var maxTerraformVersion = version.Must(version.NewVersion("1.2.1"))
-
 var (
-	// The minimum version of Terraform supported by the provisioner.
-	// Validation came out in 0.13.0, which was released August 10th, 2020.
-	// https://www.hashicorp.com/blog/announcing-hashicorp-terraform-0-13
-	minimumTerraformVersion = func() *version.Version {
-		v, err := version.NewSemver("0.13.0")
-		if err != nil {
-			panic(err)
-		}
-		return v
-	}()
-)
+	// This is the exact version of Terraform used internally
+	// when Terraform is missing on the system.
+	terraformVersion = version.Must(version.NewVersion("1.2.1"))
+
+	minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
+	maxTerraformVersion = version.Must(version.NewVersion("1.2.1"))
 
-var terraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.")
+	terraformMinorVersionMismatch = xerrors.New("Terraform binary minor version mismatch.")
+)
 
 type ServeOptions struct {
 	*provisionersdk.ServeOptions
