Merge remote-tracking branch 'origin/integration' into integration

NationalSecurityAgency · Apr 26, 2024 · c8fd536 · c8fd536
2 parents 40e39f8 + 8825175
commit c8fd536
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrib/datawave-quickstart/bin/services/nifi/bootstrap.sh b/contrib/datawave-quickstart/bin/services/nifi/bootstrap.sh
@@ -4,9 +4,9 @@ DW_NIFI_SERVICE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # You may override DW_NIFI_DIST_URI in your env ahead of time, and set as file:///path/to/file.tar.gz for local tarball, if needed
 # DW_NIFI_DIST_URI should, if possible, be using https. There are potential security risks by using http.
-DW_NIFI_DIST_URI="${DW_NIFI_DIST_URI:-https://archive.apache.org/dist/nifi/1.1.1/nifi-1.1.1-bin.tar.gz}"
+DW_NIFI_DIST_URI="${DW_NIFI_DIST_URI:-https://dlcdn.apache.org/nifi/1.25.0/nifi-1.25.0-bin.zip}"
 # The sha512 checksum for the tarball. Value should be the hash value only and does not include the file name. Cannot be left blank.
-DW_NIFI_DIST_SHA512_CHECKSUM="${DW_NIFI_DIST_SHA512_CHECKSUM:-2d37810985bda230180aac82f9fcf7a23a2e7a2257cf8b3c31d18280a2c67ba165061ba801389d6bb12cdb261d4a9aeef29e931e434144bc3ee5a3d6cfd6cdfa}"
+DW_NIFI_DIST_SHA512_CHECKSUM="${DW_NIFI_DIST_SHA512_CHECKSUM:-3798e8923cfc9099b785ee2019e9a0fe8bcd36301946f19d21d414800ca6b7fedd1bbe28764fa446262a2f47b1c608651208c8d8790c73bea9ebd839f42dbab1}"
 DW_NIFI_DIST="$( downloadTarball "${DW_NIFI_DIST_URI}" "${DW_NIFI_SERVICE_DIR}" && echo "${tarball}" )"
 DW_NIFI_BASEDIR="nifi-install"
 DW_NIFI_SYMLINK="nifi"

diff --git a/contrib/datawave-quickstart/bin/services/nifi/install.sh b/contrib/datawave-quickstart/bin/services/nifi/install.sh
@@ -13,11 +13,11 @@ nifiIsInstalled || verifyChecksum "${DW_NIFI_DIST_URI}" "${DW_NIFI_SERVICE_DIR}"
 
 nifiIsInstalled && info "NiFi is already installed" && exit 1
 
-[ ! -f "${DW_NIFI_SERVICE_DIR}/${DW_NIFI_DIST}" ] && fatal "NiFi tarball not found"
+[ ! -f "${DW_NIFI_SERVICE_DIR}/${DW_NIFI_DIST}" ] && fatal "NiFi zip file not found"
 
 mkdir "${DW_NIFI_SERVICE_DIR}/${DW_NIFI_BASEDIR}" || fatal "Failed to create NiFi base directory"
 
-tar xf "${DW_NIFI_SERVICE_DIR}/${DW_NIFI_DIST}" -C "${DW_NIFI_SERVICE_DIR}/${DW_NIFI_BASEDIR}" --strip-components=1 || fatal "Failed to extract NiFi tarball"
+unzip "${DW_NIFI_SERVICE_DIR}/${DW_NIFI_DIST}" -d "${DW_NIFI_SERVICE_DIR}/${DW_NIFI_BASEDIR}" || fatal "Failed to extract NiFi tarball"
 $( cd "${DW_CLOUD_HOME}" && ln -s "bin/services/nifi/${DW_NIFI_BASEDIR}" "${DW_NIFI_SYMLINK}" ) || fatal "Failed to create NiFi symlink"
 
 nifiIsInstalled || fatal "NiFi was not installed"