Skip to content

Commit dd02040

Browse files
authored
Promote cipher fields to GA in google_compute_vpn_tunnel resource (#15138)
1 parent d8b6962 commit dd02040

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

mmv1/products/compute/VpnTunnel.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ examples:
5353
udp4500_forwarding_rule_name: 'fr-udp4500'
5454
route_name: 'route1'
5555
- name: 'vpn_tunnel_cipher_suite'
56-
min_version: 'beta'
5756
primary_resource_id: 'tunnel1'
5857
vars:
5958
vpn_tunnel_name: 'tunnel-cipher'
@@ -233,66 +232,56 @@ properties:
233232
output: true
234233
- name: 'cipherSuite'
235234
type: NestedObject
236-
min_version: 'beta'
237235
description: |
238236
User specified list of ciphers to use for the phase 1 and phase 2 of the IKE protocol.
239237
properties:
240238
- name: 'phase1'
241239
type: NestedObject
242240
description: 'Cipher configuration for phase 1 of the IKE protocol.'
243-
min_version: 'beta'
244241
properties:
245242
- name: 'encryption'
246243
type: Array
247244
description: 'Encryption algorithms.'
248245
is_set: true
249-
min_version: 'beta'
250246
item_type:
251247
type: String
252248
- name: 'integrity'
253249
type: Array
254250
description: 'Integrity algorithms.'
255251
is_set: true
256-
min_version: 'beta'
257252
item_type:
258253
type: String
259254
- name: 'prf'
260255
type: Array
261256
description: 'Pseudo-random functions.'
262257
is_set: true
263-
min_version: 'beta'
264258
item_type:
265259
type: String
266260
- name: 'dh'
267261
type: Array
268262
description: 'Diffie-Hellman groups.'
269263
is_set: true
270-
min_version: 'beta'
271264
item_type:
272265
type: String
273266
- name: 'phase2'
274267
type: NestedObject
275268
description: 'Cipher configuration for phase 2 of the IKE protocol.'
276-
min_version: 'beta'
277269
properties:
278270
- name: 'encryption'
279271
type: Array
280272
description: 'Encryption algorithms.'
281273
is_set: true
282-
min_version: 'beta'
283274
item_type:
284275
type: String
285276
- name: 'integrity'
286277
type: Array
287278
description: 'Integrity algorithms.'
288279
is_set: true
289-
min_version: 'beta'
290280
item_type:
291281
type: String
292282
- name: 'pfs'
293283
type: Array
294284
description: 'Perfect forward secrecy groups.'
295285
is_set: true
296-
min_version: 'beta'
297286
item_type:
298287
type: String

mmv1/templates/terraform/examples/vpn_tunnel_cipher_suite.tf.tmpl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
resource "google_compute_vpn_tunnel" "tunnel1" {
2-
provider = google-beta
32
name = "{{index $.Vars "vpn_tunnel_name"}}"
43
peer_ip = "15.0.0.120"
54
shared_secret = "a secret message"
@@ -32,31 +31,26 @@ resource "google_compute_vpn_tunnel" "tunnel1" {
3231
}
3332

3433
resource "google_compute_vpn_gateway" "target_gateway" {
35-
provider = google-beta
3634
name = "{{index $.Vars "target_vpn_gateway_name"}}"
3735
network = google_compute_network.network1.id
3836
}
3937

4038
resource "google_compute_network" "network1" {
41-
provider = google-beta
4239
name = "{{index $.Vars "network_name"}}"
4340
}
4441

4542
resource "google_compute_address" "vpn_static_ip" {
46-
provider = google-beta
4743
name = "{{index $.Vars "address_name"}}"
4844
}
4945

5046
resource "google_compute_forwarding_rule" "fr_esp" {
51-
provider = google-beta
5247
name = "{{index $.Vars "esp_forwarding_rule_name"}}"
5348
ip_protocol = "ESP"
5449
ip_address = google_compute_address.vpn_static_ip.address
5550
target = google_compute_vpn_gateway.target_gateway.id
5651
}
5752

5853
resource "google_compute_forwarding_rule" "fr_udp500" {
59-
provider = google-beta
6054
name = "{{index $.Vars "udp500_forwarding_rule_name"}}"
6155
ip_protocol = "UDP"
6256
port_range = "500"
@@ -65,7 +59,6 @@ resource "google_compute_forwarding_rule" "fr_udp500" {
6559
}
6660

6761
resource "google_compute_forwarding_rule" "fr_udp4500" {
68-
provider = google-beta
6962
name = "{{index $.Vars "udp4500_forwarding_rule_name"}}"
7063
ip_protocol = "UDP"
7164
port_range = "4500"
@@ -74,7 +67,6 @@ resource "google_compute_forwarding_rule" "fr_udp4500" {
7467
}
7568

7669
resource "google_compute_route" "route1" {
77-
provider = google-beta
7870
name = "{{index $.Vars "route_name"}}"
7971
network = google_compute_network.network1.name
8072
dest_range = "15.0.0.0/24"

0 commit comments

Comments
 (0)