Promote Cross-Site Interconnect to GA (#15830)

NandiniAgrawal15 · web-flow · commit 053986feb855 · 2025-12-09T16:17:58.000Z
diff --git a/mmv1/products/compute/CrossSiteNetwork.yaml b/mmv1/products/compute/CrossSiteNetwork.yaml
@@ -15,11 +15,10 @@
 name: 'CrossSiteNetwork'
 description: |
   Represents a cross-site-network resource. A CrossSiteNetwork is used to establish L2 connectivity between groups of Interconnects.
-min_version: beta
 references:
   guides:
     'Create a Cross-Site Interconnect': 'https://cloud.google.com/network-connectivity/docs/interconnect/how-to/cross-site/create-network'
-  api: 'https://cloud.google.com/compute/docs/reference/rest/beta/crossSiteNetworks'
+  api: 'https://cloud.google.com/compute/docs/reference/rest/v1/crossSiteNetworks'
 docs:
 base_url: 'projects/{{project}}/global/crossSiteNetworks'
 self_link: 'projects/{{project}}/global/crossSiteNetworks/{{name}}'
@@ -41,7 +40,6 @@ examples:
     vars:
       name: 'test-cross-site-network'
       description: 'Example cross site network'
-    min_version: 'beta'
     test_env_vars:
       project: 'PROJECT_NAME'
 parameters:
diff --git a/mmv1/products/compute/Interconnect.yaml b/mmv1/products/compute/Interconnect.yaml
@@ -433,7 +433,6 @@ properties:
         - 'MACSEC'
   - name: 'wireGroups'
     type: Array
-    min_version: beta
     description: |
       A list of the URLs of all CrossSiteNetwork WireGroups configured to use this Interconnect. The Interconnect cannot be deleted if this list is non-empty.
     output: true
diff --git a/mmv1/products/compute/WireGroup.yaml b/mmv1/products/compute/WireGroup.yaml
@@ -20,8 +20,7 @@ description: |
 references:
   guides:
     'Create a WireGroup': 'https://cloud.google.com/network-connectivity/docs/interconnect/how-to/cross-site/modify-network#add-wire-group'
-  api: 'https://cloud.google.com/compute/docs/reference/rest/beta/wireGroups'
-min_version: beta
+  api: 'https://cloud.google.com/compute/docs/reference/rest/v1/wireGroups'
 docs:
 id_format: 'projects/{{project}}/global/crossSiteNetworks/{{cross_site_network}}/wireGroups/{{name}}'
 base_url: 'projects/{{project}}/global/crossSiteNetworks/{{cross_site_network}}/wireGroups'
@@ -48,9 +47,17 @@ examples:
       name: 'test-wire-group'
       description: 'Example Wire Group'
       cross_site_network: 'test-cross-site-network'
-    min_version: 'beta'
     test_env_vars:
       project: 'PROJECT_NAME'
+  - name: 'compute_wire_group_basic_beta'
+    primary_resource_id: 'example-test-wire-group-beta'
+    vars:
+      name: 'test-wire-group-beta'
+      description: 'Example Wire Group Beta'
+      cross_site_network: 'test-cross-site-network-beta'
+    test_env_vars:
+      project: 'PROJECT_NAME'
+    min_version: 'beta'
 parameters:
   - name: 'crossSiteNetwork'
     type: ResourceRef
@@ -62,7 +69,6 @@ parameters:
     imports: 'name'
     diff_suppress_func: 'tpgresource.CompareResourceNames'
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
-    min_version: beta
 properties:
   - name: 'description'
     type: String
@@ -121,6 +127,7 @@ properties:
     type: NestedObject
     description: |
       Properties specific to the wire group.
+    min_version: 'beta'
     properties:
       - name: type
         type: enum
diff --git a/mmv1/templates/terraform/examples/compute_cross_site_network_basic.tf.tmpl b/mmv1/templates/terraform/examples/compute_cross_site_network_basic.tf.tmpl
@@ -1,9 +1,7 @@
 data "google_project" "project" {
-  provider = google-beta
 }
 
 resource "google_compute_cross_site_network" "{{$.PrimaryResourceId}}" {
   name                 = "{{index $.Vars "name"}}"
   description         = "{{index $.Vars "description"}}"
-  provider = google-beta
 }
diff --git a/mmv1/templates/terraform/examples/compute_wire_group_basic.tf.tmpl b/mmv1/templates/terraform/examples/compute_wire_group_basic.tf.tmpl
@@ -1,18 +1,15 @@
 data "google_project" "project" {
-provider = google-beta
 }
 
 resource "google_compute_cross_site_network" "example-cross-site-network" {
   name        = "{{index $.Vars "cross_site_network"}}"
   description = "Example cross site network"
-  provider    = google-beta
 }
 
 resource "google_compute_wire_group" "{{$.PrimaryResourceId}}" {
   name               = "{{index $.Vars "name"}}"
   description        = "{{index $.Vars "description"}}"
   cross_site_network = "{{index $.Vars "cross_site_network"}}"
-  provider           = google-beta
   depends_on = [
     google_compute_cross_site_network.example-cross-site-network
   ]
@@ -21,8 +18,5 @@ resource "google_compute_wire_group" "{{$.PrimaryResourceId}}" {
     fault_response =  "NONE"
     bandwidth_allocation = "ALLOCATE_PER_WIRE"
   }
-  wire_group_properties {
-    type = "WIRE"
-  }
   admin_enabled = true
 }
diff --git a/mmv1/templates/terraform/examples/compute_wire_group_basic_beta.tf.tmpl b/mmv1/templates/terraform/examples/compute_wire_group_basic_beta.tf.tmpl
@@ -0,0 +1,28 @@
+data "google_project" "project" {
+provider = "google-beta"
+}
+
+resource "google_compute_cross_site_network" "example-cross-site-network" {
+  provider = "google-beta"
+  name        = "{{index $.Vars "cross_site_network"}}"
+  description = "Example cross site network"
+}
+
+resource "google_compute_wire_group" "{{$.PrimaryResourceId}}" {
+  provider = "google-beta"
+  name               = "{{index $.Vars "name"}}"
+  description        = "{{index $.Vars "description"}}"
+  cross_site_network = "{{index $.Vars "cross_site_network"}}"
+  depends_on = [
+    google_compute_cross_site_network.example-cross-site-network
+  ]
+  wire_properties {
+    bandwidth_unmetered = 10
+    fault_response =  "NONE"
+    bandwidth_allocation = "ALLOCATE_PER_WIRE"
+  }
+  wire_group_properties {
+    type = "WIRE"
+  }
+  admin_enabled = true
+}
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_cross_site_network_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_cross_site_network_test.go
@@ -1,5 +1,5 @@
 package compute_test
-{{ if ne $.TargetVersionName `ga` -}}
+
 import (
 	"testing"
 
@@ -19,7 +19,7 @@ func TestAccComputeCrossSiteNetwork_update(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckComputeCrossSiteNetworkDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -48,28 +48,23 @@ func TestAccComputeCrossSiteNetwork_update(t *testing.T) {
 func testAccComputeCrossSiteNetwork_basic(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 data "google_project" "project" {
-  provider = google-beta
 }
 
 resource "google_compute_cross_site_network" "example-cross-site-network" {
   name       = "tf-test-test-cross-site-network%{random_suffix}"
   description         = "Example cross site network%{random_suffix}"
-  provider = google-beta
 }
 `, context)
 }
 
 func testAccComputeCrossSiteNetwork_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 data "google_project" "project" {
-  provider = google-beta
 }
 
 resource "google_compute_cross_site_network" "example-cross-site-network" {
 name       = "tf-test-test-cross-site-network%{random_suffix}"
 description         = "Example cross site network updated%{random_suffix}"
-  provider = google-beta
 }
 `, context)
 }
-{{- end }}
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_wire_group_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_wire_group_test.go
@@ -1,5 +1,5 @@
 package compute_test
-{{ if ne $.TargetVersionName `ga` -}}
+
 import (
 	"testing"
 
@@ -20,7 +20,7 @@ func TestAccComputeWireGroup_update(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckComputeWireGroupDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -56,64 +56,51 @@ func TestAccComputeWireGroup_update(t *testing.T) {
 func testAccComputeWireGroup_basic(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 data "google_project" "project" {
-provider = google-beta
 }
 
 resource "google_compute_cross_site_network" "example-cross-site-network" {
   name        = "tf-test-cross-site-network%{random_suffix}"
   description = "Example cross site network"
-  provider    = google-beta
 }
 
 resource "google_compute_wire_group" "example-test-wire-group" {
   name               = "tf-test-test-wire-group%{random_suffix}"
   description        = "Example Wire Group%{random_suffix}"
   cross_site_network = google_compute_cross_site_network.example-cross-site-network.name
-  provider           = google-beta
   depends_on = [
     google_compute_cross_site_network.example-cross-site-network
   ]
   wire_properties {
     bandwidth_unmetered = 1000
 	bandwidth_allocation = "ALLOCATE_PER_WIRE"
   }
-  wire_group_properties {
-    type = "REDUNDANT"
-  }
   admin_enabled = true
 }
 `, context)
 }
 
 func testAccComputeWireGroup_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
-data "google_project" "project" {
-provider = google-beta
+data "google_project" "project" {	
 }
 
 resource "google_compute_cross_site_network" "example-cross-site-network" {
   name        = "tf-test-cross-site-network%{random_suffix}"
   description = "Example cross site network"
-  provider    = google-beta
 }
 
 resource "google_compute_wire_group" "example-test-wire-group" {
   name               = "tf-test-test-wire-group%{random_suffix}"
   description        = "Example Wire Group Updated%{random_suffix}"
   cross_site_network = google_compute_cross_site_network.example-cross-site-network.name
-  provider           = google-beta
   depends_on = [
     google_compute_cross_site_network.example-cross-site-network
   ]
   wire_properties {
     bandwidth_unmetered = 1000
 	bandwidth_allocation = "ALLOCATE_PER_WIRE"
   }
-  wire_group_properties {
-    type = "REDUNDANT"
-  }	
   admin_enabled = true
 }
 `, context)
 }
-{{- end }}

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`data "google_project" "project" {`
`2`		`- provider = google-beta`
`3`	`2`	`}`
`4`	`3`
`5`	`4`	`resource "google_compute_cross_site_network" "{{$.PrimaryResourceId}}" {`
`6`	`5`	`name = "{{index $.Vars "name"}}"`
`7`	`6`	`description = "{{index $.Vars "description"}}"`
`8`		`- provider = google-beta`
`9`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,15 @@`
`1`	`1`	`data "google_project" "project" {`
`2`		`-provider = google-beta`
`3`	`2`	`}`
`4`	`3`
`5`	`4`	`resource "google_compute_cross_site_network" "example-cross-site-network" {`
`6`	`5`	`name = "{{index $.Vars "cross_site_network"}}"`
`7`	`6`	`description = "Example cross site network"`
`8`		`- provider = google-beta`
`9`	`7`	`}`
`10`	`8`
`11`	`9`	`resource "google_compute_wire_group" "{{$.PrimaryResourceId}}" {`
`12`	`10`	`name = "{{index $.Vars "name"}}"`
`13`	`11`	`description = "{{index $.Vars "description"}}"`
`14`	`12`	`cross_site_network = "{{index $.Vars "cross_site_network"}}"`
`15`		`- provider = google-beta`
`16`	`13`	`depends_on = [`
`17`	`14`	`google_compute_cross_site_network.example-cross-site-network`
`18`	`15`	`]`
`@@ -21,8 +18,5 @@ resource "google_compute_wire_group" "{{$.PrimaryResourceId}}" {`
`21`	`18`	`fault_response = "NONE"`
`22`	`19`	`bandwidth_allocation = "ALLOCATE_PER_WIRE"`
`23`	`20`	`}`
`24`		`- wire_group_properties {`
`25`		`- type = "WIRE"`
`26`		`- }`
`27`	`21`	`admin_enabled = true`
`28`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package compute_test`
`2`		-{{ if ne $.TargetVersionName `ga` -}}
	`2`	`+`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`@@ -19,7 +19,7 @@ func TestAccComputeCrossSiteNetwork_update(t *testing.T) {`
`19`	`19`
`20`	`20`	`acctest.VcrTest(t, resource.TestCase{`
`21`	`21`	`PreCheck: func() { acctest.AccTestPreCheck(t) },`
`22`		`- ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),`
	`22`	`+ ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),`
`23`	`23`	`CheckDestroy: testAccCheckComputeCrossSiteNetworkDestroyProducer(t),`
`24`	`24`	`Steps: []resource.TestStep{`
`25`	`25`	`{`
`@@ -48,28 +48,23 @@ func TestAccComputeCrossSiteNetwork_update(t *testing.T) {`
`48`	`48`	`func testAccComputeCrossSiteNetwork_basic(context map[string]interface{}) string {`
`49`	`49`	return acctest.Nprintf(`
`50`	`50`	`data "google_project" "project" {`
`51`		`- provider = google-beta`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`resource "google_compute_cross_site_network" "example-cross-site-network" {`
`55`	`54`	`name = "tf-test-test-cross-site-network%{random_suffix}"`
`56`	`55`	`description = "Example cross site network%{random_suffix}"`
`57`		`- provider = google-beta`
`58`	`56`	`}`
`59`	`57`	`, context)
`60`	`58`	`}`
`61`	`59`
`62`	`60`	`func testAccComputeCrossSiteNetwork_update(context map[string]interface{}) string {`
`63`	`61`	return acctest.Nprintf(`
`64`	`62`	`data "google_project" "project" {`
`65`		`- provider = google-beta`
`66`	`63`	`}`
`67`	`64`
`68`	`65`	`resource "google_compute_cross_site_network" "example-cross-site-network" {`
`69`	`66`	`name = "tf-test-test-cross-site-network%{random_suffix}"`
`70`	`67`	`description = "Example cross site network updated%{random_suffix}"`
`71`		`- provider = google-beta`
`72`	`68`	`}`
`73`	`69`	`, context)
`74`	`70`	`}`
`75`		`-{{- end }}`