Marked google_compute_router_peer.peer_ip_address as default from api (…

…#8256) (#5855) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jul 7, 2023 · e952eef · e952eef
1 parent 32013e4
commit e952eef
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/.changelog/8256.txt b/.changelog/8256.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+compute: made `google_compute_router_peer.peer_ip_address` optional
+```
diff --git a/google-beta/resource_compute_router_bgp_peer_test.go b/google-beta/resource_compute_router_bgp_peer_test.go
@@ -482,16 +482,13 @@ resource "google_compute_router_interface" "foobar" {
   name       = "%s"
   router     = google_compute_router.foobar.name
   region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
   vpn_tunnel = google_compute_vpn_tunnel.foobar.name
 }
 
 resource "google_compute_router_peer" "foobar" {
   name                      = "%s"
   router                    = google_compute_router.foobar.name
   region                    = google_compute_router.foobar.region
-  ip_address                = "169.254.3.1"
-  peer_ip_address           = "169.254.3.2"
   peer_asn                  = 65515
   advertised_route_priority = 100
   interface                 = google_compute_router_interface.foobar.name
@@ -558,7 +555,6 @@ resource "google_compute_router_interface" "foobar" {
   name       = "%s"
   router     = google_compute_router.foobar.name
   region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
   vpn_tunnel = google_compute_vpn_tunnel.foobar.name
 }
 `, routerName, routerName, routerName, routerName, routerName, routerName, routerName, routerName)
@@ -888,15 +884,13 @@ resource "google_compute_router_interface" "foobar" {
   name       = "%s"
   router     = google_compute_router.foobar.name
   region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
   vpn_tunnel = google_compute_vpn_tunnel.foobar.name
 }
 
 resource "google_compute_router_peer" "foobar" {
   name                      = "%s"
   router                    = google_compute_router.foobar.name
   region                    = google_compute_router.foobar.region
-  peer_ip_address           = "169.254.3.2"
   peer_asn                  = 65515
   advertised_route_priority = 100  
   interface = google_compute_router_interface.foobar.name
@@ -964,16 +958,13 @@ resource "google_compute_router_interface" "foobar" {
   name       = "%s"
   router     = google_compute_router.foobar.name
   region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
   vpn_tunnel = google_compute_vpn_tunnel.foobar.name
 }
 
 resource "google_compute_router_peer" "foobar" {
   name                      = "%s"
   router                    = google_compute_router.foobar.name
   region                    = google_compute_router.foobar.region
-  ip_address                = "169.254.3.1"
-  peer_ip_address           = "169.254.3.2"
   peer_asn                  = 65515
   advertised_route_priority = 100
   interface                 = google_compute_router_interface.foobar.name

diff --git a/google-beta/services/compute/resource_compute_router_peer.go b/google-beta/services/compute/resource_compute_router_peer.go
@@ -88,12 +88,6 @@ except the last character, which cannot be a dash.`,
 				Required: true,
 				Description: `Peer BGP Autonomous System Number (ASN).
 Each BGP interface may use a different value.`,
-			},
-			"peer_ip_address": {
-				Type:     schema.TypeString,
-				Required: true,
-				Description: `IP address of the BGP interface outside Google Cloud Platform.
-Only IPv4 is supported.`,
 			},
 			"router": {
 				Type:             schema.TypeString,
@@ -241,6 +235,13 @@ Only IPv4 is supported.`,
 The address must be in the range 2600:2d00:0:2::/64 or 2600:2d00:0:3::/64.
 If you do not specify the next hop addresses, Google Cloud automatically
 assigns unused addresses from the 2600:2d00:0:2::/64 or 2600:2d00:0:3::/64 range for you.`,
+			},
+			"peer_ip_address": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Optional: true,
+				Description: `IP address of the BGP interface outside Google Cloud Platform.
+Only IPv4 is supported. Required if 'ip_address' is set.`,
 			},
 			"peer_ipv6_nexthop_address": {
 				Type:             schema.TypeString,

diff --git a/website/docs/r/compute_router_peer.html.markdown b/website/docs/r/compute_router_peer.html.markdown
@@ -40,7 +40,6 @@ resource "google_compute_router_peer" "peer" {
   name                      = "my-router-peer"
   router                    = "my-router"
   region                    = "us-central1"
-  peer_ip_address           = "169.254.1.2"
   peer_asn                  = 65513
   advertised_route_priority = 100
   interface                 = "interface-1"
@@ -215,11 +214,6 @@ The following arguments are supported:
   (Required)
   Name of the interface the BGP peer is associated with.
 
-* `peer_ip_address` -
-  (Required)
-  IP address of the BGP interface outside Google Cloud Platform.
-  Only IPv4 is supported.
-
 * `peer_asn` -
   (Required)
   Peer BGP Autonomous System Number (ASN).
@@ -238,6 +232,11 @@ The following arguments are supported:
   IP address of the interface inside Google Cloud Platform.
   Only IPv4 is supported.
 
+* `peer_ip_address` -
+  (Optional)
+  IP address of the BGP interface outside Google Cloud Platform.
+  Only IPv4 is supported. Required if `ip_address` is set.
+
 * `advertised_route_priority` -
   (Optional)
   The priority of routes advertised to this BGP peer.