22603: add update_strategy to google_compute_network_peering (#13848) (#10275)

[upstream:e8e3af5d1e556d75eae383cc11cef19a0c618fbe]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13848.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added `update_strategy`  field to `google_compute_network_peering ` resource (beta)
+```

google-beta/services/compute/resource_compute_network_peering.go

@@ -125,6 +125,14 @@ func ResourceComputeNetworkPeering() *schema.Resource {
 				Description:  `Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. The default value is IPV4_ONLY. Possible values: ["IPV4_ONLY", "IPV4_IPV6"]`,
 				Default:      "IPV4_ONLY",
 			},
+
+			"update_strategy": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: verify.ValidateEnum([]string{"INDEPENDENT", "CONSENSUS"}),
+				Description:  `The update strategy determines the semantics for updates and deletes to the peering connection configuration. The default value is INDEPENDENT. Possible values: ["INDEPENDENT", "CONSENSUS"]`,
+				Default:      "INDEPENDENT",
+			},
 		},
 		UseJSONNumber: true,
 	}
@@ -225,6 +233,10 @@ func resourceComputeNetworkPeeringRead(d *schema.ResourceData, meta interface{})
 		return fmt.Errorf("Error setting stack_type: %s", err)
 	}
 
+	if err := d.Set("update_strategy", flattenNetworkPeeringUpdateStrategy(peering.UpdateStrategy, d, config)); err != nil {
+		return fmt.Errorf("Error setting update_strategy: %s", err)
+	}
+
 	return nil
 }
 
@@ -324,6 +336,7 @@ func findPeeringFromNetwork(network *compute.Network, peeringName string) *compu
 	return nil
 }
 func expandNetworkPeering(d *schema.ResourceData) *compute.NetworkPeering {
+
 	return &compute.NetworkPeering{
 		ExchangeSubnetRoutes:           true,
 		Name:                           d.Get("name").(string),
@@ -333,8 +346,10 @@ func expandNetworkPeering(d *schema.ResourceData) *compute.NetworkPeering {
 		ExportSubnetRoutesWithPublicIp: d.Get("export_subnet_routes_with_public_ip").(bool),
 		ImportSubnetRoutesWithPublicIp: d.Get("import_subnet_routes_with_public_ip").(bool),
 		StackType:                      d.Get("stack_type").(string),
+		UpdateStrategy:                 d.Get("update_strategy").(string),
 		ForceSendFields:                []string{"ExportSubnetRoutesWithPublicIp", "ImportCustomRoutes", "ExportCustomRoutes"},
 	}
+
 }
 
 func flattenNetworkPeeringStackType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -346,6 +361,15 @@ func flattenNetworkPeeringStackType(v interface{}, d *schema.ResourceData, confi
 	return v
 }
 
+func flattenNetworkPeeringUpdateStrategy(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	// To prevent the perma-diff caused by the absence of `update_strategy` in API responses for older resource.
+	if v == nil || tpgresource.IsEmptyValue(reflect.ValueOf(v)) {
+		return "INDEPENDENT"
+	}
+
+	return v
+}
+
 func sortedNetworkPeeringMutexKeys(networkName, peerNetworkName *tpgresource.GlobalFieldValue) []string {
 	// Whether you delete the peering from network A to B or the one from B to A, they
 	// cannot happen at the same time.

google-beta/services/compute/resource_compute_network_peering_test.go

@@ -8,7 +8,7 @@
 //
 //	This code is generated by Magic Modules using the following:
 //
-//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/compute/resource_compute_network_peering_test.go
+//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/compute/resource_compute_network_peering_test.go.tmpl
 //
 //	DO NOT EDIT this file directly. Any changes made to this file will be
 //	overwritten during the next generation cycle.
@@ -157,6 +157,42 @@ func TestAccComputeNetworkPeering_stackType(t *testing.T) {
 
 }
 
+func TestAccComputeNetworkPeering_updateStrategy(t *testing.T) {
+	t.Parallel()
+
+	primaryNetworkName := fmt.Sprintf("tf-test-network-1-%d", acctest.RandInt(t))
+	peeringNetworkName := fmt.Sprintf("tf-test-network-2-%d", acctest.RandInt(t))
+	peeringName := fmt.Sprintf("tf-test-peering-%d", acctest.RandInt(t))
+	importId := fmt.Sprintf("%s/%s/%s", envvar.GetTestProjectFromEnv(), primaryNetworkName, peeringName)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccComputeNetworkPeeringDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeNetworkPeering_updateStrategyDefault(primaryNetworkName, peeringNetworkName, peeringName),
+			},
+			{
+				ResourceName:      "google_compute_network_peering.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateId:     importId,
+			},
+			{
+				Config: testAccComputeNetworkPeering_updateStrategyUpdate(primaryNetworkName, peeringNetworkName, peeringName),
+			},
+			{
+				ResourceName:      "google_compute_network_peering.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateId:     importId,
+			},
+		},
+	})
+
+}
+
 func testAccComputeNetworkPeeringDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		config := acctest.GoogleProviderConfig(t)
@@ -293,3 +329,44 @@ resource "google_compute_network_peering" "foo" {
 }
 `, primaryNetworkName, peeringNetworkName, peeringName)
 }
+
+func testAccComputeNetworkPeering_updateStrategyDefault(primaryNetworkName, peeringNetworkName, peeringName string) string {
+	return fmt.Sprintf(`
+resource "google_compute_network" "network1" {
+  name                    = "%s"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_network" "network2" {
+  name                    = "%s"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_network_peering" "foo" {
+  name         = "%s"
+  network      = google_compute_network.network1.self_link
+  peer_network = google_compute_network.network2.self_link
+}
+`, primaryNetworkName, peeringNetworkName, peeringName)
+}
+
+func testAccComputeNetworkPeering_updateStrategyUpdate(primaryNetworkName, peeringNetworkName, peeringName string) string {
+	return fmt.Sprintf(`
+resource "google_compute_network" "network1" {
+  name                    = "%s"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_network" "network2" {
+  name                    = "%s"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_network_peering" "foo" {
+  name         = "%s"
+  network      = google_compute_network.network1.self_link
+  peer_network = google_compute_network.network2.self_link
+  update_strategy   = "CONSENSUS"
+}
+`, primaryNetworkName, peeringNetworkName, peeringName)
+}

website/docs/r/compute_network_peering.html.markdown

@@ -82,6 +82,9 @@ Whether subnet routes with public IP range are imported. The default value is fa
 * `stack_type` - (Optional)
 Which IP version(s) of traffic and routes are allowed to be imported or exported between peer networks. The default value is IPV4_ONLY. Possible values: ["IPV4_ONLY", "IPV4_IPV6"].
 
+* `update_strategy` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+The update strategy determines the semantics for updates and deletes to the peering connection configuration. The default value is INDEPENDENT. Possible values: ["INDEPENDENT", "CONSENSUS"]
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are