diff --git a/.changelog/5162.txt b/.changelog/5162.txt new file mode 100644 index 00000000000..d2dcb64c271 --- /dev/null +++ b/.changelog/5162.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +compute: allow passing an IP address to the `nextHopIlb` field of `google_compute_route` resource +``` diff --git a/google/common_diff_suppress.go b/google/common_diff_suppress.go index e6ce90181cc..03b497a632b 100644 --- a/google/common_diff_suppress.go +++ b/google/common_diff_suppress.go @@ -182,3 +182,16 @@ func durationDiffSuppress(k, old, new string, d *schema.ResourceData) bool { } return oDuration == nDuration } + +// Use this method when the field accepts either an IP address or a +// self_link referencing a resource (such as google_compute_route's +// next_hop_ilb) +func compareIpAddressOrSelfLinkOrResourceName(_, old, new string, _ *schema.ResourceData) bool { + // if we can parse `new` as an IP address, then compare as strings + if net.ParseIP(new) != nil { + return new == old + } + + // otherwise compare as self links + return compareSelfLinkOrResourceName("", old, new, nil) +} diff --git a/google/resource_compute_route.go b/google/resource_compute_route.go index 85cf22ad3ac..7d792639914 100644 --- a/google/resource_compute_route.go +++ b/google/resource_compute_route.go @@ -92,12 +92,23 @@ partial valid URL: Type: schema.TypeString, Optional: true, ForceNew: true, - DiffSuppressFunc: compareSelfLinkOrResourceName, - Description: `The URL to a forwarding rule of type loadBalancingScheme=INTERNAL that should handle matching packets. -You can only specify the forwarding rule as a partial or full URL. For example, the following are all valid URLs: -https://www.googleapis.com/compute/v1/projects/project/regions/region/forwardingRules/forwardingRule -regions/region/forwardingRules/forwardingRule -Note that this can only be used when the destinationRange is a public (non-RFC 1918) IP CIDR range.`, + DiffSuppressFunc: compareIpAddressOrSelfLinkOrResourceName, + Description: `The IP address or URL to a forwarding rule of type +loadBalancingScheme=INTERNAL that should handle matching +packets. + +With the GA provider you can only specify the forwarding +rule as a partial or full URL. For example, the following +are all valid values: +* 10.128.0.56 +* https://www.googleapis.com/compute/v1/projects/project/regions/region/forwardingRules/forwardingRule +* regions/region/forwardingRules/forwardingRule + +When the beta provider, you can also specify the IP address +of a forwarding rule from the same VPC or any peered VPC. + +Note that this can only be used when the destinationRange is +a public (non-RFC 1918) IP CIDR range.`, ExactlyOneOf: []string{"next_hop_gateway", "next_hop_instance", "next_hop_ip", "next_hop_vpn_tunnel", "next_hop_ilb"}, }, "next_hop_instance": { @@ -538,10 +549,7 @@ func flattenComputeRouteNextHopNetwork(v interface{}, d *schema.ResourceData, co } func flattenComputeRouteNextHopIlb(v interface{}, d *schema.ResourceData, config *Config) interface{} { - if v == nil { - return v - } - return ConvertSelfLinkToV1(v.(string)) + return v } func expandComputeRouteDestRange(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { @@ -614,11 +622,7 @@ func expandComputeRouteNextHopVpnTunnel(v interface{}, d TerraformResourceData, } func expandComputeRouteNextHopIlb(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { - f, err := parseRegionalFieldValue("forwardingRules", v.(string), "project", "region", "zone", d, config, true) - if err != nil { - return nil, fmt.Errorf("Invalid value for next_hop_ilb: %s", err) - } - return f.RelativeLink(), nil + return v, nil } func resourceComputeRouteDecoder(d *schema.ResourceData, meta interface{}, res map[string]interface{}) (map[string]interface{}, error) { diff --git a/google/resource_compute_route_generated_test.go b/google/resource_compute_route_generated_test.go index 526bd5aa580..1274a338fa9 100644 --- a/google/resource_compute_route_generated_test.go +++ b/google/resource_compute_route_generated_test.go @@ -42,7 +42,7 @@ func TestAccComputeRoute_routeBasicExample(t *testing.T) { ResourceName: "google_compute_route.default", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"network", "next_hop_instance", "next_hop_vpn_tunnel", "next_hop_ilb"}, + ImportStateVerifyIgnore: []string{"network", "next_hop_instance", "next_hop_vpn_tunnel"}, }, }, }) @@ -83,7 +83,7 @@ func TestAccComputeRoute_routeIlbExample(t *testing.T) { ResourceName: "google_compute_route.route-ilb", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"network", "next_hop_instance", "next_hop_vpn_tunnel", "next_hop_ilb"}, + ImportStateVerifyIgnore: []string{"network", "next_hop_instance", "next_hop_vpn_tunnel"}, }, }, }) diff --git a/website/docs/r/compute_route.html.markdown b/website/docs/r/compute_route.html.markdown index a08b9a6c885..530d3796224 100644 --- a/website/docs/r/compute_route.html.markdown +++ b/website/docs/r/compute_route.html.markdown @@ -129,6 +129,102 @@ resource "google_compute_route" "route-ilb" { priority = 2000 } ``` +
+ + Open in Cloud Shell + +
+## Example Usage - Route Ilb Vip + + +```hcl +resource "google_compute_network" "producer" { + provider = google-beta + name = "producer-vpc" + auto_create_subnetworks = false +} + +resource "google_compute_subnetwork" "producer" { + provider = google-beta + name = "producer-subnet" + ip_cidr_range = "10.0.1.0/24" + region = "us-central1" + network = google_compute_network.producer.id +} + +resource "google_compute_network" "consumer" { + provider = google-beta + name = "consumer-vpc" + auto_create_subnetworks = false +} + +resource "google_compute_subnetwork" "consumer" { + provider = google-beta + name = "consumer-subnet" + ip_cidr_range = "10.0.2.0/24" + region = "us-central1" + network = google_compute_network.consumer.id +} + +resource "google_compute_network_peering" "peering1" { + provider = google-beta + name = "peering-producer-to-consumer" + network = google_compute_network.consumer.id + peer_network = google_compute_network.producer.id +} + +resource "google_compute_network_peering" "peering2" { + provider = google-beta + name = "peering-consumer-to-producer" + network = google_compute_network.producer.id + peer_network = google_compute_network.consumer.id +} + +resource "google_compute_health_check" "hc" { + provider = google-beta + name = "proxy-health-check" + check_interval_sec = 1 + timeout_sec = 1 + + tcp_health_check { + port = "80" + } +} + +resource "google_compute_region_backend_service" "backend" { + provider = google-beta + name = "compute-backend" + region = "us-central1" + health_checks = [google_compute_health_check.hc.id] +} + +resource "google_compute_forwarding_rule" "default" { + provider = google-beta + name = "compute-forwarding-rule" + region = "us-central1" + + load_balancing_scheme = "INTERNAL" + backend_service = google_compute_region_backend_service.backend.id + all_ports = true + network = google_compute_network.producer.name + subnetwork = google_compute_subnetwork.producer.name +} + +resource "google_compute_route" "route-ilb" { + provider = google-beta + name = "route-ilb" + dest_range = "0.0.0.0/0" + network = google_compute_network.consumer.name + next_hop_ilb = google_compute_forwarding_rule.default.ip_address + priority = 2000 + tags = ["tag1", "tag2"] + + depends_on = [ + google_compute_network_peering.peering1, + google_compute_network_peering.peering2 + ] +} +``` ## Argument Reference @@ -204,11 +300,19 @@ The following arguments are supported: * `next_hop_ilb` - (Optional) - The URL to a forwarding rule of type loadBalancingScheme=INTERNAL that should handle matching packets. - You can only specify the forwarding rule as a partial or full URL. For example, the following are all valid URLs: - https://www.googleapis.com/compute/v1/projects/project/regions/region/forwardingRules/forwardingRule - regions/region/forwardingRules/forwardingRule - Note that this can only be used when the destinationRange is a public (non-RFC 1918) IP CIDR range. + The IP address or URL to a forwarding rule of type + loadBalancingScheme=INTERNAL that should handle matching + packets. + With the GA provider you can only specify the forwarding + rule as a partial or full URL. For example, the following + are all valid values: + * 10.128.0.56 + * https://www.googleapis.com/compute/v1/projects/project/regions/region/forwardingRules/forwardingRule + * regions/region/forwardingRules/forwardingRule + When the beta provider, you can also specify the IP address + of a forwarding rule from the same VPC or any peered VPC. + Note that this can only be used when the destinationRange is + a public (non-RFC 1918) IP CIDR range. * `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used.