Add resource_manager_tags support to Route api (#14395) (#23489)

[upstream:1f87d93c4f1c1b848e213265f2c49b55fd655ee1]

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

Author: modular-magician

.changelog/14395.txt

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

google/services/compute/resource_compute_route.go

@@ -168,6 +168,29 @@ You can specify this as a full or partial URL. For example:
 				Description:      `URL to a VpnTunnel that should handle matching packets.`,
 				ExactlyOneOf:     []string{"next_hop_gateway", "next_hop_instance", "next_hop_ip", "next_hop_vpn_tunnel", "next_hop_ilb"},
 			},
+			"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 route. 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. The field is ignored when empty.
+The field is immutable and causes resource replacement when mutated. This field is only
+set at create time and modifying this field after creation will trigger recreation.
+To apply tags to an existing resource, see the google_tags_tag_binding resource.`,
+							Elem: &schema.Schema{Type: schema.TypeString},
+						},
+					},
+				},
+			},
 			"priority": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -404,6 +427,12 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
 	} else if v, ok := d.GetOkExists("next_hop_ilb"); !tpgresource.IsEmptyValue(reflect.ValueOf(nextHopIlbProp)) && (ok || !reflect.DeepEqual(v, nextHopIlbProp)) {
 		obj["nextHopIlb"] = nextHopIlbProp
 	}
+	paramsProp, err := expandComputeRouteParams(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
+	}
 
 	lockName, err := tpgresource.ReplaceVars(d, config, "projects/{{project}}/global/networks/{{network}}/peerings")
 	if err != nil {
@@ -941,6 +970,36 @@ func expandComputeRouteNextHopIlb(v interface{}, d tpgresource.TerraformResource
 	return v, nil
 }
 
+func expandComputeRouteParams(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 := expandComputeRouteParamsResourceManagerTags(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 expandComputeRouteParamsResourceManagerTags(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 resourceComputeRouteDecoder(d *schema.ResourceData, meta interface{}, res map[string]interface{}) (map[string]interface{}, error) {
 	if v, ok := res["nextHopInstance"]; ok {
 		val, err := tpgresource.ParseZonalFieldValue("instances", v.(string), "project", "next_hop_instance_zone", d, meta.(*transport_tpg.Config), true)

google/services/compute/resource_compute_route_generated_meta.yaml

@@ -23,6 +23,7 @@ fields:
   - field: 'next_hop_origin'
   - field: 'next_hop_peering'
   - field: 'next_hop_vpn_tunnel'
+  - field: 'params.resource_manager_tags'
   - field: 'priority'
   - field: 'route_status'
   - field: 'route_type'

google/services/compute/resource_compute_route_generated_test.go

@@ -49,7 +49,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"},
+				ImportStateVerifyIgnore: []string{"network", "next_hop_instance", "next_hop_vpn_tunnel", "params"},
 			},
 		},
 	})
@@ -90,7 +90,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"},
+				ImportStateVerifyIgnore: []string{"network", "next_hop_instance", "next_hop_vpn_tunnel", "params"},
 			},
 		},
 	})

google/services/compute/resource_compute_route_test.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
 )
 
 func TestAccComputeRoute_defaultInternetGateway(t *testing.T) {
@@ -65,6 +66,55 @@ func TestAccComputeRoute_hopInstance(t *testing.T) {
 	})
 }
 
+func TestAccComputeRoute_resourceManagerTags(t *testing.T) {
+
+	org := envvar.GetTestOrgFromEnv(t)
+
+	routeName := fmt.Sprintf("tf-test-route-resource-manager-tags-%s", acctest.RandString(t, 10))
+	tagKeyResult := acctest.BootstrapSharedTestTagKeyDetails(t, "crm-nroute-tagkey", "organizations/"+org, make(map[string]interface{}))
+	sharedTagkey, _ := tagKeyResult["shared_tag_key"]
+	tagValueResult := acctest.BootstrapSharedTestTagValueDetails(t, "crm-route-tagvalue", sharedTagkey, org)
+	context := map[string]interface{}{
+		"route_name":   routeName,
+		"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:             testAccCheckComputeRouteDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeRoute_resourceManagerTags(context),
+			},
+			{
+				ResourceName:            "google_compute_route.acc_route_with_resource_manager_tags",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"params"}, // we don't read tags back. The whole params block is input only
+			},
+		},
+	})
+}
+
+func testAccComputeRoute_resourceManagerTags(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_route" "acc_route_with_resource_manager_tags" {
+  name             = "%{route_name}"
+  dest_range       = "0.0.0.0/0"
+  network          = "default"
+  next_hop_gateway = "default-internet-gateway"
+  priority         = 100
+  params {
+	resource_manager_tags = {
+	  "%{tag_key_id}" = "%{tag_value_id}"
+  	}
+  }
+}
+`, context)
+}
+
 func testAccComputeRoute_defaultInternetGateway(suffix string) string {
 	return fmt.Sprintf(`
 resource "google_compute_route" "foobar" {

website/docs/r/compute_route.html.markdown

@@ -310,6 +310,11 @@ The following arguments are supported:
   Note that this can only be used when the destinationRange is
   a public (non-RFC 1918) IP CIDR range.
 
+* `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.
 
@@ -319,6 +324,17 @@ The following arguments are supported:
   a URL.
 
 
+<a name="nested_params"></a>The `params` block supports:
+
+* `resource_manager_tags` -
+  (Optional)
+  Resource manager tags to be bound to the route. 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. The field is ignored when empty.
+  The field is immutable and causes resource replacement when mutated. This field is only
+  set at create time and modifying this field after creation will trigger recreation.
+  To apply tags to an existing resource, see the google_tags_tag_binding resource.
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are exported: