Merge pull request #693 from orgads/dasel-2.3.4

chore: update dasel to 2.4.1

Author: bnpfeife

influxdb/2.7/Dockerfile

@@ -17,10 +17,10 @@ RUN case "$(dpkg --print-architecture)" in \
       *arm64) arch=arm64 ;; \
       *) echo 'Unsupported architecture' && exit 1 ;; \
     esac && \
-    curl -fLo /usr/local/bin/dasel "https://github.com/TomWright/dasel/releases/download/v2.1.2/dasel_linux_${arch}" && \
+    curl -fL "https://github.com/TomWright/dasel/releases/download/v2.4.1/dasel_linux_${arch}.gz" | gzip -d > /usr/local/bin/dasel && \
     case ${arch} in \
-      amd64) echo 'e4b43d8c7d76904e2401dc81de0900d9cb69b006794ff3901ec5d50e96baa8ef  /usr/local/bin/dasel' ;; \
-      arm64) echo '92b83f30949679197403ff7a7e0f9ef3e458c1c55031d9c1bc112364e487d57d  /usr/local/bin/dasel' ;; \
+      amd64) echo '8e9fb0aa24e35774fab792005f05f9df141c22ec0a7436c7329a932582a10200  /usr/local/bin/dasel' ;; \
+      arm64) echo '535f0f4c6362aa4b773664f7cfdb52d86f2723eac52a1aca6dfc6a69e2341c17  /usr/local/bin/dasel' ;; \
     esac | sha256sum -c - && \
     chmod +x /usr/local/bin/dasel && \
     dasel --version

influxdb/2.7/alpine/Dockerfile

@@ -17,10 +17,10 @@ RUN case "$(apk --print-arch)" in \
       aarch64) arch=arm64 ;; \
       *) echo 'Unsupported architecture' && exit 1 ;; \
     esac && \
-    curl -fLo /usr/local/bin/dasel "https://github.com/TomWright/dasel/releases/download/v2.1.2/dasel_linux_${arch}" && \
+    curl -fL "https://github.com/TomWright/dasel/releases/download/v2.4.1/dasel_linux_${arch}.gz" | gzip -d > /usr/local/bin/dasel && \
     case ${arch} in \
-      amd64) echo 'e4b43d8c7d76904e2401dc81de0900d9cb69b006794ff3901ec5d50e96baa8ef  /usr/local/bin/dasel' ;; \
-      arm64) echo '92b83f30949679197403ff7a7e0f9ef3e458c1c55031d9c1bc112364e487d57d  /usr/local/bin/dasel' ;; \
+      amd64) echo '8e9fb0aa24e35774fab792005f05f9df141c22ec0a7436c7329a932582a10200  /usr/local/bin/dasel' ;; \
+      arm64) echo '535f0f4c6362aa4b773664f7cfdb52d86f2723eac52a1aca6dfc6a69e2341c17  /usr/local/bin/dasel' ;; \
     esac | sha256sum -c - && \
     chmod +x /usr/local/bin/dasel && \
     dasel --version

influxdb/2.7/alpine/entrypoint.sh

@@ -151,7 +151,6 @@ function influxd::config::get()
   #
 
   local value
-  local default
 
   # If no command line arguments match, retrieve the corresponding environment
   # variable. This differentiates between unset and empty variables. If empty,
@@ -166,34 +165,8 @@ function influxd::config::get()
   # Parse Value from Configuration
   #
 
-  case ${INFLUXD_CONFIG_PATH,,} in
-    *.toml)       local influxd_config_format=toml ;;
-    *.json)       local influxd_config_format=json ;;
-    *.yaml|*.yml) local influxd_config_format=yaml ;;
-  esac
-
-  # Unfortunately, dasel does not provide a method to test for the existence
-  # of a particular key. However, it returns with an error if it attempts to
-  # delete a nonexistent key. Since dasel will automatically update the
-  # configuration file, it is passed via `STDIN` to avoid this behavior.
-  if dasel -r "${influxd_config_format}" delete "${primary_key}" <"${INFLUXD_CONFIG_PATH}" &>/dev/null
-  then
-    # Unfortunately, dasel has inconsistent string displaying behavior. For
-    # yaml and toml, it will display the value without double-quotes unless
-    # the string is empty. However, for json, it always with double-quotes.
-    # This always strips the first leading and trailing double-quotes, as
-    # they are almost always not required.
-    value="$(dasel -f "${INFLUXD_CONFIG_PATH}" -s "${primary_key}")"
-
-    ( # strip leading and trailing " characters
-      shopt -s extglob
-      value="${value#'"'}"
-      value="${value%'"'}"
-      echo "${value}"
-    )
-  else
+  dasel -f "${INFLUXD_CONFIG_PATH}" -s "${primary_key}" -w - 2>/dev/null || \
     table::get "${primary_key}" "${COLUMN_DEFAULT}"
-  fi
 }
 
 function set_data_paths () {

influxdb/2.7/entrypoint.sh

@@ -151,7 +151,6 @@ function influxd::config::get()
   #
 
   local value
-  local default
 
   # If no command line arguments match, retrieve the corresponding environment
   # variable. This differentiates between unset and empty variables. If empty,
@@ -165,35 +164,8 @@ function influxd::config::get()
   #
   # Parse Value from Configuration
   #
-
-  case ${INFLUXD_CONFIG_PATH,,} in
-    *.toml)       local influxd_config_format=toml ;;
-    *.json)       local influxd_config_format=json ;;
-    *.yaml|*.yml) local influxd_config_format=yaml ;;
-  esac
-
-  # Unfortunately, dasel does not provide a method to test for the existence
-  # of a particular key. However, it returns with an error if it attempts to
-  # delete a nonexistent key. Since dasel will automatically update the
-  # configuration file, it is passed via `STDIN` to avoid this behavior.
-  if dasel -r "${influxd_config_format}" delete "${primary_key}" <"${INFLUXD_CONFIG_PATH}" &>/dev/null
-  then
-    # Unfortunately, dasel has inconsistent string displaying behavior. For
-    # yaml and toml, it will display the value without double-quotes unless
-    # the string is empty. However, for json, it always with double-quotes.
-    # This always strips the first leading and trailing double-quotes, as
-    # they are almost always not required.
-    value="$(dasel -f "${INFLUXD_CONFIG_PATH}" -s "${primary_key}")"
-
-    ( # strip leading and trailing " characters
-      shopt -s extglob
-      value="${value#'"'}"
-      value="${value%'"'}"
-      echo "${value}"
-    )
-  else
+  dasel -f "${INFLUXD_CONFIG_PATH}" -s "${primary_key}" -w - 2>/dev/null || \
     table::get "${primary_key}" "${COLUMN_DEFAULT}"
-  fi
 }
 
 function set_data_paths () {