[WIP] Taint and resource address

.travis.yml

@@ -10,7 +10,7 @@ install:
 - bash scripts/gogetcookie.sh
 - go get github.com/kardianos/govendor
 script:
-- make vet test
+- make vet vendor-status test
 - GOOS=windows go build
 branches:
   only:

CHANGELOG.md

@@ -55,7 +55,7 @@ FEATURES:
    no more local caching of remote state, and more. ([#11286](https://github.com/hashicorp/terraform/issues/11286))
  * **Destroy Provisioners:** Provisioners can now be configured to run
    on resource destruction. ([#11329](https://github.com/hashicorp/terraform/issues/11329))
- * **State Locking:** State will be autuomatically locked when supported by the backend.
+ * **State Locking:** State will be automatically locked when supported by the backend.
    Backends supporting locking in this release are Local, S3 (via DynamoDB), and Consul. ([#11187](https://github.com/hashicorp/terraform/issues/11187))
 
 IMPROVEMENTS:

builtin/providers/aws/resource_aws_ssm_document.go

@@ -384,7 +384,7 @@ func validateAwsSSMDocumentType(v interface{}, k string) (ws []string, errors []
 	}
 
 	if !types[value] {
-		errors = append(errors, fmt.Errorf("CodeBuild: Arifacts Namespace Type can only be NONE / BUILD_ID"))
+		errors = append(errors, fmt.Errorf("Document type %s is invalid. Valid types are Command, Policy or Automation", value))
 	}
 	return
 }

builtin/provisioners/local-exec/resource_provisioner_test.go

@@ -2,7 +2,6 @@ package localexec
 
 import (
 	"io/ioutil"
-	"log"
 	"os"
 	"strings"
 	"testing"
@@ -65,8 +64,8 @@ func TestResourceProvider_stop(t *testing.T) {
 
 	select {
 	case <-doneCh:
-	case <-time.After(500 * time.Millisecond):
-		log.Fatal("should finish")
+	case <-time.After(2 * time.Second):
+		t.Fatal("should finish")
 	}
 }
 

command/hcl_printer.go

@@ -94,7 +94,7 @@ func (e *encodeState) encodeMap(m map[string]interface{}) error {
 	for i, k := range sortedKeys(m) {
 		v := m[k]
 
-		e.WriteString(k + " = ")
+		e.WriteString(fmt.Sprintf("%q = ", k))
 		err := e.encode(v)
 		if err != nil {
 			return err

command/hcl_printer_test.go

@@ -0,0 +1,52 @@
+package command
+
+import "testing"
+
+// The command package has it's own HCL encoder to encode variables to push.
+// Make sure the variable we encode parse correctly
+func TestHCLEncoder_parse(t *testing.T) {
+	cases := []struct {
+		Name  string
+		Val   interface{}
+		Error bool
+	}{
+		{
+			Name: "int",
+			Val:  12345,
+		},
+		{
+			Name: "float",
+			Val:  1.2345,
+		},
+		{
+			Name: "string",
+			Val:  "terraform",
+		},
+		{
+			Name: "list",
+			Val:  []interface{}{"a", "b", "c"},
+		},
+		{
+			Name: "map",
+			Val: map[string]interface{}{
+				"a": 1,
+			},
+		},
+		// a numeric looking identifier requires quotes
+		{
+			Name: "map_with_quoted_key",
+			Val: map[string]interface{}{
+				"0.0.0.0/24": "mask",
+			},
+		},
+	}
+
+	for _, c := range cases {
+		t.Run(c.Name, func(t *testing.T) {
+			_, err := encodeHCL(c.Val)
+			if err != nil {
+				t.Fatal(err)
+			}
+		})
+	}
+}

command/push_test.go

@@ -761,11 +761,12 @@ func testArchiveStr(t *testing.T, path string) []string {
 	return result
 }
 
+// we always quote map keys to be safe
 func pushTFVars() []atlas.TFVar {
 	return []atlas.TFVar{
 		{Key: "bar", Value: "foo", IsHCL: false},
 		{Key: "baz", Value: `{
-  A = "a"
+  "A" = "a"
 }`, IsHCL: true},
 		{Key: "fob", Value: `["a", "quotes \"in\" quotes"]`, IsHCL: true},
 		{Key: "foo", Value: "bar", IsHCL: false},