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.

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

GA ipsec interconnect tests #4983

Merged
merged 1 commit into from
Jul 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions mmv1/products/compute/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
address_name: "test-address"
router_name: "test-router"
network_name: "test-network"
min_version: beta
properties:
id: !ruby/object:Overrides::Terraform::PropertyOverride
exclude: true
Expand Down Expand Up @@ -2102,7 +2101,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
vars:
router_name: "test-router"
network_name: "test-network"
min_version: beta
custom_code: !ruby/object:Provider::Terraform::CustomCode
constants: templates/terraform/constants/router.go.erb
resource_definition: templates/terraform/resource_definition/router.go.erb
Expand Down Expand Up @@ -2801,7 +2799,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
address2_name: "test-address2"
router_name: "test-router"
network_name: "test-network"
min_version: beta
properties:
name: !ruby/object:Overrides::Terraform::PropertyOverride
validation: !ruby/object:Provider::Terraform::Validation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_compute_ha_vpn_gateway" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
name = "<%= ctx[:vars]['ha_vpn_gateway_name'] %>"
network = google_compute_network.network.id
vpn_interfaces {
Expand All @@ -13,7 +12,6 @@ resource "google_compute_ha_vpn_gateway" "<%= ctx[:primary_resource_id] %>" {
}

resource "google_compute_interconnect_attachment" "attachment1" {
provider = google-beta
name = "<%= ctx[:vars]['interconnect_attachment1_name'] %>"
edge_availability_domain = "AVAILABILITY_DOMAIN_1"
type = "PARTNER"
Expand All @@ -25,7 +23,6 @@ resource "google_compute_interconnect_attachment" "attachment1" {
}

resource "google_compute_interconnect_attachment" "attachment2" {
provider = google-beta
name = "<%= ctx[:vars]['interconnect_attachment2_name'] %>"
edge_availability_domain = "AVAILABILITY_DOMAIN_2"
type = "PARTNER"
Expand All @@ -37,7 +34,6 @@ resource "google_compute_interconnect_attachment" "attachment2" {
}

resource "google_compute_address" "address1" {
provider = google-beta
name = "<%= ctx[:vars]['address1_name'] %>"
address_type = "INTERNAL"
purpose = "IPSEC_INTERCONNECT"
Expand All @@ -47,7 +43,6 @@ resource "google_compute_address" "address1" {
}

resource "google_compute_address" "address2" {
provider = google-beta
name = "<%= ctx[:vars]['address2_name'] %>"
address_type = "INTERNAL"
purpose = "IPSEC_INTERCONNECT"
Expand All @@ -57,7 +52,6 @@ resource "google_compute_address" "address2" {
}

resource "google_compute_router" "router" {
provider = google-beta
name = "<%= ctx[:vars]['router_name'] %>"
network = google_compute_network.network.name
encrypted_interconnect_router = true
Expand All @@ -67,7 +61,6 @@ resource "google_compute_router" "router" {
}

resource "google_compute_network" "network" {
provider = google-beta
name = "<%= ctx[:vars]['network_name'] %>"
auto_create_subnetworks = false
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_compute_interconnect_attachment" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
name = "<%= ctx[:vars]['interconnect_attachment_name'] %>"
edge_availability_domain = "AVAILABILITY_DOMAIN_1"
type = "PARTNER"
Expand All @@ -11,7 +10,6 @@ resource "google_compute_interconnect_attachment" "<%= ctx[:primary_resource_id]
}

resource "google_compute_address" "address" {
provider = google-beta
name = "<%= ctx[:vars]['address_name'] %>"
address_type = "INTERNAL"
purpose = "IPSEC_INTERCONNECT"
Expand All @@ -21,7 +19,6 @@ resource "google_compute_address" "address" {
}

resource "google_compute_router" "router" {
provider = google-beta
name = "<%= ctx[:vars]['router_name'] %>"
network = google_compute_network.network.name
encrypted_interconnect_router = true
Expand All @@ -31,7 +28,6 @@ resource "google_compute_router" "router" {
}

resource "google_compute_network" "network" {
provider = google-beta
name = "<%= ctx[:vars]['network_name'] %>"
auto_create_subnetworks = false
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_compute_router" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
name = "<%= ctx[:vars]['router_name'] %>"
network = google_compute_network.network.name
encrypted_interconnect_router = true
Expand All @@ -9,7 +8,6 @@ resource "google_compute_router" "<%= ctx[:primary_resource_id] %>" {
}

resource "google_compute_network" "network" {
provider = google-beta
name = "<%= ctx[:vars]['network_name'] %>"
auto_create_subnetworks = false
}