From 844bcd8e2c948a70cdba50f425405f57365e07ee Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Tue, 13 Jan 2026 17:05:19 +0100
Subject: [PATCH] contextualFromConfigBody should also apply for overridden
 diagnostics

---
 internal/tfdiags/contextual.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/internal/tfdiags/contextual.go b/internal/tfdiags/contextual.go
index 3eedf82bfe..8529222549 100644
--- a/internal/tfdiags/contextual.go
+++ b/internal/tfdiags/contextual.go
@@ -44,6 +44,16 @@ func (diags Diagnostics) InConfigBody(body hcl.Body, addr string) Diagnostics {
 	for i, srcDiag := range diags {
 		if cd, isCD := srcDiag.(contextualFromConfigBody); isCD {
 			ret[i] = cd.ElaborateFromConfigBody(body, addr)
+		} else if override, isOverride := srcDiag.(overriddenDiagnostic); isOverride {
+			if cd, isCD := override.original.(contextualFromConfigBody); isCD {
+				newOriginal := cd.ElaborateFromConfigBody(body, addr)
+				ret[i] = &overriddenDiagnostic{
+					original: newOriginal,
+					severity: override.severity,
+					extra:    override.extra,
+				}
+			}
+
 		} else {
 			ret[i] = srcDiag
 		}