Add resource_manager_tags support to Network api (#14119) (#23421)

[upstream:524ca0e0edbab9d7ebf5b2d0dfc4d31ff890b7b0]

Signed-off-by: Modular Magician <magic-modules@google.com>

Author: modular-magician

.changelog/14119.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: add `params.resourceManagerTags` field to the `google_compute_network`
+```

google/acctest/bootstrap_test_utils.go

@@ -1757,16 +1757,16 @@ const sharedTagKeyParentErr = "Parent %q is not valid. Should be in format: 'org
 
 func BootstrapSharedTestProjectTagKey(t *testing.T, testId string, obj map[string]interface{}) string {
 	pid := envvar.GetTestProjectFromEnv()
-	return bootstrapSharedTestTagKey(t, testId, "projects/"+pid, obj)
+	return BootstrapSharedTestTagKeyDetails(t, testId, "projects/"+pid, obj)["shared_tag_key"]
 }
 
 func BootstrapSharedTestOrganizationTagKey(t *testing.T, testId string, obj map[string]interface{}) string {
 	org := envvar.GetTestOrgFromEnv(t)
-	return bootstrapSharedTestTagKey(t, testId, "organizations/"+org, obj)
+	return BootstrapSharedTestTagKeyDetails(t, testId, "organizations/"+org, obj)["shared_tag_key"]
 }
 
 // parent should be in format: {"organization" OR "projects"}/{id}
-func bootstrapSharedTestTagKey(t *testing.T, testId, parent string, obj map[string]interface{}) string {
+func BootstrapSharedTestTagKeyDetails(t *testing.T, testId string, parent string, obj map[string]interface{}) map[string]string {
 	sharedTagKey := fmt.Sprintf("%s-%s", sharedTagKeyPrefix, testId)
 
 	parentSplit := strings.Split(parent, "/")
@@ -1780,7 +1780,7 @@ func bootstrapSharedTestTagKey(t *testing.T, testId, parent string, obj map[stri
 
 	config := BootstrapConfig(t)
 	if config == nil {
-		return ""
+		return make(map[string]string)
 	}
 
 	log.Printf("[DEBUG] Getting shared test tag key %q", sharedTagKey)
@@ -1829,7 +1829,7 @@ func bootstrapSharedTestTagKey(t *testing.T, testId, parent string, obj map[stri
 		}
 	}
 
-	_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+	getTagKeyResponse, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 		Config:    config,
 		Method:    "GET",
 		Project:   config.Project,
@@ -1842,29 +1842,32 @@ func bootstrapSharedTestTagKey(t *testing.T, testId, parent string, obj map[stri
 		t.Fatalf("Error getting shared tag key %q: %s", sharedTagKey, err)
 	}
 
-	return sharedTagKey
+	return map[string]string{
+		"name":           getTagKeyResponse["name"].(string),
+		"shared_tag_key": sharedTagKey,
+	}
 }
 
 const sharedTagValuePrefix = "tf-bootstrap-tagvalue"
 
 func BootstrapSharedTestProjectTagValue(t *testing.T, testId string, tagKey string) string {
 	pid := envvar.GetTestProjectFromEnv()
-	return BootstrapSharedTestTagValue(t, testId, tagKey, pid)
+	return BootstrapSharedTestTagValueDetails(t, testId, tagKey, pid)["shared_tag_value"]
 }
 
 func BootstrapSharedTestOrganizationTagValue(t *testing.T, testId string, tagKey string) string {
 	org := envvar.GetTestOrgFromEnv(t)
-	return BootstrapSharedTestTagValue(t, testId, tagKey, org)
+	return BootstrapSharedTestTagValueDetails(t, testId, tagKey, org)["shared_tag_value"]
 }
 
-func BootstrapSharedTestTagValue(t *testing.T, testId string, tagKey, parentId string) string {
+func BootstrapSharedTestTagValueDetails(t *testing.T, testId string, tagKey, parentId string) map[string]string {
 	sharedTagValue := fmt.Sprintf("%s-%s", sharedTagValuePrefix, testId)
 	tagKeyName := fmt.Sprintf("%s/%s", parentId, tagKey)
 	tagValueName := fmt.Sprintf("%s/%s", tagKeyName, sharedTagValue)
 
 	config := BootstrapConfig(t)
 	if config == nil {
-		return ""
+		return make(map[string]string)
 	}
 
 	log.Printf("[DEBUG] Getting shared test tag value %q", sharedTagValue)
@@ -1923,8 +1926,7 @@ func BootstrapSharedTestTagValue(t *testing.T, testId string, tagKey, parentId s
 			t.Fatalf("Error waiting to create TagValue: %s", err)
 		}
 	}
-
-	_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+	getTagValueResponse, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 		Config:    config,
 		Method:    "GET",
 		Project:   config.Project,
@@ -1937,7 +1939,10 @@ func BootstrapSharedTestTagValue(t *testing.T, testId string, tagKey, parentId s
 		t.Fatalf("Error getting shared tag value %q: %s", sharedTagValue, err)
 	}
 
-	return sharedTagValue
+	return map[string]string{
+		"name":             getTagValueResponse["name"].(string),
+		"shared_tag_value": sharedTagValue,
+	}
 }
 
 type BootstrapClient struct {

google/services/compute/resource_compute_network.go

@@ -136,6 +136,26 @@ following are valid URLs:
 * https://www.googleapis.com/compute/v1/projects/{projectId}/global/networkProfiles/{network_profile_name}
 * projects/{projectId}/global/networkProfiles/{network_profile_name}`,
 			},
