Permadiff fix: advertised_ip_ranges in cloud router

mmv1/templates/terraform/custom_flatten/compute_router_range.go.erb

@@ -30,7 +30,7 @@ func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d
 		})
 	}
 	configData := []map[string]interface{}{}
-	if v, ok := d.GetOk("advertised_ip_ranges"); ok {
+	if v, ok := d.GetOk("bgp.0.advertised_ip_ranges"); ok {
 		for _, item := range v.([]interface{}) {
 			configData = append(configData, item.(map[string]interface{}))
 		}

mmv1/third_party/terraform/services/compute/resource_compute_router_test.go.erb

@@ -78,6 +78,29 @@ func TestAccComputeRouter_full(t *testing.T) {
 	})
 }
 
+func TestAccComputeRouter_advertisedIpRangesOrder(t *testing.T) {
+	t.Parallel()
+
+	testId := acctest.RandString(t, 10)
+	routerName := fmt.Sprintf("tf-test-router-%s", testId)
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeRouterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeRouterAdvertisedIpRangesOrder(routerName),
+			},
+			{
+				ResourceName:      "google_compute_router.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{"bgp.0.advertised_ip_ranges.0.range", "bgp.0.advertised_ip_ranges.1.range"},
+			},
+		},
+	})
+}
+
 func TestAccComputeRouter_update(t *testing.T) {
 	t.Parallel()
 
@@ -264,6 +287,32 @@ resource "google_compute_router" "foobar" {
 `, routerName, routerName)
 }
 
+func testAccComputeRouterAdvertisedIpRangesOrder(routerName string) string {
+	return fmt.Sprintf(`
+resource "google_compute_network" "foobar" {
+  name                    = "%s-net"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_router" "foobar" {
+  name    = "%s"
+  network = google_compute_network.foobar.name
+  bgp {
+    asn               = 64514
+    advertise_mode    = "CUSTOM"
+    advertised_groups = ["ALL_SUBNETS"]
+	advertised_ip_ranges {
+      range = "6.7.0.0/16"
+    }
+    advertised_ip_ranges {
+      range = "1.2.3.4"
+    }
+    keepalive_interval = 25
+  }
+}
+`, routerName, routerName)
+}
+
 func testAccComputeRouter_noBGP(routerName, resourceRegion string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {