PATCH: Merge pull request #8 from Datatamer/revert-cloud-sql-module-version

DEV-14982 Revert cloud sql module version back to v2.1.0

Author: daniosim

CHANGELOG.md

@@ -1,6 +1,3 @@
-# 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/cloud sql instance | `bool` | `false` | no |
+| force\_destroy | force destroy potentially persistent resources, like bigtable/gcs | `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 |

main.tf

@@ -28,15 +28,13 @@ module "iam" {
 }
 
 module "cloud_sql" {
-  source = "git::[email protected]:Datatamer/terraform-gcp-tamr-cloud-sql.git?ref=v4.6.0"
+  source = "git::[email protected]:Datatamer/terraform-gcp-tamr-cloud-sql.git?ref=v2.1.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/cloud sql instance"
+  description = "force destroy potentially persistent resources, like bigtable/gcs"
 }