Skip to content

Commit

Permalink
Promote labels field on google_compute_vpn_tunnel to GA (GoogleCl…
Browse files Browse the repository at this point in the history
…oudPlatform#9441)

* Promote `labels` field on `google_compute_vpn_tunnel` to GA

* Update GA vpn tunnel generated tests to include labels, remove beta-specific tests
  • Loading branch information
SarahFrench authored and swamitagupta committed Nov 14, 2023
1 parent d985d42 commit c57c7ee
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 100 deletions.
24 changes: 0 additions & 24 deletions mmv1/products/compute/VpnTunnel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,6 @@ examples:
- !ruby/object:Provider::Terraform::Examples
name: 'vpn_tunnel_basic'
primary_resource_id: 'tunnel1'
vars:
vpn_tunnel_name: 'tunnel-1'
target_vpn_gateway_name: 'vpn-1'
network_name: 'network-1'
address_name: 'vpn-static-ip'
esp_forwarding_rule_name: 'fr-esp'
udp500_forwarding_rule_name: 'fr-udp500'
udp4500_forwarding_rule_name: 'fr-udp4500'
route_name: 'route1'
- !ruby/object:Provider::Terraform::Examples
name: 'vpn_tunnel_beta'
primary_resource_id: 'tunnel1'
min_version: beta
vars:
vpn_tunnel_name: 'tunnel-1'
target_vpn_gateway_name: 'vpn-1'
Expand All @@ -69,16 +56,6 @@ examples:
udp4500_forwarding_rule_name: 'fr-udp4500'
route_name:
'route1'
# Add test_vars_overrides and oics_vars_overrides to fix the failing test,
# which is caused by upgradting terraform-plugin-sdk to 2.24.0.
provider_name: 'google-beta'
provider_alias: ''
test_vars_overrides:
provider_name: '"google-beta.us-central1"'
provider_alias: '"alias = \"us-central1\""'
oics_vars_overrides:
provider_name: 'google-beta'
provider_alias: ''
custom_code: !ruby/object:Provider::Terraform::CustomCode
constants: templates/terraform/constants/vpn_tunnel.erb
encoder: templates/terraform/encoders/vpn_tunnel.go.erb
Expand Down Expand Up @@ -235,7 +212,6 @@ properties:
description: Labels to apply to this VpnTunnel.
update_verb: :POST
update_url: 'projects/{{project}}/regions/{{region}}/vpnTunnels/{{name}}/setLabels'
min_version: beta
- !ruby/object:Api::Type::Fingerprint
name: 'labelFingerprint'
description: |
Expand Down
4 changes: 4 additions & 0 deletions mmv1/templates/terraform/examples/vpn_tunnel_basic.tf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ resource "google_compute_vpn_tunnel" "tunnel1" {
google_compute_forwarding_rule.fr_udp500,
google_compute_forwarding_rule.fr_udp4500,
]

labels = {
foo = "bar"
}
}

resource "google_compute_vpn_gateway" "target_gateway" {
Expand Down
76 changes: 0 additions & 76 deletions mmv1/templates/terraform/examples/vpn_tunnel_beta.tf.erb

This file was deleted.

0 comments on commit c57c7ee

Please sign in to comment.