From ed265881790313f20874281a4049d0014ea0bf59 Mon Sep 17 00:00:00 2001
From: jaylonmcshan19-x <jaylon.mcshan@hashicorp.com>
Date: Mon, 27 Oct 2025 13:11:08 -0500
Subject: [PATCH] fix keyring bug

---
 helm/resource_helm_release_stateupgrader.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/helm/resource_helm_release_stateupgrader.go b/helm/resource_helm_release_stateupgrader.go
index ae3142851..0d0f4ad20 100644
--- a/helm/resource_helm_release_stateupgrader.go
+++ b/helm/resource_helm_release_stateupgrader.go
@@ -155,6 +155,17 @@ func (r *HelmRelease) buildUpgradeStateMap(_ context.Context) map[int64]resource
 					}
 				}
 
+				normalizeKeyring := func(val tftypes.Value) tftypes.Value {
+					if val.IsNull() {
+						return tftypes.NewValue(tftypes.String, nil)
+					}
+					var str string
+					if err := val.As(&str); err == nil && str == "" {
+						return tftypes.NewValue(tftypes.String, nil)
+					}
+					return val
+				}
+
 				// Creating new type in FW
 				newType := tftypes.Object{
 					AttributeTypes: map[string]tftypes.Type{
@@ -293,7 +304,7 @@ func (r *HelmRelease) buildUpgradeStateMap(_ context.Context) map[int64]resource
 					"disable_webhooks":           oldState["disable_webhooks"],
 					"force_update":               oldState["force_update"],
 					"id":                         oldState["id"],
-					"keyring":                    oldState["keyring"],
+					"keyring":                    normalizeKeyring(oldState["keyring"]),
 					"lint":                       oldState["lint"],
 					"manifest":                   oldState["manifest"],
 					"max_history":                oldState["max_history"],