+			"params": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				ForceNew:    true,
+				Description: `Additional params passed with the request, but not persisted as part of resource payload`,
+				MaxItems:    1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"resource_manager_tags": {
+							Type:     schema.TypeMap,
+							Optional: true,
+							ForceNew: true,
+							Description: `Resource manager tags to be bound to the network. Tag keys and values have the
+same definition as resource manager tags. Keys must be in the format tagKeys/{tag_key_id},
+and values are in the format tagValues/456.`,
+							Elem: &schema.Schema{Type: schema.TypeString},
+						},
+					},
+				},
+			},
 			"bgp_always_compare_med": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -270,6 +290,12 @@ func resourceComputeNetworkCreate(d *schema.ResourceData, meta interface{}) erro
 	} else if v, ok := d.GetOkExists("network_profile"); !tpgresource.IsEmptyValue(reflect.ValueOf(networkProfileProp)) && (ok || !reflect.DeepEqual(v, networkProfileProp)) {
 		obj["networkProfile"] = networkProfileProp
 	}
+	paramsProp, err := expandComputeNetworkParams(d.Get("params"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("params"); !tpgresource.IsEmptyValue(reflect.ValueOf(paramsProp)) && (ok || !reflect.DeepEqual(v, paramsProp)) {
+		obj["params"] = paramsProp
+	}
 
 	obj, err = resourceComputeNetworkEncoder(d, meta, obj)
 	if err != nil {
@@ -885,6 +911,36 @@ func expandComputeNetworkNetworkProfile(v interface{}, d tpgresource.TerraformRe
 	return v, nil
 }
 
+func expandComputeNetworkParams(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedResourceManagerTags, err := expandComputeNetworkParamsResourceManagerTags(original["resource_manager_tags"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedResourceManagerTags); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["resourceManagerTags"] = transformedResourceManagerTags
+	}
+
+	return transformed, nil
+}
+
+func expandComputeNetworkParamsResourceManagerTags(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
+	if v == nil {
+		return map[string]string{}, nil
+	}
+	m := make(map[string]string)
+	for k, val := range v.(map[string]interface{}) {
+		m[k] = val.(string)
+	}
+	return m, 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

google/services/compute/resource_compute_network_generated_meta.yaml

@@ -20,6 +20,7 @@ fields:
     api_field: 'id'
   - field: 'network_profile'
   - field: 'numeric_id'
+  - field: 'params.resource_manager_tags'
   - field: 'routing_config.bgp_always_compare_med'
   - field: 'routing_config.bgp_best_path_selection_mode'
   - field: 'routing_config.bgp_inter_region_cost'

google/services/compute/resource_compute_network_generated_test.go

@@ -47,9 +47,10 @@ func TestAccComputeNetwork_networkBasicExample(t *testing.T) {
 				Config: testAccComputeNetwork_networkBasicExample(context),
 			},
 			{
-				ResourceName:      "google_compute_network.vpc_network",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_compute_network.vpc_network",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"params"},
 			},
 		},
 	})
@@ -80,9 +81,10 @@ func TestAccComputeNetwork_networkCustomMtuExample(t *testing.T) {
 				Config: testAccComputeNetwork_networkCustomMtuExample(context),
 			},
 			{
-				ResourceName:      "google_compute_network.vpc_network",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_compute_network.vpc_network",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"params"},
 			},
 		},
 	})
