unmark object ID or Name for formatting

Author: jbardin

internal/command/format/object_id.go

@@ -24,6 +24,7 @@ func ObjectValueID(obj cty.Value) (k, v string) {
 		return "", ""
 	}
 
+	obj, _ = obj.UnmarkDeep()
 	atys := obj.Type().AttributeTypes()
 
 	switch {
@@ -71,6 +72,7 @@ func ObjectValueName(obj cty.Value) (k, v string) {
 		return "", ""
 	}
 
+	obj, _ = obj.UnmarkDeep()
 	atys := obj.Type().AttributeTypes()
 
 	switch {

internal/command/format/object_id_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/terraform/internal/lang/marks"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -51,7 +52,7 @@ func TestObjectValueIDOrName(t *testing.T) {
 		},
 		{
 			cty.ObjectVal(map[string]cty.Value{
-				"name": cty.StringVal("awesome-foo"),
+				"name": cty.StringVal("awesome-foo").Mark(marks.Sensitive),
 			}),
 			[...]string{"name", "awesome-foo"},
 			[...]string{"name", "awesome-foo"},
@@ -154,7 +155,7 @@ func TestObjectValueIDOrName(t *testing.T) {
 		{
 			cty.ObjectVal(map[string]cty.Value{
 				"tags": cty.MapVal(map[string]cty.Value{
-					"Name": cty.UnknownVal(cty.String),
+					"Name": cty.UnknownVal(cty.String).Mark(marks.Sensitive),
 				}),
 			}),
 			[...]string{"", ""},