unmark object ID or Name for formatting

Author: jbardin

internal/command/format/object_id.go

@@ -1,6 +1,7 @@
 package format
 
 import (
+	"github.com/hashicorp/terraform/internal/lang/marks"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -20,10 +21,14 @@ import (
 //
 // This function will panic if the given value is not of an object type.
 func ObjectValueID(obj cty.Value) (k, v string) {
-	if obj.IsNull() || !obj.IsKnown() {
+	// don't return this as an ID at all if it's sensitive
+	if obj.IsNull() || !obj.IsKnown() || obj.HasMark(marks.Sensitive) {
 		return "", ""
 	}
 
+	// Unmark the value in case of other future marks, so we can always call
+	// AsString.
+	obj, _ = obj.UnmarkDeep()
 	atys := obj.Type().AttributeTypes()
 
 	switch {
@@ -67,10 +72,14 @@ func ObjectValueID(obj cty.Value) (k, v string) {
 //
 // This function will panic if the given value is not of an object type.
 func ObjectValueName(obj cty.Value) (k, v string) {
-	if obj.IsNull() || !obj.IsKnown() {
+	// don't return this as an ID at all if it's sensitive
+	if obj.IsNull() || !obj.IsKnown() || obj.HasMark(marks.Sensitive) {
 		return "", ""
 	}
 
+	// Unmark the value in case of other future marks, so we can always call
+	// AsString.
+	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{"", ""},