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

add vpntunnel resourcerefs #1123

Merged
merged 2 commits into from
Jan 4, 2019
Merged

add vpntunnel resourcerefs #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9441b8
add vpntunnel resourcerefs
danawillow Dec 29, 2018
57a65ab
Update tracked submodules -> HEAD on Fri Jan 4 19:35:19 UTC 2019
modular-magician Jan 4, 2019
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 build/ansible
Open in desktop
Submodule ansible updated 3 files
+14 −6 lib/ansible/modules/cloud/google/gcp_compute_route.py
+3 −2 lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway.py
+3 −3 lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_facts.py
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from 4e07a6 to 509b21
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from f3bd15 to 7d8129
19 changes: 12 additions & 7 deletions products/compute/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2974,9 +2974,10 @@ objects:
description: |
Network IP address of an instance that should handle matching packets.
input: true
# TODO(nelsonjr): Make this a ResourceRef when VpnTunnel is submitted.
- !ruby/object:Api::Type::String
- !ruby/object:Api::Type::ResourceRef
name: 'nextHopVpnTunnel'
resource: 'VpnTunnel'
imports: 'selfLink'
description: |
URL to a VpnTunnel that should handle matching packets.
input: true
Expand Down Expand Up @@ -4086,21 +4087,25 @@ objects:
- !ruby/object:Api::Type::Array
name: 'tunnels'
description: |
A list of references to VpnTunnel resources associated to this VPN gateway.
# TODO(nelsonjr): Make this a ResourceRef when VpnTunnel is submitted.
item_type: Api::Type::String
A list of references to VpnTunnel resources associated with this VPN gateway.
item_type: !ruby/object:Api::Type::ResourceRef
name: 'tunnel'
resource: 'VpnTunnel'
imports: 'selfLink'
description: |
A VpnTunnel resource associated with this VPN gateway.
output: true
- !ruby/object:Api::Type::Array
name: 'forwardingRules'
description: |
A list of references to the ForwardingRule resources associated to this VPN
A list of references to the ForwardingRule resources associated with this VPN
gateway.
item_type: !ruby/object:Api::Type::ResourceRef
name: 'forwardingRule'
resource: 'ForwardingRule'
imports: 'selfLink'
description: |
A ForwardingRule resource associated to this VPN gateway.
A ForwardingRule resource associated with this VPN gateway.
output: true
# status is not useful for state convergence
- !ruby/object:Api::Resource
Expand Down
3 changes: 3 additions & 0 deletions third_party/terraform/tests/resource_compute_vpn_tunnel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ func testAccComputeVpnTunnel_basic() string {
return fmt.Sprintf(`
resource "google_compute_network" "foobar" {
name = "tunnel-test-%s"
auto_create_subnetworks = false
}
resource "google_compute_subnetwork" "foobar" {
name = "tunnel-test-subnetwork-%s"
Expand Down Expand Up @@ -161,6 +162,7 @@ func testAccComputeVpnTunnel_regionFromGateway(region string) string {
return fmt.Sprintf(`
resource "google_compute_network" "foobar" {
name = "tunnel-test-%s"
auto_create_subnetworks = false
}
resource "google_compute_subnetwork" "foobar" {
name = "tunnel-test-subnetwork-%s"
Expand Down Expand Up @@ -219,6 +221,7 @@ func testAccComputeVpnTunnelRouter(router string) string {
return fmt.Sprintf(`
resource "google_compute_network" "foobar" {
name = "tunnel-test-%s"
auto_create_subnetworks = false
}
resource "google_compute_subnetwork" "foobar" {
name = "tunnel-test-subnetwork-%s"
Expand Down