MINOR: Merge pull request #7 from Datatamer/add-deletion-protection-cloudsql

DEV-14982 Add deletion_protection for cloud sql instance

Author: daniosim

CHANGELOG.md

@@ -1,3 +1,6 @@
+# Tamr GCP Wrapper - v0.4.0 - August 18th 2021
+* Plumb through deletion_protection for cloud sql instance
+
 # Tamr GCP Wrapper - v0.2.1 - August 3rd 2020
 * Remove direct invocation of GLB module
 * update docs with more examples

README.md

@@ -60,7 +60,7 @@ No provider.
 | additional\_admin\_users | list of additional entities to give admin permissions to provisioned resources | `list(string)` | `[]` | no |
 | additional\_read\_users | list of additional entities to give read only permissions to provisioned resources | `list(string)` | `[]` | no |
 | bucket\_locations | Location for the gcs buckets, default is `US` | `string` | `"US"` | no |
-| force\_destroy | force destroy potentially persistent resources, like bigtable/gcs | `bool` | `false` | no |
+| force\_destroy | force destroy potentially persistent resources, like bigtable/gcs/cloud sql instance | `bool` | `false` | no |
 | labels | Labels to attach to created resources | `map(string)` | `{}` | no |
 | sql\_disk\_size | size of the disk to use on the tamr sql instance | `number` | `10` | no |
 | sql\_disk\_type | The disk type to use on the cloud SQL instance. should be either PD\_SSD or PD\_STANDARD | `string` | `"PD_SSD"` | no |

examples/load_balancer/main.tf

@@ -1,23 +1,23 @@
 locals {
-    deployment_name = "tamr-dev"
-    project         = "your-project"
-    region = "us-east1"
-    zone = "us-east1-b"
+  deployment_name = "tamr-dev"
+  project         = "your-project"
+  region          = "us-east1"
+  zone            = "us-east1-b"
 }
 
 module "tamr_stack" {
-  source = "git::[email protected]:Datatamer/terraform-gcp-tamr-vm.git?ref=v0.1.0"
+  source          = "git::[email protected]:Datatamer/terraform-gcp-tamr-vm.git?ref=v0.1.0"
   deployment_name = local.deployment_name
   # tamr VM
-  tamr_zip_uri = "gs://tamr-releases/v2020.015.0/unify.zip"
+  tamr_zip_uri        = "gs://tamr-releases/v2020.015.0/unify.zip"
   tamr_instance_image = "your-project/ubuntu"
   # bigtable config
-  tamr_bigtable_min_nodes   = 1
-  tamr_bigtable_max_nodes   = 10
+  tamr_bigtable_min_nodes = 1
+  tamr_bigtable_max_nodes = 10
   # network
   subnet_self_link = data.google_compute_subnetwork.project_subnet.self_link
-  region = local.region
-  zone = local.zone
+  region           = local.region
+  zone             = local.zone
   # misc
   # NOTE: this module will deploy all resources into this project
   project_id = local.project

examples/minimal/main.tf

@@ -1,16 +1,16 @@
 module "tamr_stack" {
-  source = "git::[email protected]:Datatamer/terraform-gcp-tamr-vm.git?ref=v0.1.0"
+  source          = "git::[email protected]:Datatamer/terraform-gcp-tamr-vm.git?ref=v0.1.0"
   deployment_name = "tamr-dev"
   # tamr VM
-  tamr_zip_uri = "gs://tamr-releases/v2020.015.0/unify.zip"
+  tamr_zip_uri        = "gs://tamr-releases/v2020.015.0/unify.zip"
   tamr_instance_image = "your-project/ubuntu"
   # bigtable config
-  tamr_bigtable_min_nodes   = 1
-  tamr_bigtable_max_nodes   = 10
+  tamr_bigtable_min_nodes = 1
+  tamr_bigtable_max_nodes = 10
   # network
   subnet_self_link = data.google_compute_subnetwork.project_subnet.self_link
-  region = "us-east1"
-  zone = "us-east1-b"
+  region           = "us-east1"
+  zone             = "us-east1-b"
   # misc
   # NOTE: this module will deploy all resources into this project
   project_id = "your-project"

main.tf

@@ -28,13 +28,15 @@ module "iam" {
 }
 
 module "cloud_sql" {
-  source = "git::[email protected]:Datatamer/terraform-gcp-tamr-cloud-sql.git?ref=v2.1.0"
+  source = "git::[email protected]:Datatamer/terraform-gcp-tamr-cloud-sql.git?ref=v4.6.0"
   name   = var.deployment_name
 
   project_id = var.project_id
   labels     = var.labels
   region     = var.region
 
+  deletion_protection = local.deletion_protection
+
   cloud_sql_viewer_members = local.read_users
   cloud_sql_client_members = local.admin_users
 

variables.tf

@@ -117,5 +117,5 @@ variable "labels" {
 variable "force_destroy" {
   default     = false
   type        = bool
-  description = "force destroy potentially persistent resources, like bigtable/gcs"
+  description = "force destroy potentially persistent resources, like bigtable/gcs/cloud sql instance"
 }