From 03a89a727f50386341d2ac9e78035ad7e4e934fe Mon Sep 17 00:00:00 2001
From: Lars Francke <jujutsu@lars-francke.de>
Date: Fri, 11 Jul 2025 22:56:51 +0200
Subject: [PATCH 1/2] fix: Update nipyapi to 0.22.0 to work with custom nifi
 versions

---
 nifi/Dockerfile                       | 11 ++++++++---
 testing-tools/python/requirements.txt |  7 ++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nifi/Dockerfile b/nifi/Dockerfile
index 6eb722818..49e4092b8 100644
--- a/nifi/Dockerfile
+++ b/nifi/Dockerfile
@@ -204,6 +204,13 @@ COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/licenses /licenses
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/python /stackable/python
 
+# The nipyapi is required until NiFi 2.0.x for the ReportingTaskJob
+# This can be removed once the 1.x.x line is removed
+# Note: Keep this in sync with the version installed in testing-tools! (See the requirements.txt file)
+# Find the latest version here: https://pypi.org/project/nipyapi/
+# renovate: datasource=pypi packageName=nipyapi
+ENV NIPYAPI_VERSION=0.22.0
+
 RUN <<EOF
 microdnf update
 
@@ -217,10 +224,8 @@ microdnf install \
 microdnf clean all
 rm -rf /var/cache/yum
 
-# The nipyapi is required until NiFi 2.0.x for the ReportingTaskJob
-# This can be removed once the 1.x.x line is removed
 pip install --no-cache-dir \
-    nipyapi==0.19.1
+    nipyapi==${NIPYAPI_VERSION}
 
 # For backwards compatibility we create a softlink in /bin where the jar used to be as long as we are root
 # This can be removed once older versions / operators using this are no longer supported
diff --git a/testing-tools/python/requirements.txt b/testing-tools/python/requirements.txt
index dddf6bde7..89de51b90 100644
--- a/testing-tools/python/requirements.txt
+++ b/testing-tools/python/requirements.txt
@@ -4,12 +4,17 @@ requests==2.32.3
 charset-normalizer==3.3.2 #
 hive-metastore-client==1.0.9
 kafka-python3==3.0.0
-nipyapi==0.20.0
+
+# Used in the NiFi integration tests
+nipyapi==0.22.0
+
 pandas==2.2.3
 trino==0.329.0
+
 # gssapi/kerberos/pure-sasl are needed for using the python metastore client with kerberos.
 gssapi==1.8.3
 kerberos==1.3.1
 pure-sasl==0.6.2
+
 pytest==8.3.3 # Needed to execute Python unit-tests
 #thrift==0.13.0 # Installed as deb package because it fails to build from source with pip. Needs to match the version from hive-metastore-client

From 3991ac4fbca4da773ae432138954b224f523d1c4 Mon Sep 17 00:00:00 2001
From: Lars Francke <lars.francke@stackable.tech>
Date: Mon, 14 Jul 2025 08:57:40 +0200
Subject: [PATCH 2/2] Update testing-tools/python/requirements.txt

Co-authored-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
---
 testing-tools/python/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing-tools/python/requirements.txt b/testing-tools/python/requirements.txt
index 89de51b90..94898b286 100644
--- a/testing-tools/python/requirements.txt
+++ b/testing-tools/python/requirements.txt
@@ -6,6 +6,7 @@ hive-metastore-client==1.0.9
 kafka-python3==3.0.0
 
 # Used in the NiFi integration tests
+# Should match the version in nifi/Dockerfile
 nipyapi==0.22.0
 
 pandas==2.2.3