rebasing examples folder on master

drewmercer-bl · drewmercer-bl · commit bb7be8cd7ae7 · 2024-09-25T13:46:28.000-07:00
diff --git a/examples/mssql-failover-replica/README.md b/examples/mssql-failover-replica/README.md
@@ -23,7 +23,7 @@ Promote instance 2 as primary and change instance 1 as failover replica
 ```diff
 module "mssql2" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
 -  master_instance_name = module.mssql1.instance_name
 
@@ -36,7 +36,7 @@ module "mssql2" {
 ```diff
 - module "mssql1" {
 -   source  = "terraform-google-modules/sql-db/google//modules/mssql"
--   version = "~> 20.0"
+-   version = "~> 22.0"
 -   region = local.region_1
 -   name                 = "tf-mssql-public-1"
 -   random_instance_name = true
diff --git a/examples/mssql-failover-replica/main.tf b/examples/mssql-failover-replica/main.tf
@@ -56,7 +56,7 @@ module "mssql1" {
 
 module "mssql2" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   master_instance_name = module.mssql1.instance_name
 
diff --git a/examples/mssql-public/main.tf b/examples/mssql-public/main.tf
@@ -16,7 +16,7 @@
 
 module "mssql" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.name
   random_instance_name = true
diff --git a/examples/mysql-backup-create-service-account/main.tf b/examples/mysql-backup-create-service-account/main.tf
@@ -16,7 +16,7 @@
 
 module "mysql" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = "example-mysql-public"
   database_version     = "MYSQL_8_0"
@@ -29,7 +29,7 @@ module "mysql" {
   ip_configuration = {
     ipv4_enabled        = true
     private_network     = null
-    require_ssl         = true
+    ssl_mode            = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     allocated_ip_range  = null
     authorized_networks = []
   }
@@ -45,7 +45,7 @@ resource "google_storage_bucket" "backup" {
 
 module "backup" {
   source  = "terraform-google-modules/sql-db/google//modules/backup"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   region                = "us-central1"
   project_id            = var.project_id
diff --git a/examples/mysql-ha/main.tf b/examples/mysql-ha/main.tf
@@ -17,7 +17,7 @@
 locals {
   read_replica_ip_configuration = {
     ipv4_enabled       = true
-    require_ssl        = false
+    ssl_mode           = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     private_network    = null
     allocated_ip_range = null
     authorized_networks = [
@@ -33,7 +33,7 @@ locals {
 
 module "mysql" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.mysql_ha_name
   random_instance_name = true
@@ -59,7 +59,7 @@ module "mysql" {
 
   ip_configuration = {
     ipv4_enabled       = true
-    require_ssl        = true
+    ssl_mode           = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     private_network    = null
     allocated_ip_range = null
     authorized_networks = [
diff --git a/examples/mysql-private/main.tf b/examples/mysql-private/main.tf
@@ -39,15 +39,16 @@ module "network-safer-mysql-simple" {
 
 module "private-service-access" {
   source  = "terraform-google-modules/sql-db/google//modules/private_service_access"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
-  project_id  = var.project_id
-  vpc_network = module.network-safer-mysql-simple.network_name
+  project_id      = var.project_id
+  vpc_network     = module.network-safer-mysql-simple.network_name
+  deletion_policy = "ABANDON"
 }
 
 module "safer-mysql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/safer_mysql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.db_name
   random_instance_name = true
diff --git a/examples/mysql-psc/main.tf b/examples/mysql-psc/main.tf
@@ -17,7 +17,7 @@
 locals {
   read_replica_ip_configuration = {
     ipv4_enabled                  = false
-    require_ssl                   = false
+    ssl_mode                      = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     psc_enabled                   = true
     psc_allowed_consumer_projects = [var.project_id]
   }
@@ -27,7 +27,7 @@ locals {
 
 module "mysql" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.mysql_ha_name
   random_instance_name = true
diff --git a/examples/mysql-public/main.tf b/examples/mysql-public/main.tf
@@ -20,7 +20,7 @@ resource "random_id" "name" {
 
 module "mysql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/mysql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.db_name
   random_instance_name = true
@@ -35,7 +35,7 @@ module "mysql-db" {
   ip_configuration = {
     ipv4_enabled        = true
     private_network     = null
-    require_ssl         = true
+    ssl_mode            = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     allocated_ip_range  = null
     authorized_networks = var.authorized_networks
   }
diff --git a/examples/postgresql-backup-provided-service-account/main.tf b/examples/postgresql-backup-provided-service-account/main.tf
@@ -16,7 +16,7 @@
 
 module "postgresql" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = "example-postgres"
   random_instance_name = true
@@ -31,7 +31,7 @@ module "postgresql" {
   ip_configuration = {
     ipv4_enabled        = true
     private_network     = null
-    require_ssl         = true
+    ssl_mode            = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     allocated_ip_range  = null
     authorized_networks = []
   }
@@ -56,7 +56,7 @@ resource "google_monitoring_notification_channel" "email" {
 
 module "backup" {
   source  = "terraform-google-modules/sql-db/google//modules/backup"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   region                      = "us-central1"
   project_id                  = var.project_id
diff --git a/examples/postgresql-ha/main.tf b/examples/postgresql-ha/main.tf
@@ -18,8 +18,7 @@
 locals {
   read_replica_ip_configuration = {
     ipv4_enabled       = true
-    require_ssl        = false
-    ssl_mode           = "ENCRYPTED_ONLY"
+    ssl_mode           = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     private_network    = null
     allocated_ip_range = null
     authorized_networks = [
@@ -33,7 +32,7 @@ locals {
 
 module "pg" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.pg_ha_name
   random_instance_name = true
@@ -59,7 +58,7 @@ module "pg" {
 
   ip_configuration = {
     ipv4_enabled       = true
-    require_ssl        = true
+    ssl_mode           = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     private_network    = null
     allocated_ip_range = null
     authorized_networks = [
diff --git a/examples/postgresql-psc/main.tf b/examples/postgresql-psc/main.tf
@@ -18,16 +18,15 @@
 locals {
   read_replica_ip_configuration = {
     ipv4_enabled                  = false
-    require_ssl                   = false
-    ssl_mode                      = "ENCRYPTED_ONLY"
+    ssl_mode                      = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     psc_enabled                   = true
     psc_allowed_consumer_projects = [var.project_id]
   }
 }
 
 module "pg" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.pg_psc_name
   random_instance_name = true
@@ -59,6 +58,7 @@ module "pg" {
     ipv4_enabled                  = false
     psc_enabled                   = true
     psc_allowed_consumer_projects = [var.project_id]
+    ssl_mode                      = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
   }
 
   backup_configuration = {
diff --git a/examples/postgresql-public-iam/main.tf b/examples/postgresql-public-iam/main.tf
@@ -17,7 +17,7 @@
 
 module "postgresql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.db_name
   random_instance_name = true
@@ -32,7 +32,7 @@ module "postgresql-db" {
   ip_configuration = {
     ipv4_enabled        = true
     private_network     = null
-    require_ssl         = true
+    ssl_mode            = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     allocated_ip_range  = null
     authorized_networks = var.authorized_networks
   }
diff --git a/examples/postgresql-public/main.tf b/examples/postgresql-public/main.tf
@@ -17,7 +17,7 @@
 
 module "postgresql-db" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   name                 = var.db_name
   random_instance_name = true
@@ -34,7 +34,7 @@ module "postgresql-db" {
   ip_configuration = {
     ipv4_enabled        = true
     private_network     = null
-    require_ssl         = true
+    ssl_mode            = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     allocated_ip_range  = null
     authorized_networks = var.authorized_networks
   }
diff --git a/examples/postgresql-with-cross-region-failover/README.md b/examples/postgresql-with-cross-region-failover/README.md
@@ -26,7 +26,7 @@ Promote instance 2 as primary and change instance 1 as failover replica
 ```diff
 module "pg2" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
 -  master_instance_name = module.pg1.instance_name
 
diff --git a/examples/postgresql-with-cross-region-failover/main.tf b/examples/postgresql-with-cross-region-failover/main.tf
@@ -17,8 +17,7 @@
 locals {
   read_replica_ip_configuration = {
     ipv4_enabled       = false
-    require_ssl        = false
-    ssl_mode           = "ENCRYPTED_ONLY"
+    ssl_mode           = "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     private_network    = google_compute_network.default.self_link
     allocated_ip_range = null
     authorized_networks = [
@@ -47,7 +46,7 @@ data "google_compute_zones" "available_region2" {
 
 module "pg1" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
 
   name                 = var.pg_name_1
@@ -156,7 +155,7 @@ module "pg1" {
 
 module "pg2" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
 
   # Comment this parameter to promot instance 2 as primary instance. This will break replication between instance 1 and 2
@@ -209,7 +208,6 @@ module "pg2" {
 
   ip_configuration = {
     ipv4_enabled       = false
-    require_ssl        = true
     private_network    = google_compute_network.default.self_link
     allocated_ip_range = null
     authorized_networks = [
diff --git a/examples/private_service_access/main.tf b/examples/private_service_access/main.tf
@@ -23,7 +23,7 @@ resource "google_compute_network" "default" {
 
 module "test_psa" {
   source  = "terraform-google-modules/sql-db/google//modules/private_service_access"
-  version = "~> 21.0"
+  version = "~> 22.0"
 
   project_id      = var.project_id
   vpc_network     = google_compute_network.default.name
