Handle maps in clone (#1164)

modules/terraform/options.go

@@ -81,6 +81,24 @@ func (options *Options) Clone() (*Options, error) {
 	if err := copier.Copy(newOptions, options); err != nil {
 		return nil, err
 	}
+	// copier does not deep copy maps, so we have to do it manually.
+	newOptions.EnvVars = make(map[string]string)
+	for key, val := range options.EnvVars {
+		newOptions.EnvVars[key] = val
+	}
+	newOptions.Vars = make(map[string]interface{})
+	for key, val := range options.Vars {
+		newOptions.Vars[key] = val
+	}
+	newOptions.BackendConfig = make(map[string]interface{})
+	for key, val := range options.BackendConfig {
+		newOptions.BackendConfig[key] = val
+	}
+	newOptions.RetryableTerraformErrors = make(map[string]string)
+	for key, val := range options.RetryableTerraformErrors {
+		newOptions.RetryableTerraformErrors[key] = val
+	}
+
 	return newOptions, nil
 }
 

modules/terraform/options_test.go

@@ -0,0 +1,43 @@
+package terraform
+
+import (
+	"testing"
+
+	"github.com/gruntwork-io/terratest/modules/random"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestOptionsCloneDeepClonesEnvVars(t *testing.T) {
+	t.Parallel()
+
+	unique := random.UniqueId()
+	original := Options{
+		EnvVars: map[string]string{
+			"unique":   unique,
+			"original": unique,
+		},
+	}
+	copied, err := original.Clone()
+	require.NoError(t, err)
+	copied.EnvVars["unique"] = "nullified"
+	assert.Equal(t, unique, original.EnvVars["unique"])
+	assert.Equal(t, unique, copied.EnvVars["original"])
+}
+
+func TestOptionsCloneDeepClonesVars(t *testing.T) {
+	t.Parallel()
+
+	unique := random.UniqueId()
+	original := Options{
+		Vars: map[string]interface{}{
+			"unique":   unique,
+			"original": unique,
+		},
+	}
+	copied, err := original.Clone()
+	require.NoError(t, err)
+	copied.Vars["unique"] = "nullified"
+	assert.Equal(t, unique, original.Vars["unique"])
+	assert.Equal(t, unique, copied.Vars["original"])
+}