From 76e6da971a1368e76ceeaf2aa8bce0f6b9e183aa Mon Sep 17 00:00:00 2001
From: chung00-lee <chung00.lee@samsung.com>
Date: Tue, 29 Jul 2025 02:03:59 +0900
Subject: [PATCH] Removed the autocommit option

Removed the autocommit option, which has been deprecated
since SQLAlchemy 2.0.

Closes-Bug: #2118931
Change-Id: I8236bdacd161f496479de100f7c5facaa6e690a2
Signed-off-by: Chunghwan Lee <chung00.lee@samsung.com>
---
 barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl | 3 +--
 releasenotes/notes/barbican-d291498fada9e601.yaml       | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/barbican-d291498fada9e601.yaml

diff --git a/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl b/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
index 61a14ec397..daee4c7b95 100644
--- a/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
+++ b/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
@@ -36,8 +36,7 @@ class KekRewrap(object):
         self.db_engine = session.create_engine(conf.database.connection or conf.sql_connection)
         self._session_creator = scoping.scoped_session(
             orm.sessionmaker(
-                bind=self.db_engine,
-                autocommit=True
+                bind=self.db_engine
             )
         )
         self.crypto_plugin = simple_crypto.SimpleCryptoPlugin(conf)
diff --git a/releasenotes/notes/barbican-d291498fada9e601.yaml b/releasenotes/notes/barbican-d291498fada9e601.yaml
new file mode 100644
index 0000000000..651c7eafb7
--- /dev/null
+++ b/releasenotes/notes/barbican-d291498fada9e601.yaml
@@ -0,0 +1,6 @@
+---
+barbican:
+  - |
+    Removed the autocommit option, which has been deprecated
+    since SQLAlchemy 2.0.
+...