Merge c86df7762d into 55c36d62ff

truenas-iscsi: error code has changed on target exists with 25.01
Updates target name existence check to use regex matching instead of includes, which is more robust.
2025-07-18 09:12:26 +00:00 · 2025-07-18 13:18:28 +10:00
2 changed files with 4 additions and 6 deletions
--- a/src/driver/freenas/api.js
+++ b/src/driver/freenas/api.js
@ -1128,9 +1128,8 @@ class FreeNASApiDriver extends CsiBaseDriver {
                target = null;
                if (
                  response.statusCode == 422 &&
-                  JSON.stringify(response.body).includes(
+                  JSON.stringify(response.body)
-                    "Target name already exists"
+                    .match(/Target(.*)name already exists/g)?.length > 0
                  )
                ) {
                  target = await httpApiClient.findResourceByProperties(
                    "/iscsi/target",
--- a/src/driver/freenas/ssh.js
+++ b/src/driver/freenas/ssh.js
@ -1217,9 +1217,8 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
                target = null;
                if (
                  response.statusCode == 422 &&
-                  JSON.stringify(response.body).includes(
+                  JSON.stringify(response.body)
-                    "Target name already exists"
+                    .match(/Target(.*)name already exists/g)?.length > 0
                  )
                ) {
                  target = await this.findResourceByProperties(
                    "/iscsi/target",
Author	SHA1	Message	Date
Matthew Mckenzie	bae76a2e1a	Merge `c86df7762d` into `55c36d62ff`	2025-07-18 09:12:26 +00:00
Matthew Mckenzie	c86df7762d	truenas-iscsi: error code has changed on target exists with 25.01 Updates target name existence check to use regex matching instead of includes, which is more robust.	2025-07-18 13:18:28 +10:00