@@ -116,9 +118,10 @@ func TestAccComputeNetwork_networkCustomFirewallEnforcementOrderExample(t *testi
 				Config: testAccComputeNetwork_networkCustomFirewallEnforcementOrderExample(context),
 			},
 			{
-				ResourceName:      "google_compute_network.vpc_network",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_compute_network.vpc_network",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"params"},
 			},
 		},
 	})
@@ -152,9 +155,10 @@ func TestAccComputeNetwork_networkBgpBestPathSelectionModeExample(t *testing.T)
 				Config: testAccComputeNetwork_networkBgpBestPathSelectionModeExample(context),
 			},
 			{
-				ResourceName:      "google_compute_network.vpc_network",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_compute_network.vpc_network",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"params"},
 			},
 		},
 	})
@@ -187,9 +191,10 @@ func TestAccComputeNetwork_networkBgpBestPathSelectionModeStandardExample(t *tes
 				Config: testAccComputeNetwork_networkBgpBestPathSelectionModeStandardExample(context),
 			},
 			{
-				ResourceName:      "google_compute_network.vpc_network",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_compute_network.vpc_network",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"params"},
 			},
 		},
 	})
@@ -223,9 +228,10 @@ func TestAccComputeNetwork_networkBgpBestPathSelectionModeStandardCustomFieldsEx
 				Config: testAccComputeNetwork_networkBgpBestPathSelectionModeStandardCustomFieldsExample(context),
 			},
 			{
-				ResourceName:      "google_compute_network.vpc_network",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_compute_network.vpc_network",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"params"},
 			},
 		},
 	})

google/services/compute/resource_compute_network_test.go

@@ -516,6 +516,40 @@ func TestAccComputeNetwork_networkFirewallPolicyEnforcementOrderAndUpdate(t *tes
 	})
 }
 
+func TestAccComputeNetwork_resourceManagerTags(t *testing.T) {
+
+	t.Parallel()
+
+	var network compute.Network
+	org := envvar.GetTestOrgFromEnv(t)
+
+	suffixName := acctest.RandString(t, 10)
+	tagKeyResult := acctest.BootstrapSharedTestTagKeyDetails(t, "crm-networks-tagkey", "organizations/"+org, make(map[string]interface{}))
+	sharedTagkey, _ := tagKeyResult["shared_tag_key"]
+	tagValueResult := acctest.BootstrapSharedTestTagValueDetails(t, "crm-networks-tagvalue", sharedTagkey, org)
+	networkName := fmt.Sprintf("tf-test-network-resource-manager-tags-%s", suffixName)
+	context := map[string]interface{}{
+		"network_name": networkName,
+		"tag_key_id":   tagKeyResult["name"],
+		"tag_value_id": tagValueResult["name"],
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeNetworkDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeNetwork_resourceManagerTags(context),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeNetworkExists(
+						t, "google_compute_network.acc_network_with_resource_manager_tags", &network),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckComputeNetworkExists(t *testing.T, n string, network *compute.Network) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -845,3 +879,17 @@ resource "google_compute_network" "acc_network_firewall_policy_enforcement_order
 }
 `, networkName, order)
 }
+
+func testAccComputeNetwork_resourceManagerTags(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_network" "acc_network_with_resource_manager_tags" {
+  name                            = "%{network_name}"
+  auto_create_subnetworks         = false
+  params {
+	resource_manager_tags = {
+	  "%{tag_key_id}" = "%{tag_value_id}"
+  	}
+  }
+}
+`, context)
+}

website/docs/r/compute_network.html.markdown

@@ -191,13 +191,26 @@ The following arguments are supported:
   * https://www.googleapis.com/compute/v1/projects/{projectId}/global/networkProfiles/{network_profile_name}
   * projects/{projectId}/global/networkProfiles/{network_profile_name}
 
+* `params` -
+  (Optional)
+  Additional params passed with the request, but not persisted as part of resource payload
+  Structure is [documented below](#nested_params).
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.
 
 * `delete_default_routes_on_create` - (Optional) If set to `true`, default routes (`0.0.0.0/0`) will be deleted
 immediately after network creation. Defaults to `false`.
 
 
+<a name="nested_params"></a>The `params` block supports:
+
+* `resource_manager_tags` -
+  (Optional)
+  Resource manager tags to be bound to the network. Tag keys and values have the
+  same definition as resource manager tags. Keys must be in the format tagKeys/{tag_key_id},
+  and values are in the format tagValues/456.
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are exported: