Merge pull request #27 from Datatamer/startup_script_bug

DSD-2258: bug: fix startup script

Author: creynolds15

CHANGELOG.md

@@ -1,5 +1,9 @@
 # GCP Tamr VM module
 
+## v2.1.1 - April 28th 2023
+* Startup script checks for the correct unify start script
+* Startup script avoids permission errors in creating custom config
+
 ## v2.1.0 - April 25th 2023
 * Following optional input variables now available
   * metadata

VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

templates/startup_script.sh.tmpl

@@ -13,14 +13,14 @@ EOF
 )
 
 # check if tamr has been installed on the VM, if not download and install it
-if [[ ! -f ${tamr_home_directory}/tamr/start.sh ]]; then
+if [[ ! -f ${tamr_home_directory}/tamr/start-unify.sh ]]; then
     # download tamr install
     sudo -S -u tamr -i /bin/bash -c 'gsutil cp ${tamr_zip_uri} ${tamr_home_directory}/unify.zip'
     # unzip and install unify
     sudo -S -u tamr -i /bin/bash -c 'unzip ${tamr_home_directory}/unify.zip -d ${tamr_home_directory}'
 
     # apply custom config
-    sudo -S -u tamr -i /bin/bash -c 'echo -e "$${TAMR_CONFIG}" > ${tamr_home_directory}/tamr/conf/unify-custom-config.yaml'
+    TAMR_CONFIG=$TAMR_CONFIG sudo -Eu tamr /bin/bash -c 'echo -e "$${TAMR_CONFIG}" > ${tamr_home_directory}/tamr/conf/unify-custom-config.yaml'
     chown -R tamr:tamr ${tamr_home_directory}/tamr/conf/unify-custom-config.yaml
 fi