Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove require_ssl from examples #673

Merged
merged 6 commits into from
Jan 29, 2025
+4 −4
Merged

chore: remove require_ssl from examples #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
977c36d
Documentation: require_ssl does not have an effect
ckluente-1k5 Nov 28, 2024
0c161fd
Merge branch 'main' into fix_docs
imrannayer Jan 23, 2025
d19cdef
Merge branch 'main' into fix_docs
imrannayer Jan 23, 2025
c6ddaf5
Merge branch 'main' into fix_docs
imrannayer Jan 28, 2025
df5080b
fix: The default is 'ENCRYPTED_ONLY' now. Adapting tests accordingly
ckluente-1k5 Jan 29, 2025
a3be12c
Merge branch 'main' into fix_docs
imrannayer Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/postgresql-with-cross-region-failover/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion modules/postgresql/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions ...ntegration/postgresql-with-cross-region-failover/postgresql_cross_region_failover_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand All @@ -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
Expand Down