Merge branch 'master' of github.com:terraform-providers/terraform-provider-tencentcloud

Author: likexian

CHANGELOG.md

@@ -4,6 +4,26 @@ FEATURES:
 
 * **New Data Source**: `tencentcloud_availability_regions`
 
+ENHANCEMENTS: 
+
+* Data Source: `tencentcloud_redis_instances` add new argument `charge_type` to support prepaid type.
+* Resource: `tencentcloud_redis_instance` add new argument `charge_type`, `prepaid_period` and `force_delete` to support prepaid type.
+* Resource: `tencentcloud_mysql_instance` add new argument `force_delete` to support soft deletion.
+* Resource: `tencentcloud_mysql_readonly_instance` add new argument `force_delete` to support soft deletion.
+
+BUG FIXES:
+
+* Resource: `tencentcloud_instance` fix `allocate_public_ip` inconsistency when eip is attached to the cvm.
+
+DEPRECATED:
+* Data Source: `tencentcloud_mysql_instances`: optional argument `pay_type` is no longer supported, replace by `charge_type`.
+* Resource: `tencentcloud_mysql_instance`: optional arguments `pay_type` and `period` are no longer supported, replace by `charge_type` and `prepaid_period`.
+* Resource: `tencentcloud_mysql_readonly_instance`: optional arguments `pay_type` and `period` are no longer supported, replace by `charge_type` and `prepaid_period`.
+* Resource: `tencentcloud_tcaplus_group` replace by `tencentcloud_tcaplus_tablegroup`
+* Data Source: `tencentcloud_tcaplus_groups` replace by `tencentcloud_tcaplus_tablegroups`
+* Resource: `tencentcloud_tcaplus_tablegroup`,`tencentcloud_tcaplus_idl` and `tencentcloud_tcaplus_table`  arguments `group_id`/`group_name`  replace by `tablegroup_id`/`tablegroup_name`
+* Data Source: `tencentcloud_tcaplus_groups`,`tencentcloud_tcaplus_idls` and `tencentcloud_tcaplus_tables` arguments `group_id`/`group_name`  replace by `tablegroup_id`/`tablegroup_name`
+
 ## 1.35.1 (June 02, 2020)
 
 ENHANCEMENTS: 

examples/tencentcloud-redis/main.tf

@@ -26,3 +26,19 @@ data "tencentcloud_redis_instances" "redis-tags" {
   zone = var.availability_zone
   tags = tencentcloud_redis_instance.redis_instance_test.tags
 }
+
+resource "tencentcloud_redis_instance" "redis_instance_prepaid_test" {
+  availability_zone                   = var.availability_zone
+  type_id                             = 2
+  password                            = "test12345789"
+  mem_size                            = 8192
+  name                                = "terrform_prepaid_test"
+  port                                = 6379
+  charge_type                         = "PREPAID"
+  prepaid_period                      = 1
+  force_delete                        = true
+
+  tags = {
+    "test" = "prepaid test"
+  }
+}

examples/tencentcloud-tcaplus/main.tf

