Merge branch 'master' into master

Author: gailwang

CHANGELOG.md

@@ -2,14 +2,26 @@
 
 FEATURES:
 
+* **New Resource**: `tencentcloud_image`
 * **New Resource**: `tencentcloud_audit`
 * **New Data Source**: `tencentcloud_audits` 
 * **New Data Source**: `tencentcloud_audit_cos_regions`
 * **New Data Source**: `tencentcloud_audit_key_alias`
 
+ENHANCEMENTS:
+
+* Resource: `tencentcloud_instance` add new argument `data_disk_snapshot_id` to support data disk with `SnapshotId`([#469](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/469))
+* Data Source: `tencentcloud_instances` support filter by tags.
+
+## 1.42.2 (September 14, 2020)
+
+BUG FIXES:
+* Resource: `tencentcloud_instance` fix `key_name` update error([#515](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/515)).
+
 ## 1.42.1 (September 10, 2020)
 
 BUG FIXES:
+
 * Resource: `tencentcloud_mongodb_instance` Fix the error of releasing associated resources when destroying mongodb postpaid instance.
 * Resource: `tencentcloud_mongodb_sharding_instance` Fix the error of releasing associated resources when destroying mongodb postpaid sharding instance.
 * Resource: `tencentcloud_mongodb_standby_instance` Fix the error of releasing associated resources when destroying mongodb postpaid standby instance.

examples/tencentcloud-image/main.tf

@@ -0,0 +1,12 @@
+provider "tencentcloud" {
+  region = "ap-guangzhou"
+}
+
+resource "tencentcloud_image" "image_instance" {
+   image_name         = var.image_imstance_name
+   instance_id        = "ins-2ju245xg"
+   data_disk_ids      = ["disk-gii0vtwi"]
+   force_poweroff     = true
+   sysprep            = false
+   image_description  = "create image with instance"
+}

examples/tencentcloud-image/variables.tf

@@ -0,0 +1,3 @@
+variable "image_imstance_name" {
+    default = "image-instance-keep"
+}

examples/tencentcloud-image/version.tf

@@ -0,0 +1,3 @@
+terraform {
+  required_version = ">= 0.12"
+}

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_images.go

@@ -0,0 +1,6 @@
+package tencentcloud
+
+const (
+	TRUE  = "true"
+	FALSE = "false"
+)

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/provider.go

@@ -209,6 +209,7 @@ CVM
     tencentcloud_key_pair
     tencentcloud_placement_group
     tencentcloud_reserved_instance
+    tencentcloud_image
 
 Direct Connect(DC)
   Data Source
@@ -774,6 +775,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_ckafka_acl":                      resourceTencentCloudCkafkaAcl(),
 			"tencentcloud_ckafka_topic":                    resourceTencentCloudCkafkaTopic(),
 			"tencentcloud_audit":                           resourceTencentCloudAudit(),
+			"tencentcloud_image":                           resourceTencentCloudImage(),
 		},
 
 		ConfigureFunc: providerConfigure,

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