Skip to content

Commit 925f6d8

Browse files
Promote cipher fields to GA in google_compute_vpn_tunnel resource (#15138) (#10728)
[upstream:dd02040c77394204720e33d45a70c816977fd102] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent e194221 commit 925f6d8

File tree

3 files changed

+14
-27
lines changed

3 files changed

+14
-27
lines changed

.changelog/15138.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
compute: added `cipher_suite` field to `google_compute_vpn_tunnel` resource (GA)
3+
```

google-beta/services/compute/resource_compute_vpn_tunnel_generated_test.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func TestAccComputeVpnTunnel_vpnTunnelCipherSuiteExample(t *testing.T) {
131131

132132
acctest.VcrTest(t, resource.TestCase{
133133
PreCheck: func() { acctest.AccTestPreCheck(t) },
134-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
134+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
135135
CheckDestroy: testAccCheckComputeVpnTunnelDestroyProducer(t),
136136
Steps: []resource.TestStep{
137137
{
@@ -150,7 +150,6 @@ func TestAccComputeVpnTunnel_vpnTunnelCipherSuiteExample(t *testing.T) {
150150
func testAccComputeVpnTunnel_vpnTunnelCipherSuiteExample(context map[string]interface{}) string {
151151
return acctest.Nprintf(`
152152
resource "google_compute_vpn_tunnel" "tunnel1" {
153-
provider = google-beta
154153
name = "tf-test-tunnel-cipher%{random_suffix}"
155154
peer_ip = "15.0.0.120"
156155
shared_secret = "a secret message"
@@ -183,31 +182,26 @@ resource "google_compute_vpn_tunnel" "tunnel1" {
183182
}
184183
185184
resource "google_compute_vpn_gateway" "target_gateway" {
186-
provider = google-beta
187185
name = "tf-test-vpn-1%{random_suffix}"
188186
network = google_compute_network.network1.id
189187
}
190188
191189
resource "google_compute_network" "network1" {
192-
provider = google-beta
193190
name = "tf-test-network-1%{random_suffix}"
194191
}
195192
196193
resource "google_compute_address" "vpn_static_ip" {
197-
provider = google-beta
198194
name = "tf-test-vpn-static-ip%{random_suffix}"
199195
}
200196
201197
resource "google_compute_forwarding_rule" "fr_esp" {
202-
provider = google-beta
203198
name = "tf-test-fr-esp%{random_suffix}"
204199
ip_protocol = "ESP"
205200
ip_address = google_compute_address.vpn_static_ip.address
206201
target = google_compute_vpn_gateway.target_gateway.id
207202
}
208203
209204
resource "google_compute_forwarding_rule" "fr_udp500" {
210-
provider = google-beta
211205
name = "tf-test-fr-udp500%{random_suffix}"
212206
ip_protocol = "UDP"
213207
port_range = "500"
@@ -216,7 +210,6 @@ resource "google_compute_forwarding_rule" "fr_udp500" {
216210
}
217211
218212
resource "google_compute_forwarding_rule" "fr_udp4500" {
219-
provider = google-beta
220213
name = "tf-test-fr-udp4500%{random_suffix}"
221214
ip_protocol = "UDP"
222215
port_range = "4500"
@@ -225,7 +218,6 @@ resource "google_compute_forwarding_rule" "fr_udp4500" {
225218
}
226219
227220
resource "google_compute_route" "route1" {
228-
provider = google-beta
229221
name = "route1%{random_suffix}"
230222
network = google_compute_network.network1.name
231223
dest_range = "15.0.0.0/24"

website/docs/r/compute_vpn_tunnel.html.markdown

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ resource "google_compute_route" "route1" {
117117

118118
```hcl
119119
resource "google_compute_vpn_tunnel" "tunnel1" {
120-
provider = google-beta
121120
name = "tunnel-cipher"
122121
peer_ip = "15.0.0.120"
123122
shared_secret = "a secret message"
@@ -150,31 +149,26 @@ resource "google_compute_vpn_tunnel" "tunnel1" {
150149
}
151150
152151
resource "google_compute_vpn_gateway" "target_gateway" {
153-
provider = google-beta
154152
name = "vpn-1"
155153
network = google_compute_network.network1.id
156154
}
157155
158156
resource "google_compute_network" "network1" {
159-
provider = google-beta
160157
name = "network-1"
161158
}
162159
163160
resource "google_compute_address" "vpn_static_ip" {
164-
provider = google-beta
165161
name = "vpn-static-ip"
166162
}
167163
168164
resource "google_compute_forwarding_rule" "fr_esp" {
169-
provider = google-beta
170165
name = "fr-esp"
171166
ip_protocol = "ESP"
172167
ip_address = google_compute_address.vpn_static_ip.address
173168
target = google_compute_vpn_gateway.target_gateway.id
174169
}
175170
176171
resource "google_compute_forwarding_rule" "fr_udp500" {
177-
provider = google-beta
178172
name = "fr-udp500"
179173
ip_protocol = "UDP"
180174
port_range = "500"
@@ -183,7 +177,6 @@ resource "google_compute_forwarding_rule" "fr_udp500" {
183177
}
184178
185179
resource "google_compute_forwarding_rule" "fr_udp4500" {
186-
provider = google-beta
187180
name = "fr-udp4500"
188181
ip_protocol = "UDP"
189182
port_range = "4500"
@@ -192,7 +185,6 @@ resource "google_compute_forwarding_rule" "fr_udp4500" {
192185
}
193186
194187
resource "google_compute_route" "route1" {
195-
provider = google-beta
196188
name = "route1"
197189
network = google_compute_network.network1.name
198190
dest_range = "15.0.0.0/24"
@@ -293,7 +285,7 @@ The following arguments are supported:
293285
Please refer to the field `effective_labels` for all of the labels present on the resource.
294286

295287
* `cipher_suite` -
296-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
288+
(Optional)
297289
User specified list of ciphers to use for the phase 1 and phase 2 of the IKE protocol.
298290
Structure is [documented below](#nested_cipher_suite).
299291

@@ -309,46 +301,46 @@ The following arguments are supported:
309301
<a name="nested_cipher_suite"></a>The `cipher_suite` block supports:
310302

311303
* `phase1` -
312-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
304+
(Optional)
313305
Cipher configuration for phase 1 of the IKE protocol.
314306
Structure is [documented below](#nested_cipher_suite_phase1).
315307

316308
* `phase2` -
317-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
309+
(Optional)
318310
Cipher configuration for phase 2 of the IKE protocol.
319311
Structure is [documented below](#nested_cipher_suite_phase2).
320312

321313

322314
<a name="nested_cipher_suite_phase1"></a>The `phase1` block supports:
323315

324316
* `encryption` -
325-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
317+
(Optional)
326318
Encryption algorithms.
327319

328320
* `integrity` -
329-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
321+
(Optional)
330322
Integrity algorithms.
331323

332324
* `prf` -
333-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
325+
(Optional)
334326
Pseudo-random functions.
335327

336328
* `dh` -
337-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
329+
(Optional)
338330
Diffie-Hellman groups.
339331

340332
<a name="nested_cipher_suite_phase2"></a>The `phase2` block supports:
341333

342334
* `encryption` -
343-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
335+
(Optional)
344336
Encryption algorithms.
345337

346338
* `integrity` -
347-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
339+
(Optional)
348340
Integrity algorithms.
349341

350342
* `pfs` -
351-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
343+
(Optional)
352344
Perfect forward secrecy groups.
353345

354346
## Attributes Reference

0 commit comments

Comments
 (0)