From 38bee217dd4806b27e62ecb3fc4d335e004a9052 Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Mon, 6 May 2024 11:07:10 -0600
Subject: [PATCH] minor fixes

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
---
 CHANGELOG.md                    |  8 ++++++++
 Dockerfile                      |  3 ---
 docker/objectivefs-installer.sh |  5 +++++
 docker/simple-file-writer       |  3 ---
 src/driver/freenas/api.js       |  2 +-
 src/driver/freenas/ssh.js       | 20 +++++---------------
 src/utils/iscsi.js              | 15 ++++++++++++---
 7 files changed, 31 insertions(+), 25 deletions(-)
 delete mode 100755 docker/simple-file-writer

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cdcec4..a0e716b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.9.1
+
+Released 2024-05-06
+
+- fix iscsi hostname lookup regression (#393)
+- fix resize issue (#390)
+- fix Probe issue (#385)
+
 # v1.9.0
 
 Released 2024-03-26
diff --git a/Dockerfile b/Dockerfile
index 47a2b21..e4c241a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,9 +109,6 @@ RUN chmod +x /usr/local/sbin/iscsiadm
 ADD docker/multipath /usr/local/sbin
 RUN chmod +x /usr/local/sbin/multipath
 
-ADD docker/simple-file-writer /usr/local/bin
-RUN chmod +x /usr/local/bin/simple-file-writer
-
 ## USE_HOST_MOUNT_TOOLS=1
 ADD docker/mount /usr/local/bin/mount
 RUN chmod +x /usr/local/bin/mount
diff --git a/docker/objectivefs-installer.sh b/docker/objectivefs-installer.sh
index e4618fc..e792925 100755
--- a/docker/objectivefs-installer.sh
+++ b/docker/objectivefs-installer.sh
@@ -3,6 +3,11 @@
 set -e
 set -x
 
+if [[ -z "${OBJECTIVEFS_DOWNLOAD_ID}" ]]; then
+  echo 'missing OBJECTIVEFS_DOWNLOAD_ID, moving on'
+  exit 0
+fi
+
 PLATFORM_TYPE=${1}
 
 if [[ "${PLATFORM_TYPE}" == "build" ]]; then
diff --git a/docker/simple-file-writer b/docker/simple-file-writer
deleted file mode 100755
index fb3e37c..0000000
--- a/docker/simple-file-writer
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo ${1} > ${2}
diff --git a/src/driver/freenas/api.js b/src/driver/freenas/api.js
index e728c37..600b167 100644
--- a/src/driver/freenas/api.js
+++ b/src/driver/freenas/api.js
@@ -2201,7 +2201,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
       } catch (err) {
         throw new GrpcError(
           grpc.status.FAILED_PRECONDITION,
-          `TrueNAS api is unavailable: ${err.getMessage()}`
+          `TrueNAS api is unavailable: ${String(err)}`
         );
       }
 
diff --git a/src/driver/freenas/ssh.js b/src/driver/freenas/ssh.js
index 29d90cb..b3a1a31 100644
--- a/src/driver/freenas/ssh.js
+++ b/src/driver/freenas/ssh.js
@@ -46,7 +46,7 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
       } catch (err) {
         throw new GrpcError(
           grpc.status.FAILED_PRECONDITION,
-          `TrueNAS api is unavailable: ${err.getMessage()}`
+          `TrueNAS api is unavailable: ${String(err)}`
         );
       }
 
@@ -2051,20 +2051,10 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
            * works on SCALE only ^
            *
            */
-
-          if (process.env.DEMOCRATIC_CSI_IS_CONTAINER == "true") {
-            // use the built-in wrapper script that works with sudo
-            command = execClient.buildCommand("simple-file-writer", [
-              "1",
-              `/sys/kernel/scst_tgt/devices/${kName}/resync_size`,
-            ]);
-          } else {
-            // TODO: syntax fails with sudo
-            command = execClient.buildCommand("sh", [
-              "-c",
-              `echo 1 > /sys/kernel/scst_tgt/devices/${kName}/resync_size`,
-            ]);
-          }
+          command = execClient.buildCommand("sh", [
+            "-c",
+            `"echo 1 > /sys/kernel/scst_tgt/devices/${kName}/resync_size"`,
+          ]);
           reload = true;
         } else {
           switch (apiVersion) {
diff --git a/src/utils/iscsi.js b/src/utils/iscsi.js
index b5f5bee..019f539 100644
--- a/src/utils/iscsi.js
+++ b/src/utils/iscsi.js
@@ -183,10 +183,19 @@ class ISCSI {
         let parsedPortalHostIP = "";
         if (parsedPortal.host) {
           // if host is not an ip address
-          if (net.isIP(parsedPortal.host) == 0) {
+          let parsedPortalHost = parsedPortal.host
+            .replaceAll("[", "")
+            .replaceAll("]", "");
+          if (net.isIP(parsedPortalHost) == 0) {
             // ipv6 response is without []
-            parsedPortalHostIP =
-              (await hostname_lookup(parsedPortal.host)) || "";
+            try {
+              parsedPortalHostIP =
+                (await hostname_lookup(parsedPortal.host)) || "";
+            } catch (err) {
+              console.log(
+                `failed to lookup hostname: host - ${parsedPortal.host}, error - ${err}`
+              );
+            }
           }
         }