Skip to content

Commit f0f0ae1

Browse files
Revert "SSL Mode and Require Connectors support for AlloyDB (#9064)" (#9192) (#16181)
[upstream:af65a6de8835cbdbd4ecf481be486b34c7122e59] Signed-off-by: Modular Magician <[email protected]>
1 parent d8bae2f commit f0f0ae1

9 files changed

+7
-647
lines changed

.changelog/9192.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/services/alloydb/resource_alloydb_backup_generated_test.go

-12
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ resource "google_alloydb_instance" "default" {
7575
cluster = google_alloydb_cluster.default.name
7676
instance_id = "tf-test-alloydb-instance%{random_suffix}"
7777
instance_type = "PRIMARY"
78-
client_connection_config {
79-
require_connectors = false
80-
ssl_config {
81-
ssl_mode = "ENCRYPTED_ONLY"
82-
}
83-
}
8478
8579
depends_on = [google_service_networking_connection.vpc_connection]
8680
}
@@ -155,12 +149,6 @@ resource "google_alloydb_instance" "default" {
155149
cluster = google_alloydb_cluster.default.name
156150
instance_id = "tf-test-alloydb-instance%{random_suffix}"
157151
instance_type = "PRIMARY"
158-
client_connection_config {
159-
require_connectors = false
160-
ssl_config {
161-
ssl_mode = "ENCRYPTED_ONLY"
162-
}
163-
}
164152
165153
depends_on = [google_service_networking_connection.vpc_connection]
166154
}

google/services/alloydb/resource_alloydb_backup_test.go

-24
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ resource "google_alloydb_instance" "default" {
6969
cluster = google_alloydb_cluster.default.name
7070
instance_id = "tf-test-alloydb-instance%{random_suffix}"
7171
instance_type = "PRIMARY"
72-
client_connection_config {
73-
require_connectors = false
74-
ssl_config {
75-
ssl_mode = "ENCRYPTED_ONLY"
76-
}
77-
}
7872
}
7973
8074
data "google_compute_network" "default" {
@@ -109,12 +103,6 @@ resource "google_alloydb_instance" "default" {
109103
cluster = google_alloydb_cluster.default.name
110104
instance_id = "tf-test-alloydb-instance%{random_suffix}"
111105
instance_type = "PRIMARY"
112-
client_connection_config {
113-
require_connectors = false
114-
ssl_config {
115-
ssl_mode = "ENCRYPTED_ONLY"
116-
}
117-
}
118106
}
119107
120108
data "google_compute_network" "default" {
@@ -169,12 +157,6 @@ resource "google_alloydb_instance" "default" {
169157
cluster = google_alloydb_cluster.default.name
170158
instance_id = "tf-test-alloydb-instance%{random_suffix}"
171159
instance_type = "PRIMARY"
172-
client_connection_config {
173-
require_connectors = false
174-
ssl_config {
175-
ssl_mode = "ENCRYPTED_ONLY"
176-
}
177-
}
178160
}
179161
`, context)
180162
}
@@ -233,12 +215,6 @@ resource "google_alloydb_instance" "default" {
233215
cluster = google_alloydb_cluster.default.name
234216
instance_id = "tf-test-alloydb-instance%{random_suffix}"
235217
instance_type = "PRIMARY"
236-
client_connection_config {
237-
require_connectors = false
238-
ssl_config {
239-
ssl_mode = "ENCRYPTED_ONLY"
240-
}
241-
}
242218
}
243219
244220
data "google_compute_network" "default" {

google/services/alloydb/resource_alloydb_cluster_restore_test.go

-48
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,6 @@ resource "google_alloydb_instance" "source" {
9595
cluster = google_alloydb_cluster.source.name
9696
instance_id = "tf-test-alloydb-instance%{random_suffix}"
9797
instance_type = "PRIMARY"
98-
client_connection_config {
99-
require_connectors = false
100-
ssl_config {
101-
ssl_mode = "ENCRYPTED_ONLY"
102-
}
103-
}
10498
}
10599
106100
resource "google_alloydb_backup" "default" {
@@ -132,12 +126,6 @@ resource "google_alloydb_instance" "source" {
132126
cluster = google_alloydb_cluster.source.name
133127
instance_id = "tf-test-alloydb-instance%{random_suffix}"
134128
instance_type = "PRIMARY"
135-
client_connection_config {
136-
require_connectors = false
137-
ssl_config {
138-
ssl_mode = "ENCRYPTED_ONLY"
139-
}
140-
}
141129
}
142130
143131
resource "google_alloydb_backup" "default" {
@@ -186,12 +174,6 @@ resource "google_alloydb_instance" "source" {
186174
cluster = google_alloydb_cluster.source.name
187175
instance_id = "tf-test-alloydb-instance%{random_suffix}"
188176
instance_type = "PRIMARY"
189-
client_connection_config {
190-
require_connectors = false
191-
ssl_config {
192-
ssl_mode = "ENCRYPTED_ONLY"
193-
}
194-
}
195177
}
196178
197179
resource "google_alloydb_backup" "default" {
@@ -236,12 +218,6 @@ resource "google_alloydb_instance" "source" {
236218
cluster = google_alloydb_cluster.source.name
237219
instance_id = "tf-test-alloydb-instance%{random_suffix}"
238220
instance_type = "PRIMARY"
239-
client_connection_config {
240-
require_connectors = false
241-
ssl_config {
242-
ssl_mode = "ENCRYPTED_ONLY"
243-
}
244-
}
245221
}
246222
247223
resource "google_alloydb_backup" "default" {
@@ -287,12 +263,6 @@ resource "google_alloydb_instance" "source" {
287263
cluster = google_alloydb_cluster.source.name
288264
instance_id = "tf-test-alloydb-instance%{random_suffix}"
289265
instance_type = "PRIMARY"
290-
client_connection_config {
291-
require_connectors = false
292-
ssl_config {
293-
ssl_mode = "ENCRYPTED_ONLY"
294-
}
295-
}
296266
}
297267
298268
resource "google_alloydb_backup" "default" {
@@ -352,12 +322,6 @@ resource "google_alloydb_instance" "source" {
352322
cluster = google_alloydb_cluster.source.name
353323
instance_id = "tf-test-alloydb-instance%{random_suffix}"
354324
instance_type = "PRIMARY"
355-
client_connection_config {
356-
require_connectors = false
357-
ssl_config {
358-
ssl_mode = "ENCRYPTED_ONLY"
359-
}
360-
}
361325
}
362326
363327
resource "google_alloydb_backup" "default" {
@@ -427,12 +391,6 @@ resource "google_alloydb_instance" "source" {
427391
cluster = google_alloydb_cluster.source.name
428392
instance_id = "tf-test-alloydb-instance%{random_suffix}"
429393
instance_type = "PRIMARY"
430-
client_connection_config {
431-
require_connectors = false
432-
ssl_config {
433-
ssl_mode = "ENCRYPTED_ONLY"
434-
}
435-
}
436394
}
437395
438396
resource "google_alloydb_backup" "default" {
@@ -512,12 +470,6 @@ resource "google_alloydb_instance" "source" {
512470
cluster = google_alloydb_cluster.source.name
513471
instance_id = "tf-test-alloydb-instance%{random_suffix}"
514472
instance_type = "PRIMARY"
515-
client_connection_config {
516-
require_connectors = false
517-
ssl_config {
518-
ssl_mode = "ENCRYPTED_ONLY"
519-
}
520-
}
521473
}
522474
523475
resource "google_alloydb_backup" "default" {

0 commit comments

Comments
 (0)