tencentcloud_instances support filter by tags

Author: oliverpei

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## 1.42.3 (Unreleased)
+
+ENHANCEMENTS:
+
+* Data Source: `tencentcloud_instances` support filter by tags.
+
 ## 1.42.2 (September 14, 2020)
 
 BUG FIXES:

tencentcloud/data_source_tc_instances.go

@@ -58,6 +58,11 @@ func dataSourceTencentCloudInstances() *schema.Resource {
 				Optional:    true,
 				Description: "ID of a vpc subnetwork.",
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Tags of the instance.",
+			},
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -260,6 +265,11 @@ func dataSourceTencentCloudInstancesRead(d *schema.ResourceData, meta interface{
 	if v, ok := d.GetOk("subnet_id"); ok {
 		filter["subnet-id"] = v.(string)
 	}
+	if v, ok := d.GetOk("tags"); ok {
+		for key, value := range v.(map[string]interface{}) {
+			filter["tag:"+key] = value.(string)
+		}
+	}
 
 	var instances []*cvm.Instance
 	var errRet error

tencentcloud/extension_vpc.go

@@ -7,15 +7,18 @@ package tencentcloud
 const GATE_WAY_TYPE_CVM = "CVM"
 const GATE_WAY_TYPE_VPN = "VPN"
 const GATE_WAY_TYPE_DIRECTCONNECT = "DIRECTCONNECT"
+const GATE_WAY_TYPE_PEERCONNECTION = "PEERCONNECTION"
 const GATE_WAY_TYPE_SSLVPN = "SSLVPN"
 const GATE_WAY_TYPE_NAT = "NAT"
 const GATE_WAY_TYPE_NORMAL_CVM = "NORMAL_CVM"
 const GATE_WAY_TYPE_EIP = "EIP"
 const GATE_WAY_TYPE_CCN = "CCN"
 
-var ALL_GATE_WAY_TYPES = []string{GATE_WAY_TYPE_CVM,
+var ALL_GATE_WAY_TYPES = []string{
+	GATE_WAY_TYPE_CVM,
 	GATE_WAY_TYPE_VPN,
 	GATE_WAY_TYPE_DIRECTCONNECT,
+	GATE_WAY_TYPE_PEERCONNECTION,
 	GATE_WAY_TYPE_SSLVPN,
 	GATE_WAY_TYPE_NAT,
 	GATE_WAY_TYPE_NORMAL_CVM,

tencentcloud/resource_tc_cbs_storage.go

@@ -7,7 +7,7 @@ Example Usage
 resource "tencentcloud_cbs_storage" "storage" {
   storage_name      = "mystorage"
   storage_type      = "CLOUD_SSD"
-  storage_size      = "50"
+  storage_size      = 100
   availability_zone = "ap-guangzhou-3"
   project_id        = 0
   encrypt           = false

website/docs/d/instances.html.markdown

@@ -29,6 +29,7 @@ The following arguments are supported:
 * `project_id` - (Optional) The project CVM belongs to.
 * `result_output_file` - (Optional) Used to save results.
 * `subnet_id` - (Optional) ID of a vpc subnetwork.
+* `tags` - (Optional) Tags of the instance.
 * `vpc_id` - (Optional) ID of the vpc to be queried.
 
 ## Attributes Reference

website/docs/r/cbs_storage.html.markdown

@@ -17,7 +17,7 @@ Provides a resource to create a CBS.
 resource "tencentcloud_cbs_storage" "storage" {
   storage_name      = "mystorage"
   storage_type      = "CLOUD_SSD"
-  storage_size      = "50"
+  storage_size      = 100
   availability_zone = "ap-guangzhou-3"
   project_id        = 0
   encrypt           = false