From 8b466811d2c4307eee52eed1e29944722f780b9d Mon Sep 17 00:00:00 2001
From: Martin Atkins <mart@degeneration.co.uk>
Date: Sun, 14 Oct 2018 17:10:45 -0700
Subject: [PATCH] command: Fix a few tests from meta_backend_test.go

---
 command/meta_backend_test.go                  | 32 ++++++++++++++++---
 .../backend-change-multi-to-multi/main.tf     |  2 +-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/command/meta_backend_test.go b/command/meta_backend_test.go
index 17029b04b..a17f666e7 100644
--- a/command/meta_backend_test.go
+++ b/command/meta_backend_test.go
@@ -1449,9 +1449,17 @@ func TestMetaBackend_planLocal(t *testing.T) {
 	defer os.RemoveAll(td)
 	defer testChdir(t, td)()
 
+	backendConfigBlock := cty.ObjectVal(map[string]cty.Value{
+		"path":          cty.NullVal(cty.String),
+		"workspace_dir": cty.NullVal(cty.String),
+	})
+	backendConfigRaw, err := plans.NewDynamicValue(backendConfigBlock, backendConfigBlock.Type())
+	if err != nil {
+		t.Fatal(err)
+	}
 	backendConfig := plans.Backend{
 		Type:      "local",
-		Config:    plans.DynamicValue("{}"),
+		Config:    backendConfigRaw,
 		Workspace: "default",
 	}
 
@@ -1534,9 +1542,17 @@ func TestMetaBackend_planLocalStatePath(t *testing.T) {
 	original := testState()
 	mark := markStateForMatching(original, "hello")
 
+	backendConfigBlock := cty.ObjectVal(map[string]cty.Value{
+		"path":          cty.NullVal(cty.String),
+		"workspace_dir": cty.NullVal(cty.String),
+	})
+	backendConfigRaw, err := plans.NewDynamicValue(backendConfigBlock, backendConfigBlock.Type())
+	if err != nil {
+		t.Fatal(err)
+	}
 	backendConfig := plans.Backend{
 		Type:      "local",
-		Config:    plans.DynamicValue("{}"),
+		Config:    backendConfigRaw,
 		Workspace: "default",
 	}
 
@@ -1544,7 +1560,7 @@ func TestMetaBackend_planLocalStatePath(t *testing.T) {
 	statePath := "foo.tfstate"
 
 	// put a initial state there that needs to be backed up
-	err := (statemgr.NewFilesystem(statePath)).WriteState(original)
+	err = (statemgr.NewFilesystem(statePath)).WriteState(original)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1627,9 +1643,17 @@ func TestMetaBackend_planLocalMatch(t *testing.T) {
 	defer os.RemoveAll(td)
 	defer testChdir(t, td)()
 
+	backendConfigBlock := cty.ObjectVal(map[string]cty.Value{
+		"path":          cty.NullVal(cty.String),
+		"workspace_dir": cty.NullVal(cty.String),
+	})
+	backendConfigRaw, err := plans.NewDynamicValue(backendConfigBlock, backendConfigBlock.Type())
+	if err != nil {
+		t.Fatal(err)
+	}
 	backendConfig := plans.Backend{
 		Type:      "local",
-		Config:    plans.DynamicValue("{}"),
+		Config:    backendConfigRaw,
 		Workspace: "default",
 	}
 
diff --git a/command/test-fixtures/backend-change-multi-to-multi/main.tf b/command/test-fixtures/backend-change-multi-to-multi/main.tf
index 04b76b378..c8d630d53 100644
--- a/command/test-fixtures/backend-change-multi-to-multi/main.tf
+++ b/command/test-fixtures/backend-change-multi-to-multi/main.tf
@@ -1,5 +1,5 @@
 terraform {
     backend "local" {
-        environment_dir = "envdir-new"
+        workspace_dir = "envdir-new"
     }
 }