From 101668fbc97219aaaab8f966d090b31ce07c19ca Mon Sep 17 00:00:00 2001
From: "juvenal.diaz" <juvenal.diaz@oracle.com>
Date: Wed, 22 Jul 2026 22:35:23 -0600
Subject: [PATCH] Fixes stale state in tofu

---
 jeannie | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/jeannie b/jeannie
index e1c0b3b..2046797 100755
--- a/jeannie
+++ b/jeannie
@@ -270,11 +270,26 @@ adopt_tofu_helm_release() {
     local resource_address="$2"
     local namespace="$3"
     local release_name="$4"
+    local has_state=false
+    local has_release_secret=false
 
     if tofu_state_has_resource "${stack}" "${resource_address}"; then
+        has_state=true
+    fi
+    if helm_release_secret_exists "${namespace}" "${release_name}"; then
+        has_release_secret=true
+    fi
+
+    if [[ "${has_state}" == "true" && "${has_release_secret}" == "false" ]]; then
+        echo "Removing stale Helm release state for ${namespace}/${release_name} from ${stack} (${resource_address}) because no Helm release secret exists..."
+        tofu -chdir="${REPO_ROOT}/${stack}" state rm "${resource_address}"
         return 0
     fi
-    if ! helm_release_secret_exists "${namespace}" "${release_name}"; then
+
+    if [[ "${has_state}" == "true" ]]; then
+        return 0
+    fi
+    if [[ "${has_release_secret}" == "false" ]]; then
         return 0
     fi