@@ -1,28 +1,20 @@
-resource "tencentcloud_vpc" "foo" {
-  name       = var.instance_name
-  cidr_block = var.vpc_cidr
-}
-
-resource "tencentcloud_subnet" "subnet" {
-  name              = var.instance_name
-  vpc_id            = tencentcloud_vpc.foo.id
+data "tencentcloud_vpc_subnets" "vpc" {
+  is_default        = true
   availability_zone = var.availability_zone
-  cidr_block        = var.subnet_cidr
-  is_multicast      = false
 }
 
-resource "tencentcloud_tcaplus_application" "test_app" {
+resource "tencentcloud_tcaplus_cluster" "test_cluster" {
   idl_type                 = "PROTO"
-  app_name                 = "tf_tcaplus_g_table"
-  vpc_id                   = tencentcloud_vpc.foo.id
-  subnet_id                = tencentcloud_subnet.subnet.id
+  cluster_name             = "tf_tcaplus_g_table"
+  vpc_id                   = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id
+  subnet_id                = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id
   password                 = "1qaA2k1wgvfa3ZZZ"
   old_password_expire_last = 3600
 }
 
 resource "tencentcloud_tcaplus_idl" "test_idl" {
-  app_id        = tencentcloud_tcaplus_application.test_app.id
-  zone_id       = tencentcloud_tcaplus_zone.test_zone.id
+  cluster_id    = tencentcloud_tcaplus_cluster.test_cluster.id
+  tablegroup_id = tencentcloud_tcaplus_tablegroup.test_tablegroup.id
   file_name     = "tf_idl_test_guagua"
   file_type     = "PROTO"
   file_ext_type = "proto"
@@ -55,20 +47,20 @@ resource "tencentcloud_tcaplus_idl" "test_idl" {
     EOF
 }
 
-resource "tencentcloud_tcaplus_zone" "test_zone" {
-  app_id    = tencentcloud_tcaplus_application.test_app.id
-  zone_name = "tf_test_zone_name_guagua"
+resource "tencentcloud_tcaplus_tablegroup" "test_tablegroup" {
+  cluster_id      = tencentcloud_tcaplus_cluster.test_cluster.id
+  tablegroup_name = "tf_test_tablegroup"
 }
 
 resource "tencentcloud_tcaplus_table" "test_table" {
-  app_id             = tencentcloud_tcaplus_application.test_app.id
-  zone_id            = tencentcloud_tcaplus_zone.test_zone.id
-  table_name         = "tb_online_guagua"
-  table_type         = "GENERIC"
-  description        = "test"
-  idl_id             = tencentcloud_tcaplus_idl.test_idl.id
-  table_idl_type     = "PROTO"
-  reserved_read_qps  = 1000
-  reserved_write_qps = 20
-  reserved_volume    = 1
+  cluster_id        = tencentcloud_tcaplus_cluster.test_cluster.id
+  tablegroup_id     = tencentcloud_tcaplus_tablegroup.test_tablegroup.id
+  table_name        = "tb_online_guagua"
+  table_type        = "GENERIC"
+  description       = "test"
+  idl_id            = tencentcloud_tcaplus_idl.test_idl.id
+  table_idl_type    = "PROTO"
+  reserved_read_cu  = 1000
+  reserved_write_cu = 20
+  reserved_volume   = 1
 }

examples/tencentcloud-tcaplus/variables.tf

@@ -1,12 +1,3 @@
 variable "availability_zone" {
   default = "ap-shanghai-2"
-}
-variable "instance_name" {
-  default = "vpc_test"
-}
-variable "vpc_cidr" {
-  default = "10.1.0.0/16"
-}
-variable "subnet_cidr" {
-  default = "10.1.1.0/24"
-}
+}

examples/tencentcloud-vpn/main.tf

@@ -64,7 +64,7 @@ data "tencentcloud_vpn_connections" "example" {
   id = tencentcloud_vpn_connection.example.id
 }
 
-# The example below shows how to create a vpng gateway in ccn type if it is needed. Then could be used when creating
+# The example below shows how to create a vpn gateway in ccn type if it is needed. Then could be used when creating
 # vpn tunnel in the usual way.
 resource tencentcloud_vpn_gateway ccn_vpngw_example {
   name      = "ccn-vpngw-example"

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud"
 )
 

tencentcloud/basic_test.go

@@ -137,3 +137,16 @@ resource "tencentcloud_mysql_instance" "default" {
   availability_zone = var.availability_zone
 }
 `
+
+const mysqlInstanceHighPerformancePrepaidTestCase = defaultVpcVariable + `
+resource "tencentcloud_mysql_instance" "default" {
+  mem_size = 1000
+  volume_size = 50
+  pay_type = 0
+  instance_name = var.instance_name
+  engine_version = "5.7"
+  root_password = "0153Y474"
+  availability_zone = var.availability_zone
+  force_delete = true
+}
+`

tencentcloud/connectivity/client.go

@@ -93,7 +93,7 @@ func (me *TencentCloudClient) UseCosClient() *s3.S3 {
 	resolver := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
 		if service == endpoints.S3ServiceID {
 			return endpoints.ResolvedEndpoint{
-				URL:           fmt.Sprintf("http://cos.%s.myqcloud.com", region),
+				URL:           fmt.Sprintf("https://cos.%s.myqcloud.com", region),
 				SigningRegion: region,
 			}, nil
 		}

tencentcloud/data_source_tc_mysql_instance.go

@@ -50,8 +50,15 @@ func dataSourceTencentCloudMysqlInstance() *schema.Resource {
 			"pay_type": {
 				Type:         schema.TypeInt,
 				Optional:     true,
+				Deprecated:   "It has been deprecated from version 1.36.0.",
 				ValidateFunc: validateAllowedIntValue([]int{0, 1}),
-				Description:  "Pay type of instance, 0: prepay, 1: postpay. NOTES: Only prepay is supported.",
+				Description:  "Pay type of instance, 0: prepay, 1: postpay.",
+			},
+			"charge_type": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validateAllowedStringValue([]string{MYSQL_CHARGE_TYPE_PREPAID, MYSQL_CHARGE_TYPE_POSTPAID}),
+				Description:  "Pay type of instance, valid values are `PREPAID` and `POSTPAID`.",
 			},
 			"instance_name": {
 				Type:        schema.TypeString,
@@ -222,7 +229,12 @@ func dataSourceTencentCloudMysqlInstance() *schema.Resource {
 						"pay_type": {
 							Type:        schema.TypeInt,
 							Computed:    true,
-							Description: "Pay type of instance, 0: prepay, 1: postpay. NOTES: Only prepay is supported.",
+							Description: "Pay type of instance, 0: prepaid, 1: postpaid.",
+						},
+						"charge_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Pay type of instance.",
 						},
 						"create_time": {
 							Type:        schema.TypeString,
@@ -295,6 +307,16 @@ func dataSourceTencentCloudMysqlInstanceRead(d *schema.ResourceData, meta interf
 		payTypeValue := uint64(payType.(int))
 		request.PayTypes = []*uint64{&payTypeValue}
 	}
+	if chargeType, ok := d.GetOk("charge_type"); ok {
+		var payType int
+		if chargeType == MYSQL_CHARGE_TYPE_PREPAID {
+			payType = MysqlPayByMonth
+		} else {
+			payType = MysqlPayByUse
+		}
+		payTypeValue := uint64(payType)
+		request.PayTypes = []*uint64{&payTypeValue}
+	}
 	if instanceName, ok := d.GetOk("instance_name"); ok {
 		instanceNameValue := instanceName.(string)
 		request.InstanceNames = []*string{&instanceNameValue}
@@ -338,41 +360,39 @@ func dataSourceTencentCloudMysqlInstanceRead(d *schema.ResourceData, meta interf
 		return fmt.Errorf("api[DescribeDBInstances]fail, return %s", err.Error())
 	}
 
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
-		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
-
 	instanceDetails := response.Response.Items
 	instanceList := make([]map[string]interface{}, 0, len(instanceDetails))
 	ids := make([]string, 0, len(instanceDetails))
 	for _, item := range instanceDetails {
 		mapping := map[string]interface{}{
-			"mysql_id":        *item.InstanceId,
-			"instance_name":   *item.InstanceName,
+			"mysql_id":        item.InstanceId,
+			"instance_name":   item.InstanceName,
 			"instance_role":   MYSQL_ROLE_MAP[*item.InstanceType],
-			"init_flag":       *item.InitFlag,
-			"status":          *item.Status,
-			"zone":            *item.Zone,
-			"auto_renew_flag": *item.AutoRenew,
-			"engine_version":  *item.EngineVersion,
-			"cpu_core_count":  *item.Cpu,
-			"memory_size":     *item.Memory,
-			"volume_size":     *item.Volume,
-			"internet_status": *item.WanStatus,
-			"internet_host":   *item.WanDomain,
-			"internet_port":   *item.WanPort,
-			"intranet_ip":     *item.Vip,
-			"intranet_port":   *item.Vport,
-			"project_id":      *item.ProjectId,
-			"vpc_id":          *item.UniqVpcId,
-			"subnet_id":       *item.UniqSubnetId,
-			"slave_sync_mode": *item.ProtectMode,
-			"device_type":     *item.DeviceType,
-			"pay_type":        *item.PayType,
-			"create_time":     *item.CreateTime,
-			"dead_line_time":  *item.DeadlineTime,
+			"init_flag":       item.InitFlag,
+			"status":          item.Status,
+			"zone":            item.Zone,
+			"auto_renew_flag": item.AutoRenew,
+			"engine_version":  item.EngineVersion,
+			"cpu_core_count":  item.Cpu,
+			"memory_size":     item.Memory,
+			"volume_size":     item.Volume,
+			"internet_status": item.WanStatus,
+			"internet_host":   item.WanDomain,
+			"internet_port":   item.WanPort,
+			"intranet_ip":     item.Vip,
+			"intranet_port":   item.Vport,
+			"project_id":      item.ProjectId,
+			"vpc_id":          item.UniqVpcId,
+			"subnet_id":       item.UniqSubnetId,
+			"slave_sync_mode": item.ProtectMode,
+			"device_type":     item.DeviceType,
+			"pay_type":        item.PayType,
+			"create_time":     item.CreateTime,
+			"dead_line_time":  item.DeadlineTime,
+			"charge_type":     MYSQL_CHARGE_TYPE[int(*item.PayType)],
 		}
 		if item.MasterInfo != nil {
-			mapping["master_instance_id"] = *item.MasterInfo.InstanceId
+			mapping["master_instance_id"] = item.MasterInfo.InstanceId
 		} else {
 			mapping["master_instance_id"] = ""
 		}

tencentcloud/data_source_tc_mysql_instance_test.go

@@ -23,6 +23,7 @@ func TestAccTencentCloudMysqlInstanceDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("data.tencentcloud_mysql_instance.mysql", "instance_list.0.engine_version", "5.7"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_instance.mysql", "instance_list.0.vpc_id"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_instance.mysql", "instance_list.0.subnet_id"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_mysql_instance.mysql", "instance_list.0.auto_renew_flag"),
 				),
 			},
 		},