sid-occrp/terraform-google-sql-dbPublic

forked fromterraform-google-modules/terraform-google-sql-db

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit9eba9fd

authored

Merge branch 'master' into master

2 parents361bce8 +cf5f184 commit9eba9fdCopy full SHA for 9eba9fd

File tree

26 files changed

+177

-36

lines changed

examples
- mssql-failover-replica
  - main.tf
- mssql-public
  - main.tf
- mysql-backup-create-service-account
  - main.tf
- mysql-ha
  - main.tf
- mysql-private
  - main.tf
- mysql-psc
  - main.tf
- mysql-public
  - main.tf
- postgresql-backup-provided-service-account
  - main.tf
- postgresql-ha
  - main.tf
- postgresql-psc
  - main.tf
- postgresql-public-iam
  - main.tf
- postgresql-public
  - main.tf
- postgresql-with-cross-region-failover
  - main.tf
- private_service_access
modules/private_service_access
test
- integration
  - mssql-failover-replica
    - mssql_failover_replica_test.go
  - mysql-psc
    - mysql_psc_test.go
  - postgresql-psc
    - postgresql_psc_test.go
  - postgresql-with-cross-region-failover
    - postgresql_cross_region_failover_test.go
- setup
  - main.tf

26 files changed

+177

-36

lines changed

`‎examples/mssql-failover-replica/main.tf‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ locals {`
`24`	`24`
`25`	`25`	`module"mssql1" {`
`26`	`26`	`source="terraform-google-modules/sql-db/google//modules/mssql"`
`27`		`-version="~>20.0"`
	`27`	`+version="~>21.0"`
`28`	`28`
`29`	`29`	`region=local.region_1`
`30`	`30`
`@@ -36,7 +36,7 @@ module "mssql1" {`
`36`	`36`
`37`	`37`	`deletion_protection=false`
`38`	`38`
`39`		`-tier="db-custom-10-65536"`
	`39`	`+tier="db-custom-4-15360"`
`40`	`40`
`41`	`41`	`ip_configuration={`
`42`	`42`	`ipv4_enabled=false`
`@@ -56,7 +56,7 @@ module "mssql1" {`
`56`	`56`
`57`	`57`	`module"mssql2" {`
`58`	`58`	`source="terraform-google-modules/sql-db/google//modules/mssql"`
`59`		`-version="~>20.0"`
	`59`	`+version="~>21.0"`
`60`	`60`
`61`	`61`	`master_instance_name=module.mssql1.instance_name`
`62`	`62`
`@@ -70,7 +70,7 @@ module "mssql2" {`
`70`	`70`
`71`	`71`	`deletion_protection=false`
`72`	`72`
`73`		`-tier="db-custom-10-65536"`
	`73`	`+tier="db-custom-4-15360"`
`74`	`74`
`75`	`75`	`ip_configuration={`
`76`	`76`	`ipv4_enabled=false`

