Merge pull request #28 from Datatamer/pre-start_script

DSD-2264: allow users to pass pre-start script

Author: creynolds15

CHANGELOG.md

@@ -1,9 +1,15 @@
 # GCP Tamr VM module
 
+## v2.2.0 - May 1st 2023
+* Following optional input variables now available
+  * pre_install_bash
+* Allow users to supply custom script to prepare VM
+
 ## 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

README.md

@@ -39,6 +39,7 @@ This modules creates:
 | tamr\_zip\_uri | gcs location to download tamr zip from | `string` | n/a | yes |
 | labels | labels to attach to created resources | `map(string)` | `{}` | no |
 | metadata | custom metadata to attach to created VM | `map(string)` | `{}` | no |
+| pre\_install\_bash | Bash to be run before Tamr is installed.<br>  Likely to be used to meet Tamr's prerequisites, if not already met by the image. (https://docs.tamr.com/new/docs/requirements )<br>   This will only be run once before Tamr is installed, unless Tamr fails to install. This bash will also be run on subsequent attempts to install Tamr, so it is recommended that this bash is idempotent. | `string` | `""` | no |
 | tamr\_external\_ip | Create and attach an external ip to tamr VM | `bool` | `false` | no |
 | tamr\_instance\_deletion\_protection | Enabled deletion protection for the tamr VM | `bool` | `true` | no |
 | tamr\_instance\_disk\_size | size of the boot disk | `number` | `100` | no |

VERSION

@@ -1 +1,2 @@
-2.1.1
+2.2.0
+

main.tf

@@ -2,6 +2,7 @@ locals {
   external_ip = var.tamr_external_ip == true ? 1 : 0
 
   startup_script = templatefile("${path.module}/templates/startup_script.sh.tmpl", {
+    pre_install_bash    = var.pre_install_bash
     tamr_zip_uri        = var.tamr_zip_uri
     tamr_config         = var.tamr_config_file
     tamr_home_directory = var.tamr_instance_install_directory

templates/startup_script.sh.tmpl

@@ -12,8 +12,14 @@ ${tamr_config}
 EOF
 )
 
+
+
 # check if tamr has been installed on the VM, if not download and install it
 if [[ ! -f ${tamr_home_directory}/tamr/start-unify.sh ]]; then
+    # run any custom commands to prepare VM
+    %{ if pre_install_bash }
+    ${pre_install_bash}
+    %{ endif }
     # 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

variables.tf

@@ -102,6 +102,16 @@ variable "tamr_config_file" {
   description = "Override generated tamr configuration. The tamr configuration is specified using a yaml file, in the format that is documented (https://docs.tamr.com/previous/docs/configuration-configuring-unify#section-setting-configuration-variables) for configuring “many variables” at once."
 }
 
+variable "pre_install_bash" {
+  default     = ""
+  type        = string
+  description = <<EOF
+  Bash to be run before Tamr is installed.
+  Likely to be used to meet Tamr's prerequisites, if not already met by the image. (https://docs.tamr.com/new/docs/requirements )
+   This will only be run once before Tamr is installed, unless Tamr fails to install. This bash will also be run on subsequent attempts to install Tamr, so it is recommended that this bash is idempotent.
+  EOF
+}
+
 #
 # file system
 #