Router peer needs to be able to set advertised route priority to 0. (#…

…5297) (#10292) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Oct 11, 2021 · 5059fcd · 5059fcd
1 parent b3cbcaf
commit 5059fcd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/5297.txt b/.changelog/5297.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: fixed bug where `google_compute_router_peer` could not set an advertised route priority of 0, causing permadiff.
+```
diff --git a/google/resource_compute_router_bgp_peer_test.go b/google/resource_compute_router_bgp_peer_test.go
@@ -575,7 +575,7 @@ resource "google_compute_router_peer" "foobar" {
   region                    = google_compute_router.foobar.region
   peer_ip_address           = "169.254.3.3"
   peer_asn                  = 65516
-  advertised_route_priority = 100
+  advertised_route_priority = 0
   advertise_mode            = "CUSTOM"
   advertised_groups         = ["ALL_SUBNETS"]
   advertised_ip_ranges {

diff --git a/google/resource_compute_router_peer.go b/google/resource_compute_router_peer.go
@@ -231,7 +231,7 @@ func resourceComputeRouterBgpPeerCreate(d *schema.ResourceData, meta interface{}
 	advertisedRoutePriorityProp, err := expandNestedComputeRouterBgpPeerAdvertisedRoutePriority(d.Get("advertised_route_priority"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("advertised_route_priority"); !isEmptyValue(reflect.ValueOf(advertisedRoutePriorityProp)) && (ok || !reflect.DeepEqual(v, advertisedRoutePriorityProp)) {
+	} else if v, ok := d.GetOkExists("advertised_route_priority"); ok || !reflect.DeepEqual(v, advertisedRoutePriorityProp) {
 		obj["advertisedRoutePriority"] = advertisedRoutePriorityProp
 	}
 	advertiseModeProp, err := expandNestedComputeRouterBgpPeerAdvertiseMode(d.Get("advertise_mode"), d, config)
@@ -437,7 +437,7 @@ func resourceComputeRouterBgpPeerUpdate(d *schema.ResourceData, meta interface{}
 	advertisedRoutePriorityProp, err := expandNestedComputeRouterBgpPeerAdvertisedRoutePriority(d.Get("advertised_route_priority"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("advertised_route_priority"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, advertisedRoutePriorityProp)) {
+	} else if v, ok := d.GetOkExists("advertised_route_priority"); ok || !reflect.DeepEqual(v, advertisedRoutePriorityProp) {
 		obj["advertisedRoutePriority"] = advertisedRoutePriorityProp
 	}
 	advertiseModeProp, err := expandNestedComputeRouterBgpPeerAdvertiseMode(d.Get("advertise_mode"), d, config)