GA ipsec interconnect tests (GoogleCloudPlatform#4983)

khajduczenia · Oct 12, 2021 · 99442a2 · 99442a2
1 parent 66b4c49
commit 99442a2
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 16 deletions.
diff --git a/mmv1/products/compute/terraform.yaml b/mmv1/products/compute/terraform.yaml
@@ -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
@@ -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
@@ -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

diff --git a/mmv1/templates/terraform/examples/compute_ha_vpn_gateway_encrypted_interconnect.tf.erb b/mmv1/templates/terraform/examples/compute_ha_vpn_gateway_encrypted_interconnect.tf.erb
@@ -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 {
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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
 }
diff --git a/mmv1/templates/terraform/examples/compute_interconnect_attachment_ipsec_encryption.tf.erb b/mmv1/templates/terraform/examples/compute_interconnect_attachment_ipsec_encryption.tf.erb
@@ -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"
@@ -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"
@@ -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
@@ -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
 }
diff --git a/mmv1/templates/terraform/examples/compute_router_encrypted_interconnect.tf.erb b/mmv1/templates/terraform/examples/compute_router_encrypted_interconnect.tf.erb
@@ -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
@@ -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
 }