add numeric_id field into google_compute_network resource (#9473) (#16712)

* add numberic_id field

* add flattener, encoders, and id field for numeric_id use

* WIP: add numberId test

* add value checks for id and numeric_id

* add strconv

* use decoder to store id into numericId after API request

* remove network check and add suffix variable

* add endlines

* typo

* Updated test to explicitly check numeric_id and id with ResourceAttr

* update regex to be more strict on numeric_id check
[upstream:d6ce7020cd1e2a490a93c91ccc643531dba8bae7]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/9473.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added `numeric_id` field to `google_compute_network` resource
+```

google/services/compute/resource_compute_network.go

@@ -141,6 +141,11 @@ subnetworks of this network, across regions. Possible values: ["REGIONAL", "GLOB
 				Description: `The gateway address for default routing out of the network. This value
 is selected by GCP.`,
 			},
+			"numeric_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `The unique identifier for the resource. This identifier is defined by the server.`,
+			},
 			"delete_default_routes_on_create": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -220,6 +225,11 @@ func resourceComputeNetworkCreate(d *schema.ResourceData, meta interface{}) erro
 		obj["networkFirewallPolicyEnforcementOrder"] = networkFirewallPolicyEnforcementOrderProp
 	}
 
+	obj, err = resourceComputeNetworkEncoder(d, meta, obj)
+	if err != nil {
+		return err
+	}
+
 	url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/global/networks")
 	if err != nil {
 		return err
@@ -342,6 +352,18 @@ func resourceComputeNetworkRead(d *schema.ResourceData, meta interface{}) error
 		return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("ComputeNetwork %q", d.Id()))
 	}
 
+	res, err = resourceComputeNetworkDecoder(d, meta, res)
+	if err != nil {
+		return err
+	}
+
+	if res == nil {
+		// Decoding the object has resulted in it being gone. It may be marked deleted
+		log.Printf("[DEBUG] Removing ComputeNetwork because it no longer exists.")
+		d.SetId("")
+		return nil
+	}
+
 	// Explicitly set virtual fields to default values if unset
 	if _, ok := d.GetOkExists("delete_default_routes_on_create"); !ok {
 		if err := d.Set("delete_default_routes_on_create", false); err != nil {
@@ -361,6 +383,9 @@ func resourceComputeNetworkRead(d *schema.ResourceData, meta interface{}) error
 	if err := d.Set("name", flattenComputeNetworkName(res["name"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Network: %s", err)
 	}
+	if err := d.Set("numeric_id", flattenComputeNetworkNumericId(res["numericId"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Network: %s", err)
+	}
 	if err := d.Set("auto_create_subnetworks", flattenComputeNetworkAutoCreateSubnetworks(res["autoCreateSubnetworks"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Network: %s", err)
 	}
@@ -431,6 +456,11 @@ func resourceComputeNetworkUpdate(d *schema.ResourceData, meta interface{}) erro
 			obj["networkFirewallPolicyEnforcementOrder"] = networkFirewallPolicyEnforcementOrderProp
 		}
 
+		obj, err = resourceComputeNetworkUpdateEncoder(d, meta, obj)
+		if err != nil {
+			return err
+		}
+
 		url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/global/networks/{{name}}")
 		if err != nil {
 			return err
@@ -559,6 +589,10 @@ func flattenComputeNetworkName(v interface{}, d *schema.ResourceData, config *tr
 	return v
 }
 
+func flattenComputeNetworkNumericId(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenComputeNetworkAutoCreateSubnetworks(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -652,3 +686,18 @@ func expandComputeNetworkInternalIpv6Range(v interface{}, d tpgresource.Terrafor
 func expandComputeNetworkNetworkFirewallPolicyEnforcementOrder(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
+
+func resourceComputeNetworkEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
+	delete(obj, "numeric_id") // Field doesn't exist in the API
+	return obj, nil
+}
+
+func resourceComputeNetworkUpdateEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
+	delete(obj, "numeric_id") // Field doesn't exist in the API
+	return obj, nil
+}
+
+func resourceComputeNetworkDecoder(d *schema.ResourceData, meta interface{}, res map[string]interface{}) (map[string]interface{}, error) {
+	res["numericId"] = res["id"] // stores unique id into numericId attribute before it's changed to path format
+	return res, nil
+}

google/services/compute/resource_compute_network_test.go

@@ -5,6 +5,8 @@ package compute_test
 import (
 	"fmt"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -103,6 +105,34 @@ func TestAccComputeNetwork_routingModeAndUpdate(t *testing.T) {
 	})
 }
 
+func TestAccComputeNetwork_numericId(t *testing.T) {
+	t.Parallel()
+	suffixName := acctest.RandString(t, 10)
+	networkName := fmt.Sprintf("tf-test-network-basic-%s", suffixName)
+	projectId := envvar.GetTestProjectFromEnv()
+	networkId := fmt.Sprintf("projects/%v/global/networks/%v", projectId, networkName)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeNetworkDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeNetwork_basic(suffixName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestMatchResourceAttr("google_compute_network.bar", "numeric_id", regexp.MustCompile("^\\d{1,}$")),
+					resource.TestCheckResourceAttr("google_compute_network.bar", "id", networkId),
+				),
+			},
+			{
+				ResourceName:      "google_compute_network.bar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccComputeNetwork_default_routing_mode(t *testing.T) {
 	t.Parallel()
 

website/docs/r/compute_network.html.markdown

@@ -148,6 +148,9 @@ In addition to the arguments listed above, the following computed attributes are
 * `gateway_ipv4` -
   The gateway address for default routing out of the network. This value
   is selected by GCP.
+
+* `numeric_id` -
+  The unique identifier for the resource. This identifier is defined by the server.
 * `self_link` - The URI of the created resource.