From 45862d54088290668c0f18a60e75ba1cd5ce2d21 Mon Sep 17 00:00:00 2001
From: Pam Selle <204372+pselle@users.noreply.github.com>
Date: Fri, 20 Nov 2020 18:21:56 +0000
Subject: [PATCH] backport of commit c55b69e30a87ae13a16b4aca71012c52ec81a319

---
 lang/eval.go                       | 4 ++--
 terraform/context_validate_test.go | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lang/eval.go b/lang/eval.go
index 94a91074af..ba44ace85e 100644
--- a/lang/eval.go
+++ b/lang/eval.go
@@ -321,10 +321,10 @@ func (s *Scope) evalContext(refs []*addrs.Reference, selfAddr addrs.Referenceabl
 			switch k := subj.Key.(type) {
 			case addrs.IntKey:
 				self, hclDiags = hcl.Index(val, cty.NumberIntVal(int64(k)), ref.SourceRange.ToHCL().Ptr())
-				diags.Append(hclDiags)
+				diags = diags.Append(hclDiags)
 			case addrs.StringKey:
 				self, hclDiags = hcl.Index(val, cty.StringVal(string(k)), ref.SourceRange.ToHCL().Ptr())
-				diags.Append(hclDiags)
+				diags = diags.Append(hclDiags)
 			default:
 				self = val
 			}
diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go
index bf881a6aec..701350ac76 100644
--- a/terraform/context_validate_test.go
+++ b/terraform/context_validate_test.go
@@ -546,7 +546,7 @@ func TestContext2Validate_orphans(t *testing.T) {
 	p.ValidateResourceTypeConfigFn = func(req providers.ValidateResourceTypeConfigRequest) providers.ValidateResourceTypeConfigResponse {
 		var diags tfdiags.Diagnostics
 		if req.Config.GetAttr("foo").IsNull() {
-			diags.Append(errors.New("foo is not set"))
+			diags = diags.Append(errors.New("foo is not set"))
 		}
 		return providers.ValidateResourceTypeConfigResponse{
 			Diagnostics: diags,
@@ -810,7 +810,7 @@ func TestContext2Validate_provisionerConfig_good(t *testing.T) {
 	pr.ValidateProvisionerConfigFn = func(req provisioners.ValidateProvisionerConfigRequest) provisioners.ValidateProvisionerConfigResponse {
 		var diags tfdiags.Diagnostics
 		if req.Config.GetAttr("test_string").IsNull() {
-			diags.Append(errors.New("test_string is not set"))
+			diags = diags.Append(errors.New("test_string is not set"))
 		}
 		return provisioners.ValidateProvisionerConfigResponse{
 			Diagnostics: diags,
@@ -943,7 +943,7 @@ func TestContext2Validate_tainted(t *testing.T) {
 	p.ValidateResourceTypeConfigFn = func(req providers.ValidateResourceTypeConfigRequest) providers.ValidateResourceTypeConfigResponse {
 		var diags tfdiags.Diagnostics
 		if req.Config.GetAttr("foo").IsNull() {
-			diags.Append(errors.New("foo is not set"))
+			diags = diags.Append(errors.New("foo is not set"))
 		}
 		return providers.ValidateResourceTypeConfigResponse{
 			Diagnostics: diags,