From 0bfbb02b15a7a96b49e0db5c3143b4b045c307a5 Mon Sep 17 00:00:00 2001
From: Benedikt Labrenz <benedikt@labrenz.org>
Date: Thu, 16 Oct 2025 14:40:31 +0200
Subject: [PATCH 1/2] bump nifi opa plugin to 0.3.1 and fix path in final image

---
 nifi/Dockerfile                                           | 2 +-
 nifi/boil-config.toml                                     | 8 ++++----
 .../stackable/patches/{0.3.0 => 0.3.1}/patchable.toml     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename nifi/opa-plugin/stackable/patches/{0.3.0 => 0.3.1}/patchable.toml (56%)

diff --git a/nifi/Dockerfile b/nifi/Dockerfile
index 462f66afd..e23c15955 100644
--- a/nifi/Dockerfile
+++ b/nifi/Dockerfile
@@ -186,7 +186,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackab
 COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/git-sync /stackable/git-sync
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/opa-authorizer.nar /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/extensions/opa-authorizer.nar
+COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/opa-authorizer.nar /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/lib/nifi-opa-authorizer-nar-${NIFI_OPA_AUTHORIZER_PLUGIN_VERSION}.nar
 COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/nifi-opa-plugin-${NIFI_OPA_AUTHORIZER_PLUGIN_VERSION}-src.tar.gz  /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/LICENSE /licenses/NIFI_OPA_PLUGIN_LICENSE
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin
diff --git a/nifi/boil-config.toml b/nifi/boil-config.toml
index c20f96d8f..70d034700 100644
--- a/nifi/boil-config.toml
+++ b/nifi/boil-config.toml
@@ -6,7 +6,7 @@ java-devel = "11"
 git-sync-version = "v4.4.1"
 # Check for new versions at the upstream: https://github.com/DavidGitter/nifi-opa-plugin/tags
 # Checkout a Patchable version (patch-series) for the new tag
-nifi-opa-authorizer-plugin-version = "0.3.0"
+nifi-opa-authorizer-plugin-version = "0.3.1"
 
 [versions."1.28.1".local-images]
 java-base = "11"
@@ -16,7 +16,7 @@ java-devel = "11"
 git-sync-version = "v4.4.1"
 # Check for new versions at the upstream: https://github.com/DavidGitter/nifi-opa-plugin/tags
 # Checkout a Patchable version (patch-series) for the new tag
-nifi-opa-authorizer-plugin-version = "0.3.0"
+nifi-opa-authorizer-plugin-version = "0.3.1"
 
 [versions."2.4.0".local-images]
 java-base = "21"
@@ -26,7 +26,7 @@ java-devel = "21"
 git-sync-version = "v4.4.1"
 # Check for new versions at the upstream: https://github.com/DavidGitter/nifi-opa-plugin/tags
 # Checkout a Patchable version (patch-series) for the new tag
-nifi-opa-authorizer-plugin-version = "0.3.0"
+nifi-opa-authorizer-plugin-version = "0.3.1"
 # Release a new version here: https://github.com/stackabletech/nifi-iceberg-bundle
 # Checkout a Patchable version (patch-series) for the new tag
 nifi-iceberg-bundle-version = "0.0.5"
@@ -39,7 +39,7 @@ java-devel = "21"
 git-sync-version = "v4.4.1"
 # Check for new versions at the upstream: https://github.com/DavidGitter/nifi-opa-plugin/tags
 # Checkout a Patchable version (patch-series) for the new tag
-nifi-opa-authorizer-plugin-version = "0.3.0"
+nifi-opa-authorizer-plugin-version = "0.3.1"
 
 # Release a new version here: https://github.com/stackabletech/nifi-iceberg-bundle
 # Checkout a Patchable version (patch-series) for the new tag
diff --git a/nifi/opa-plugin/stackable/patches/0.3.0/patchable.toml b/nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml
similarity index 56%
rename from nifi/opa-plugin/stackable/patches/0.3.0/patchable.toml
rename to nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml
index 5eb31df88..5cc23ad56 100644
--- a/nifi/opa-plugin/stackable/patches/0.3.0/patchable.toml
+++ b/nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml
@@ -1,2 +1,2 @@
 mirror = "https://github.com/stackabletech/nifi-opa-plugin.git"
-base = "728367a22e897479b4d8157b151ff1abca038d3d"
+base = "f16d155bd0bb31ea89103f0477fef95c889a3e02"

From d551d630e6f03a1bc7b3724bdd4e13abc6fdec1a Mon Sep 17 00:00:00 2001
From: Benedikt Labrenz <benedikt@labrenz.org>
Date: Tue, 28 Oct 2025 13:56:52 +0100
Subject: [PATCH 2/2] remove nifi-opa-plugin 0.3.2

---
 nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml

diff --git a/nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml b/nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml
deleted file mode 100644
index 5cc23ad56..000000000
--- a/nifi/opa-plugin/stackable/patches/0.3.1/patchable.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-mirror = "https://github.com/stackabletech/nifi-opa-plugin.git"
-base = "f16d155bd0bb31ea89103f0477fef95c889a3e02"