diff --git a/README.md b/README.md index fdc71862..a3973683 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,10 @@ The current version is 20.X. The following guides are available to assist with u - [10.X -> 11.0](./docs/upgrading_to_sql_db_11.0.0.md) - [11.X -> 12.0](./docs/upgrading_to_sql_db_12.0.0.md) - [19.X -> 20.0](./docs/upgrading_to_sql_db_20.0.0.md) -- [20.X -> 21.0](./docs/upgrading_to_sql_db_21.0.0.md) +- [20.X -> 21.0](./docs/upgrading_to_sql_db_21.0.md) +- [21.X -> 22.0](./docs/upgrading_to_sql_db_22.0.md) +- [22.X -> 23.0](./docs/upgrading_to_sql_db_23.0.md) +- [23.X -> 24.0](./docs/upgrading_to_sql_db_24.0.md) ## Root module diff --git a/examples/postgresql-with-cross-region-failover/main.tf b/examples/postgresql-with-cross-region-failover/main.tf index 1a982563..95cca35b 100644 --- a/examples/postgresql-with-cross-region-failover/main.tf +++ b/examples/postgresql-with-cross-region-failover/main.tf @@ -94,7 +94,7 @@ module "pg1" { ip_configuration = { ipv4_enabled = false - require_ssl = true + ssl_mode = "ENCRYPTED_ONLY" private_network = google_compute_network.default.self_link allocated_ip_range = null authorized_networks = [ diff --git a/modules/postgresql/README.md b/modules/postgresql/README.md index cfb90e52..b2c1f38a 100644 --- a/modules/postgresql/README.md +++ b/modules/postgresql/README.md @@ -39,7 +39,7 @@ module "pg" { ip_configuration = { ipv4_enabled = true - require_ssl = true + ssl_mode = "ENCRYPTED_ONLY" // can also be ALLOW_UNENCRYPTED_AND_ENCRYPTED private_network = null allocated_ip_range = null authorized_networks = [ diff --git a/test/integration/postgresql-with-cross-region-failover/postgresql_cross_region_failover_test.go b/test/integration/postgresql-with-cross-region-failover/postgresql_cross_region_failover_test.go index 7e2bb046..2ace15bc 100644 --- a/test/integration/postgresql-with-cross-region-failover/postgresql_cross_region_failover_test.go +++ b/test/integration/postgresql-with-cross-region-failover/postgresql_cross_region_failover_test.go @@ -67,7 +67,7 @@ func TestPostgreSqlCrossRegionFailover(t *testing.T) { // assert general database settings assert.Equal("REGIONAL", op.Get("settings.availabilityType").String(), "Expected REGIONAL availabilityType") assert.Equal("PD_SSD", op.Get("settings.dataDiskType").String(), "Expected PD_SSD dataDiskType") - assert.Equal("ALLOW_UNENCRYPTED_AND_ENCRYPTED", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode") + assert.Equal("ENCRYPTED_ONLY", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode") // assert user labels assert.JSONEq(`{"foo": "bar", "instance": "instance-1"}`, op.Get("settings.userLabels").Raw, `Expected {"foo": "bar", "instance": "instance-1"} userLabels`) @@ -85,7 +85,7 @@ func TestPostgreSqlCrossRegionFailover(t *testing.T) { assert.Equal(int64(365), op.Get("settings.backupConfiguration.backupRetentionSettings.retainedBackups").Int(), "Expected 365 backupConfigurationRetainedBackups") assert.Equal("COUNT", op.Get("settings.backupConfiguration.backupRetentionSettings.retentionUnit").String(), "Expected COUNT backupConfigurationRetentionUnit") assert.True(op.Get("settings.backupConfiguration.pointInTimeRecoveryEnabled").Bool(), "Expected TRUE") - assert.Equal("ALLOW_UNENCRYPTED_AND_ENCRYPTED", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode") + assert.Equal("ENCRYPTED_ONLY", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode") assert.Equal("14", op.Get("settings.backupConfiguration.transactionLogRetentionDays").String(), "Expected transactionLogRetentionDays 14") // assert Encryption configuration