Skip to content

Commit 4b18485

Browse files
drebesdrebes
committed
provider/google: make local_traffic_selector computed now that we read it back from server
1 parent 3e2f324 commit 4b18485

2 files changed

Lines changed: 64 additions & 0 deletions

File tree

‎builtin/providers/google/resource_compute_vpn_tunnel.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func resourceComputeVpnTunnel() *schema.Resource {
6868
Type: schema.TypeSet,
6969
Optional: true,
7070
ForceNew: true,
71+
Computed: true,
7172
Elem: &schema.Schema{Type: schema.TypeString},
7273
Set: schema.HashString,
7374
},

‎builtin/providers/google/resource_compute_vpn_tunnel_test.go‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@ func TestAccComputeVpnTunnel_basic(t *testing.T) {
3232
})
3333
}
3434

35+
func TestAccComputeVpnTunnel_defaultTrafficSelectors(t *testing.T) {
36+
37+
resource.Test(t, resource.TestCase{
38+
PreCheck: func() { testAccPreCheck(t) },
39+
Providers: testAccProviders,
40+
CheckDestroy: testAccCheckComputeVpnTunnelDestroy,
41+
Steps: []resource.TestStep{
42+
resource.TestStep{
43+
Config: testAccComputeVpnTunnelDefaultTrafficSelectors,
44+
Check: testAccCheckComputeVpnTunnelExists(
45+
"google_compute_vpn_tunnel.foobar"),
46+
},
47+
},
48+
})
49+
}
50+
3551
func testAccCheckComputeVpnTunnelDestroy(s *terraform.State) error {
3652
config := testAccProvider.Meta().(*Config)
3753
project := config.Project
@@ -137,3 +153,50 @@ resource "google_compute_vpn_tunnel" "foobar" {
137153
}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
138154
acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
139155
acctest.RandString(10), acctest.RandString(10))
156+
157+
var testAccComputeVpnTunnelDefaultTrafficSelectors = fmt.Sprintf(`
158+
resource "google_compute_network" "foobar" {
159+
name = "tunnel-test-%s"
160+
auto_create_subnetworks = "true"
161+
}
162+
resource "google_compute_address" "foobar" {
163+
name = "tunnel-test-%s"
164+
region = "us-central1"
165+
}
166+
resource "google_compute_vpn_gateway" "foobar" {
167+
name = "tunnel-test-%s"
168+
network = "${google_compute_network.foobar.self_link}"
169+
region = "${google_compute_address.foobar.region}"
170+
}
171+
resource "google_compute_forwarding_rule" "foobar_esp" {
172+
name = "tunnel-test-%s"
173+
region = "${google_compute_vpn_gateway.foobar.region}"
174+
ip_protocol = "ESP"
175+
ip_address = "${google_compute_address.foobar.address}"
176+
>
177+
}
178+
resource "google_compute_forwarding_rule" "foobar_udp500" {
179+
name = "tunnel-test-%s"
180+
region = "${google_compute_forwarding_rule.foobar_esp.region}"
181+
ip_protocol = "UDP"
182+
port_range = "500-500"
183+
ip_address = "${google_compute_address.foobar.address}"
184+
>
185+
}
186+
resource "google_compute_forwarding_rule" "foobar_udp4500" {
187+
name = "tunnel-test-%s"
188+
region = "${google_compute_forwarding_rule.foobar_udp500.region}"
189+
ip_protocol = "UDP"
190+
port_range = "4500-4500"
191+
ip_address = "${google_compute_address.foobar.address}"
192+
>
193+
}
194+
resource "google_compute_vpn_tunnel" "foobar" {
195+
name = "tunnel-test-%s"
196+
region = "${google_compute_forwarding_rule.foobar_udp4500.region}"
197+
target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
198+
shared_secret = "unguessable"
199+
peer_ip = "8.8.8.8"
200+
}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
201+
acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
202+
acctest.RandString(10))

0 commit comments

Comments
 (0)