From 92f291bc21604507324355b3768c6274f815507d Mon Sep 17 00:00:00 2001
From: Roelof Jansen <roelof@rena-it.nl>
Date: Mon, 28 Jul 2025 10:17:51 +0200
Subject: [PATCH] fix: truenas 25.04 "Target name already exists" changed to
 "Target with this name already exists"

---
 src/driver/freenas/api.js | 10 ++++------
 src/driver/freenas/ssh.js | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/driver/freenas/api.js b/src/driver/freenas/api.js
index b47286b..8afefbb 100644
--- a/src/driver/freenas/api.js
+++ b/src/driver/freenas/api.js
@@ -840,9 +840,8 @@ class FreeNASApiDriver extends CsiBaseDriver {
                 target = null;
                 if (
                   response.statusCode == 409 &&
-                  JSON.stringify(response.body).includes(
-                    "Target name already exists"
-                  )
+                  JSON.stringify(response.body)
+                      .match(/Target(.*)name already exists/g)?.length > 0
                 ) {
                   target = await httpApiClient.findResourceByProperties(
                     "/services/iscsi/target",
@@ -1128,9 +1127,8 @@ class FreeNASApiDriver extends CsiBaseDriver {
                 target = null;
                 if (
                   response.statusCode == 422 &&
-                  JSON.stringify(response.body).includes(
-                    "Target name already exists"
-                  )
+                  JSON.stringify(response.body)
+                      .match(/Target(.*)name already exists/g)?.length > 0
                 ) {
                   target = await httpApiClient.findResourceByProperties(
                     "/iscsi/target",
diff --git a/src/driver/freenas/ssh.js b/src/driver/freenas/ssh.js
index 7163d7f..42b0304 100644
--- a/src/driver/freenas/ssh.js
+++ b/src/driver/freenas/ssh.js
@@ -929,9 +929,8 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
                 target = null;
                 if (
                   response.statusCode == 409 &&
-                  JSON.stringify(response.body).includes(
-                    "Target name already exists"
-                  )
+                  JSON.stringify(response.body)
+                      .match(/Target(.*)name already exists/g)?.length > 0
                 ) {
                   target = await this.findResourceByProperties(
                     "/services/iscsi/target",
@@ -1217,9 +1216,8 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
                 target = null;
                 if (
                   response.statusCode == 422 &&
-                  JSON.stringify(response.body).includes(
-                    "Target name already exists"
-                  )
+                  JSON.stringify(response.body)
+                      .match(/Target(.*)name already exists/g)?.length > 0
                 ) {
                   target = await this.findResourceByProperties(
                     "/iscsi/target",