Skip to content

Commit bbb402c

Browse files
chore: remove require_ssl from examples (#673)
Co-authored-by: Imran Nayer <imrannayer@google.com>
1 parent fc59e29 commit bbb402c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

examples/postgresql-with-cross-region-failover/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ module "pg1" {
9494

9595
ip_configuration = {
9696
ipv4_enabled = false
97-
require_ssl = true
97+
ssl_mode = "ENCRYPTED_ONLY"
9898
private_network = google_compute_network.default.self_link
9999
allocated_ip_range = null
100100
authorized_networks = [

modules/postgresql/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module "pg" {
3939
4040
ip_configuration = {
4141
ipv4_enabled = true
42-
require_ssl = true
42+
ssl_mode = "ENCRYPTED_ONLY" // can also be ALLOW_UNENCRYPTED_AND_ENCRYPTED
4343
private_network = null
4444
allocated_ip_range = null
4545
authorized_networks = [

test/integration/postgresql-with-cross-region-failover/postgresql_cross_region_failover_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func TestPostgreSqlCrossRegionFailover(t *testing.T) {
6767
// assert general database settings
6868
assert.Equal("REGIONAL", op.Get("settings.availabilityType").String(), "Expected REGIONAL availabilityType")
6969
assert.Equal("PD_SSD", op.Get("settings.dataDiskType").String(), "Expected PD_SSD dataDiskType")
70-
assert.Equal("ALLOW_UNENCRYPTED_AND_ENCRYPTED", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode")
70+
assert.Equal("ENCRYPTED_ONLY", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode")
7171

7272
// assert user labels
7373
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) {
8585
assert.Equal(int64(365), op.Get("settings.backupConfiguration.backupRetentionSettings.retainedBackups").Int(), "Expected 365 backupConfigurationRetainedBackups")
8686
assert.Equal("COUNT", op.Get("settings.backupConfiguration.backupRetentionSettings.retentionUnit").String(), "Expected COUNT backupConfigurationRetentionUnit")
8787
assert.True(op.Get("settings.backupConfiguration.pointInTimeRecoveryEnabled").Bool(), "Expected TRUE")
88-
assert.Equal("ALLOW_UNENCRYPTED_AND_ENCRYPTED", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode")
88+
assert.Equal("ENCRYPTED_ONLY", op.Get("settings.ipConfiguration.sslMode").String(), "Expected ssl_mode")
8989
assert.Equal("14", op.Get("settings.backupConfiguration.transactionLogRetentionDays").String(), "Expected transactionLogRetentionDays 14")
9090

9191
// assert Encryption configuration

0 commit comments

Comments
 (0)