From 7e671a1e782d03caf5c02f0bd0f4743076a469e2 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 17 Oct 2023 19:26:42 +0000 Subject: [PATCH] add port validation (#9231) Co-authored-by: Edward Sun [upstream:a7f2e939fd74d50eb58182d6e3f378550a40edbe] Signed-off-by: Modular Magician --- .changelog/9231.txt | 3 +++ .../resource_compute_global_network_endpoint.go | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .changelog/9231.txt diff --git a/.changelog/9231.txt b/.changelog/9231.txt new file mode 100644 index 00000000000..51921e6d687 --- /dev/null +++ b/.changelog/9231.txt @@ -0,0 +1,3 @@ +```release-note:bug +compute: fixed an error during the deletion when post was set to 0 on `google_compute_global_network_endpoint` +``` diff --git a/google/services/compute/resource_compute_global_network_endpoint.go b/google/services/compute/resource_compute_global_network_endpoint.go index 33f4b94118e..8ba7e415353 100644 --- a/google/services/compute/resource_compute_global_network_endpoint.go +++ b/google/services/compute/resource_compute_global_network_endpoint.go @@ -25,6 +25,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-google/google/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" @@ -58,10 +59,11 @@ func ResourceComputeGlobalNetworkEndpoint() *schema.Resource { Description: `The global network endpoint group this endpoint is part of.`, }, "port": { - Type: schema.TypeInt, - Required: true, - ForceNew: true, - Description: `Port number of the external endpoint.`, + Type: schema.TypeInt, + Required: true, + ForceNew: true, + ValidateFunc: validation.IntAtLeast(1), + Description: `Port number of the external endpoint.`, }, "fqdn": { Type: schema.TypeString, @@ -291,7 +293,7 @@ func resourceComputeGlobalNetworkEndpointDelete(d *schema.ResourceData, meta int if err != nil { return err } - if portProp != "" { + if portProp != "" && portProp != 0 { toDelete["port"] = portProp }