`‎examples/mssql-public/main.tf‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`module"mssql" {`
`18`	`18`	`source="terraform-google-modules/sql-db/google//modules/mssql"`
`19`		`-version="~>20.0"`
	`19`	`+version="~>21.0"`
`20`	`20`
`21`	`21`	`name=var.name`
`22`	`22`	`random_instance_name=true`

`‎examples/mysql-backup-create-service-account/main.tf‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`module"mysql" {`
`18`	`18`	`source="terraform-google-modules/sql-db/google//modules/mysql"`
`19`		`-version="~>20.0"`
	`19`	`+version="~>21.0"`
`20`	`20`
`21`	`21`	`name="example-mysql-public"`
`22`	`22`	`database_version="MYSQL_8_0"`
`@@ -45,7 +45,7 @@ resource "google_storage_bucket" "backup" {`
`45`	`45`
`46`	`46`	`module"backup" {`
`47`	`47`	`source="terraform-google-modules/sql-db/google//modules/backup"`
`48`		`-version="~>20.0"`
	`48`	`+version="~>21.0"`
`49`	`49`
`50`	`50`	`region="us-central1"`
`51`	`51`	`project_id=var.project_id`

`‎examples/mysql-ha/main.tf‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ locals {`
`33`	`33`
`34`	`34`	`module"mysql" {`
`35`	`35`	`source="terraform-google-modules/sql-db/google//modules/mysql"`
`36`		`-version="~>20.0"`
	`36`	`+version="~>21.0"`
`37`	`37`
`38`	`38`	`name=var.mysql_ha_name`
`39`	`39`	`random_instance_name=true`

`‎examples/mysql-private/main.tf‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ module "network-safer-mysql-simple" {`
`39`	`39`
`40`	`40`	`module"private-service-access" {`
`41`	`41`	`source="terraform-google-modules/sql-db/google//modules/private_service_access"`
`42`		`-version="~>20.0"`
	`42`	`+version="~>21.0"`
`43`	`43`
`44`	`44`	`project_id=var.project_id`
`45`	`45`	`vpc_network=module.network-safer-mysql-simple.network_name`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`module"safer-mysql-db" {`
`49`	`49`	`source="terraform-google-modules/sql-db/google//modules/safer_mysql"`
`50`		`-version="~>20.0"`
	`50`	`+version="~>21.0"`
`51`	`51`
`52`	`52`	`name=var.db_name`
`53`	`53`	`random_instance_name=true`

`‎examples/mysql-psc/main.tf‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ locals {`
`27`	`27`
`28`	`28`	`module"mysql" {`
`29`	`29`	`source="terraform-google-modules/sql-db/google//modules/mysql"`
`30`		`-version="~>20.0"`
	`30`	`+version="~>21.0"`
`31`	`31`
`32`	`32`	`name=var.mysql_ha_name`
`33`	`33`	`random_instance_name=true`
`@@ -38,7 +38,7 @@ module "mysql" {`
`38`	`38`	`deletion_protection=false`
`39`	`39`
`40`	`40`	`// Master configurations`
`41`		`-tier="db-custom-4-15360"`
	`41`	`+tier="db-custom-2-7680"`
`42`	`42`	`zone="us-central1-c"`
`43`	`43`	`availability_type="REGIONAL"`
`44`	`44`	`maintenance_window_day=7`
`@@ -82,7 +82,7 @@ module "mysql" {`
`82`	`82`	`name="0"`
`83`	`83`	`zone="us-central1-a"`
`84`	`84`	`availability_type="REGIONAL"`
`85`		`- tier="db-custom-4-15360"`
	`85`	`+ tier="db-custom-2-7680"`
`86`	`86`	`ip_configuration= local.read_replica_ip_configuration`
`87`	`87`	`database_flags= [{ name="long_query_time", value=1 }]`
`88`	`88`	`disk_type="PD_SSD"`

`‎examples/mysql-public/main.tf‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ resource "random_id" "name" {`
`20`	`20`
`21`	`21`	`module"mysql-db" {`
`22`	`22`	`source="terraform-google-modules/sql-db/google//modules/mysql"`
`23`		`-version="~>20.0"`
	`23`	`+version="~>21.0"`
`24`	`24`
`25`	`25`	`name=var.db_name`
`26`	`26`	`random_instance_name=true`

`‎examples/postgresql-backup-provided-service-account/main.tf‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`module"postgresql" {`
`18`	`18`	`source="terraform-google-modules/sql-db/google//modules/postgresql"`
`19`		`-version="~>20.0"`
	`19`	`+version="~>21.0"`
`20`	`20`
`21`	`21`	`name="example-postgres"`
`22`	`22`	`random_instance_name=true`
`@@ -56,7 +56,7 @@ resource "google_monitoring_notification_channel" "email" {`
`56`	`56`
`57`	`57`	`module"backup" {`
`58`	`58`	`source="terraform-google-modules/sql-db/google//modules/backup"`
`59`		`-version="~>20.0"`
	`59`	`+version="~>21.0"`
`60`	`60`
`61`	`61`	`region="us-central1"`
`62`	`62`	`project_id=var.project_id`

`‎examples/postgresql-ha/main.tf‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ locals {`
`33`	`33`
`34`	`34`	`module"pg" {`
`35`	`35`	`source="terraform-google-modules/sql-db/google//modules/postgresql"`
`36`		`-version="~>20.0"`
	`36`	`+version="~>21.0"`
`37`	`37`
`38`	`38`	`name=var.pg_ha_name`
`39`	`39`	`random_instance_name=true`

`‎examples/postgresql-psc/main.tf‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ module "network-auto-psc" {`
`43`	`43`
`44`	`44`	`module"pg" {`
`45`	`45`	`source="terraform-google-modules/sql-db/google//modules/postgresql"`
`46`		`-version="~>20.0"`
	`46`	`+version="~>21.0"`
`47`	`47`
`48`	`48`	`name=var.pg_psc_name`
`49`	`49`	`random_instance_name=true`
`@@ -52,7 +52,7 @@ module "pg" {`
`52`	`52`	`region="us-central1"`
`53`	`53`
`54`	`54`	`// Master configurations`
`55`		`-tier="db-custom-16-61440"`
	`55`	`+tier="db-custom-2-7680"`
`56`	`56`	`zone="us-central1-c"`
`57`	`57`	`availability_type="REGIONAL"`
`58`	`58`	`maintenance_window_day=7`
`@@ -94,7 +94,7 @@ module "pg" {`
`94`	`94`	`name="0"`
`95`	`95`	`zone="us-central1-a"`
`96`	`96`	`availability_type="REGIONAL"`
`97`		`- tier="db-custom-16-61440"`
	`97`	`+ tier="db-custom-2-7680"`
`98`	`98`	`ip_configuration= local.read_replica_ip_configuration`
`99`	`99`	`database_flags= [{ name="autovacuum", value="off" }]`
`100`	`100`	`disk_type="PD_SSD"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9eba9fd

File tree

26 files changed

26 files changed

`‎examples/mssql-failover-replica/main.tf‎`

`‎examples/mssql-public/main.tf‎`

`‎examples/mysql-backup-create-service-account/main.tf‎`

`‎examples/mysql-ha/main.tf‎`

`‎examples/mysql-private/main.tf‎`

`‎examples/mysql-psc/main.tf‎`

`‎examples/mysql-public/main.tf‎`

`‎examples/postgresql-backup-provided-service-account/main.tf‎`

`‎examples/postgresql-ha/main.tf‎`

`‎examples/postgresql-psc/main.tf‎`

0 commit comments