fix: avoid crashes on unknown keys

hashicorp · Mar 26, 2021 · f044bab · f044bab
1 parent 5198071
commit f044bab
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/decoder/expression_candidates.go b/decoder/expression_candidates.go
@@ -62,7 +62,9 @@ func constraintsAtPos(expr hcl.Expression, constraints ExprConstraints, pos hcl.
 			undeclaredAttributes := oe.Attributes
 			for _, item := range eType.Items {
 				key, _ := item.KeyExpr.Value(nil)
-				if !key.IsWhollyKnown() || key.Type() != cty.String {
+				if key.IsNull() || !key.IsWhollyKnown() || key.Type() != cty.String {
+					// skip items keys that can't be interpolated
+					// without further context
 					continue
 				}
 				attr, ok := oe.Attributes[key.AsString()]

diff --git a/decoder/expression_constraints.go b/decoder/expression_constraints.go
@@ -146,7 +146,9 @@ func (ec ExprConstraints) LiteralValueOfObjectConsExpr(expr *hclsyntax.ObjectCon
 	exprValues := make(map[string]cty.Value)
 	for _, item := range expr.Items {
 		key, _ := item.KeyExpr.Value(nil)
-		if !key.IsWhollyKnown() || key.Type() != cty.String {
+		if key.IsNull() || !key.IsWhollyKnown() || key.Type() != cty.String {
+			// Avoid building incomplete object with keys
+			// that can't be interpolated without further context
 			return schema.LiteralValue{}, false
 		}
 

diff --git a/decoder/hover.go b/decoder/hover.go
@@ -369,7 +369,9 @@ func hoverDataForExpr(expr hcl.Expression, constraints ExprConstraints, pos hcl.
 func hoverDataForObjectExpr(objExpr *hclsyntax.ObjectConsExpr, oe schema.ObjectExpr, pos hcl.Pos) (*lang.HoverData, error) {
 	for _, item := range objExpr.Items {
 		key, _ := item.KeyExpr.Value(nil)
-		if !key.IsWhollyKnown() || key.Type() != cty.String {
+		if key.IsNull() || !key.IsWhollyKnown() || key.Type() != cty.String {
+			// skip items keys that can't be interpolated
+			// without further context
 			continue
 		}
 		attr, ok := oe.Attributes[key.AsString()]

diff --git a/decoder/semantic_tokens.go b/decoder/semantic_tokens.go
@@ -178,7 +178,9 @@ func tokensForExpression(expr hclsyntax.Expression, constraints ExprConstraints)
 		if ok {
 			for _, item := range eType.Items {
 				key, _ := item.KeyExpr.Value(nil)
-				if !key.IsWhollyKnown() || key.Type() != cty.String {
+				if key.IsNull() || !key.IsWhollyKnown() || key.Type() != cty.String {
+					// skip items keys that can't be interpolated
+					// without further context
 					continue
 				}
 				attr, ok := oe.Attributes[key.AsString()]
@@ -299,19 +301,23 @@ func tokensForObjectConsExpr(expr *hclsyntax.ObjectConsExpr, exprType cty.Type)
 		attrTypes := exprType.AttributeTypes()
 		for _, item := range expr.Items {
 			key, _ := item.KeyExpr.Value(nil)
-			if key.IsWhollyKnown() && key.Type() == cty.String {
-				valType, ok := attrTypes[key.AsString()]
-				if !ok {
-					// unknown attribute
-					continue
-				}
-				tokens = append(tokens, lang.SemanticToken{
-					Type:      lang.TokenObjectKey,
-					Modifiers: []lang.SemanticTokenModifier{},
-					Range:     item.KeyExpr.Range(),
-				})
-				tokens = append(tokens, tokenForTypedExpression(item.ValueExpr, valType)...)
+			if key.IsNull() || !key.IsWhollyKnown() || key.Type() != cty.String {
+				// skip items keys that can't be interpolated
+				// without further context
+				continue
 			}
+
+			valType, ok := attrTypes[key.AsString()]
+			if !ok {
+				// unknown attribute
+				continue
+			}
+			tokens = append(tokens, lang.SemanticToken{
+				Type:      lang.TokenObjectKey,
+				Modifiers: []lang.SemanticTokenModifier{},
+				Range:     item.KeyExpr.Range(),
+			})
+			tokens = append(tokens, tokenForTypedExpression(item.ValueExpr, valType)...)
 		}
 	}
 	if exprType.IsMapType() {

diff --git a/decoder/symbols.go b/decoder/symbols.go
@@ -125,7 +125,7 @@ func nestedSymbolsForExpr(expr hcl.Expression) []Symbol {
 	case *hclsyntax.ObjectConsExpr:
 		for _, item := range e.Items {
 			key, _ := item.KeyExpr.Value(nil)
-			if key.IsNull() || key.Type() != cty.String {
+			if key.IsNull() || !key.IsWhollyKnown() || key.Type() != cty.String {
 				// skip items keys that can't be interpolated
 				// without further context
 				continue