From ee9ec8a1936456dc1d5ba0c730230bb59eb3cbfa Mon Sep 17 00:00:00 2001
From: Pam Selle <204372+pselle@users.noreply.github.com>
Date: Wed, 14 Oct 2020 17:45:57 -0400
Subject: [PATCH] Reordering so attributes are first (understandability)

---
 terraform/evaluate.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/terraform/evaluate.go b/terraform/evaluate.go
index 33b50cb6d0..d5d2680fac 100644
--- a/terraform/evaluate.go
+++ b/terraform/evaluate.go
@@ -954,6 +954,16 @@ func markProviderSensitiveAttributes(schema *configschema.Block, val cty.Value)
 
 func getValMarks(schema *configschema.Block, val cty.Value, path cty.Path) []cty.PathValueMarks {
 	var pvm []cty.PathValueMarks
+	for name, attrS := range schema.Attributes {
+		if attrS.Sensitive {
+			attrPath := append(path, cty.GetAttrStep{Name: name})
+			pvm = append(pvm, cty.PathValueMarks{
+				Path:  attrPath,
+				Marks: cty.NewValueMarks("sensitive"),
+			})
+		}
+	}
+
 	for name, blockS := range schema.BlockTypes {
 		// If our block doesn't contain any sensitive attributes, skip inspecting it
 		if !blockS.Block.ContainsSensitive() {
@@ -980,15 +990,5 @@ func getValMarks(schema *configschema.Block, val cty.Value, path cty.Path) []cty
 			panic(fmt.Sprintf("unsupported nesting mode %s", blockS.Nesting))
 		}
 	}
-
-	for name, attrS := range schema.Attributes {
-		if attrS.Sensitive {
-			attrPath := append(path, cty.GetAttrStep{Name: name})
-			pvm = append(pvm, cty.PathValueMarks{
-				Path:  attrPath,
-				Marks: cty.NewValueMarks("sensitive"),
-			})
-		}
-	}
 	return pvm
 }