From 1de6bc127838a1cb77037015da19de498e618db9 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Fri, 8 May 2026 17:40:44 +0000 Subject: [PATCH] Custom MAC addresses and NEG based Dynamic NICs support (#17455) [upstream:07652b522b11525e8ec470a1b145bf27adc35b24] Signed-off-by: Modular Magician --- .changelog/17455.txt | 6 ++++++ .../compute/resource_compute_network_endpoint_group.go | 4 ++-- google-beta/services/compute/resource_compute_subnetwork.go | 4 ++-- website/docs/r/compute_network_endpoint_group.html.markdown | 2 +- website/docs/r/compute_subnetwork.html.markdown | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 .changelog/17455.txt diff --git a/.changelog/17455.txt b/.changelog/17455.txt new file mode 100644 index 00000000000..1494ded9088 --- /dev/null +++ b/.changelog/17455.txt @@ -0,0 +1,6 @@ +```release-note:enhancement +compute: added support for "ARP_BROADCAST_PRIMARY_RANGE" values to the `resolve_subnet_mask` field in `google_compute_subnetwork` resource +``` +```release-note:enhancement +compute: added support for "GCE_VM_IP_DEDICATED_BACKEND" to the `network_endpoint_type` field in `google_compute_network_endpoint_group` resource +``` \ No newline at end of file diff --git a/google-beta/services/compute/resource_compute_network_endpoint_group.go b/google-beta/services/compute/resource_compute_network_endpoint_group.go index 10b989e2d10..8ebc74eedf5 100644 --- a/google-beta/services/compute/resource_compute_network_endpoint_group.go +++ b/google-beta/services/compute/resource_compute_network_endpoint_group.go @@ -189,7 +189,7 @@ you create the resource.`, Type: schema.TypeString, Optional: true, ForceNew: true, - ValidateFunc: verify.ValidateEnum([]string{"GCE_VM_IP", "GCE_VM_IP_PORT", "NON_GCP_PRIVATE_IP_PORT", "INTERNET_IP_PORT", "INTERNET_FQDN_PORT", "SERVERLESS", "PRIVATE_SERVICE_CONNECT", ""}), + ValidateFunc: verify.ValidateEnum([]string{"GCE_VM_IP", "GCE_VM_IP_PORT", "NON_GCP_PRIVATE_IP_PORT", "INTERNET_IP_PORT", "INTERNET_FQDN_PORT", "SERVERLESS", "PRIVATE_SERVICE_CONNECT", "GCE_VM_IP_DEDICATED_BACKEND", ""}), Description: `Type of network endpoints in this network endpoint group. NON_GCP_PRIVATE_IP_PORT is used for hybrid connectivity network endpoint groups (see https://cloud.google.com/load-balancing/docs/hybrid). @@ -198,7 +198,7 @@ that 1) have the following load balancing schemes: EXTERNAL, EXTERNAL_MANAGED, INTERNAL_MANAGED, and INTERNAL_SELF_MANAGED and 2) support the RATE or CONNECTION balancing modes. -Possible values include: GCE_VM_IP, GCE_VM_IP_PORT, NON_GCP_PRIVATE_IP_PORT, INTERNET_IP_PORT, INTERNET_FQDN_PORT, SERVERLESS, and PRIVATE_SERVICE_CONNECT. Default value: "GCE_VM_IP_PORT" Possible values: ["GCE_VM_IP", "GCE_VM_IP_PORT", "NON_GCP_PRIVATE_IP_PORT", "INTERNET_IP_PORT", "INTERNET_FQDN_PORT", "SERVERLESS", "PRIVATE_SERVICE_CONNECT"]`, +Possible values include: GCE_VM_IP, GCE_VM_IP_PORT, NON_GCP_PRIVATE_IP_PORT, INTERNET_IP_PORT, INTERNET_FQDN_PORT, SERVERLESS, and PRIVATE_SERVICE_CONNECT. Default value: "GCE_VM_IP_PORT" Possible values: ["GCE_VM_IP", "GCE_VM_IP_PORT", "NON_GCP_PRIVATE_IP_PORT", "INTERNET_IP_PORT", "INTERNET_FQDN_PORT", "SERVERLESS", "PRIVATE_SERVICE_CONNECT", "GCE_VM_IP_DEDICATED_BACKEND"]`, Default: "GCE_VM_IP_PORT", }, "subnetwork": { diff --git a/google-beta/services/compute/resource_compute_subnetwork.go b/google-beta/services/compute/resource_compute_subnetwork.go index 6ec92030cf6..3e8491542fc 100644 --- a/google-beta/services/compute/resource_compute_subnetwork.go +++ b/google-beta/services/compute/resource_compute_subnetwork.go @@ -452,8 +452,8 @@ E.g. 'networkconnectivity.googleapis.com/projects/{project}/locations/global/int Type: schema.TypeString, Optional: true, ForceNew: true, - ValidateFunc: verify.ValidateEnum([]string{"ARP_ALL_RANGES", "ARP_PRIMARY_RANGE", ""}), - Description: `'Configures subnet mask resolution for this subnetwork.' Possible values: ["ARP_ALL_RANGES", "ARP_PRIMARY_RANGE"]`, + ValidateFunc: verify.ValidateEnum([]string{"ARP_ALL_RANGES", "ARP_PRIMARY_RANGE", "ARP_BROADCAST_PRIMARY_RANGE", "ARP_BROADCAST_PRIMARY_RANGE_WITH_LEARNING", ""}), + Description: `'Configures subnet mask resolution for this subnetwork.' Possible values: ["ARP_ALL_RANGES", "ARP_PRIMARY_RANGE", "ARP_BROADCAST_PRIMARY_RANGE", "ARP_BROADCAST_PRIMARY_RANGE_WITH_LEARNING"]`, }, "role": { Type: schema.TypeString, diff --git a/website/docs/r/compute_network_endpoint_group.html.markdown b/website/docs/r/compute_network_endpoint_group.html.markdown index b05670af0f4..a9d9192d8d3 100644 --- a/website/docs/r/compute_network_endpoint_group.html.markdown +++ b/website/docs/r/compute_network_endpoint_group.html.markdown @@ -139,7 +139,7 @@ The following arguments are supported: CONNECTION balancing modes. Possible values include: GCE_VM_IP, GCE_VM_IP_PORT, NON_GCP_PRIVATE_IP_PORT, INTERNET_IP_PORT, INTERNET_FQDN_PORT, SERVERLESS, and PRIVATE_SERVICE_CONNECT. Default value is `GCE_VM_IP_PORT`. - Possible values are: `GCE_VM_IP`, `GCE_VM_IP_PORT`, `NON_GCP_PRIVATE_IP_PORT`, `INTERNET_IP_PORT`, `INTERNET_FQDN_PORT`, `SERVERLESS`, `PRIVATE_SERVICE_CONNECT`. + Possible values are: `GCE_VM_IP`, `GCE_VM_IP_PORT`, `NON_GCP_PRIVATE_IP_PORT`, `INTERNET_IP_PORT`, `INTERNET_FQDN_PORT`, `SERVERLESS`, `PRIVATE_SERVICE_CONNECT`, `GCE_VM_IP_DEDICATED_BACKEND`. * `subnetwork` - (Optional) diff --git a/website/docs/r/compute_subnetwork.html.markdown b/website/docs/r/compute_subnetwork.html.markdown index 3f99466741c..389c1436733 100644 --- a/website/docs/r/compute_subnetwork.html.markdown +++ b/website/docs/r/compute_subnetwork.html.markdown @@ -488,7 +488,7 @@ The following arguments are supported: * `resolve_subnet_mask` - (Optional) 'Configures subnet mask resolution for this subnetwork.' - Possible values are: `ARP_ALL_RANGES`, `ARP_PRIMARY_RANGE`. + Possible values are: `ARP_ALL_RANGES`, `ARP_PRIMARY_RANGE`, `ARP_BROADCAST_PRIMARY_RANGE`, `ARP_BROADCAST_PRIMARY_RANGE_WITH_LEARNING`. * `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used.