Merge pull request #48 from hashicorp/tf-0.12.25

Update to Terraform 0.12.25, add TF_VERSION environment variable

Author: joatmon08

CHANGELOG.md

@@ -1,18 +1,23 @@
-## 0.1.3 (April 28, 2020)
+## 0.1.4-alpha (May 14, 2020)
+
+* Allow user to specify SSH Key by name or ID (#41)
+* Update to Terraform 0.12.25 and add TF_VERSION environment variable (#47)
+
+## 0.1.3-alpha (April 28, 2020)
 
 * Add `sshKeyID` to CR spec, so users can reference modules in private git repos (#25)
 * Always update Sensitive variables when a Run is triggered and before the Run is executed (#22)
 * Fix: update variables when HCL flag changes (#33)
 
-## 0.1.2 (April 16, 2020)
+## 0.1.2-alpha (April 16, 2020)
 
 * Enable non-string Terraform variables by setting HCL type (#11)
 * Fix panics in handling non-string Terraform output (#19)
 
-## 0.1.1 (March 24, 2020)
+## 0.1.1-alpha (March 24, 2020)
 
 * Handle non-string Terraform outputs and return them as JSON-formatted string (#12)
 
-## 0.1.0 (2020)
+## 0.1.0-alpha (2020)
 
 * Initial release

go.mod

@@ -6,11 +6,11 @@ require (
 	github.com/go-logr/logr v0.1.0
 	github.com/go-openapi/spec v0.19.4
 	github.com/hashicorp/go-tfe v0.3.31
-	github.com/hashicorp/terraform v0.12.24
+	github.com/hashicorp/terraform v0.12.25
 	github.com/mitchellh/cli v1.1.0
 	github.com/operator-framework/operator-sdk v0.15.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.5.1
 	github.com/zclconf/go-cty v1.3.1
 	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.0.0

go.sum

@@ -3,9 +3,11 @@ package workspace
 import (
 	"context"
 	"fmt"
+	"os"
 
 	tfc "github.com/hashicorp/go-tfe"
 	appv1alpha1 "github.com/hashicorp/terraform-k8s/operator/pkg/apis/app/v1alpha1"
+	"github.com/hashicorp/terraform-k8s/operator/version"
 	"github.com/hashicorp/terraform/command/cliconfig"
 )
 
@@ -68,11 +70,20 @@ func (t *TerraformCloudClient) CheckWorkspace(workspace string, instance *appv1a
 	return ws.ID, err
 }
 
+func getTerraformVersion() *string {
+	tfVersion := os.Getenv("TF_VERSION")
+	if tfVersion == "" {
+		return &version.TerraformVersion
+	}
+	return &tfVersion
+}
+
 // CreateWorkspace creates a Terraform Cloud Workspace that auto-applies
 func (t *TerraformCloudClient) CreateWorkspace(workspace string) (string, error) {
 	options := tfc.WorkspaceCreateOptions{
-		AutoApply: &AutoApply,
-		Name:      &workspace,
+		AutoApply:        &AutoApply,
+		Name:             &workspace,
+		TerraformVersion: getTerraformVersion(),
 	}
 	ws, err := t.Client.Workspaces.Create(context.TODO(), t.Organization, options)
 	if err != nil {

operator/pkg/controller/workspace/tfc_org.go

@@ -0,0 +1,22 @@
+package workspace
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestShouldGetTerraformVersionFromEnvVariable(t *testing.T) {
+	expected := "0.11.0"
+	os.Setenv("TF_VERSION", expected)
+	actual := getTerraformVersion()
+	os.Unsetenv("TF_VERSION")
+	assert.Equal(t, expected, *actual)
+}
+
+func TestShouldGetTerraformVersionFromOperator(t *testing.T) {
+	expected := "0.12.25"
+	actual := getTerraformVersion()
+	assert.Equal(t, expected, *actual)
+}

operator/pkg/controller/workspace/tfc_org_test.go

@@ -1,5 +1,9 @@
 package version
 
 var (
-	Version = "0.0.1"
+	// Version of operator
+	Version = "0.1.4-alpha"
+
+	// TerraformVersion for workspace default
+	TerraformVersion = "0.12.25"
 )

operator/version/version.go

@@ -14,7 +14,7 @@ var (
 	//
 	// Version must conform to the format expected by
 	// github.com/hashicorp/go-version for tests to work.
-	Version = "0.0.1"
+	Version = "0.1.4-alpha"
 
 	// A pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release