Merge pull request #5 from terraform-providers/master

+

Author: Himer

CHANGELOG.md

@@ -4,6 +4,22 @@ 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`.
+
 ## 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-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"

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

@@ -97,7 +97,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"),
 				),
 			},
 		},

tencentcloud/data_source_tc_redis_instances.go

@@ -148,6 +148,12 @@ func dataSourceTencentRedisInstances() *schema.Resource {
 							Computed:    true,
 							Description: "Tags of an instance.",
 						},
+						// payment
+						"charge_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The charge type of instance. Valid values are `POSTPAID` and `PREPAID`. Default value is `POSTPAID`.",
+						},
 					},
 				},
 			},
@@ -223,28 +229,23 @@ instanceLoop:
 		}
 
 		var instanceDes = make(map[string]interface{})
-
 		instanceDes["redis_id"] = instance.RedisId
 		instanceDes["name"] = instance.Name
 		instanceDes["zone"] = instance.Zone
-
 		instanceDes["project_id"] = instance.ProjectId
 		instanceDes["type"] = instance.Type
 		instanceDes["mem_size"] = instance.MemSize
-
 		instanceDes["status"] = instance.Status
 		instanceDes["vpc_id"] = instance.VpcId
 		instanceDes["subnet_id"] = instance.SubnetId
-
 		instanceDes["ip"] = instance.Ip
 		instanceDes["port"] = instance.Port
 		instanceDes["create_time"] = instance.CreateTime
-
 		instanceDes["tags"] = instance.Tags
 		instanceDes["redis_shard_num"] = instance.RedisShardNum
 		instanceDes["redis_replicas_num"] = instance.RedisReplicasNum
 		instanceDes["type_id"] = instance.TypeId
-
+		instanceDes["charge_type"] = instance.BillingMode
 		instanceList = append(instanceList, instanceDes)
 	}
 

tencentcloud/data_source_tc_redis_instances_test.go

@@ -25,6 +25,7 @@ func TestAccTencentCloudRedisInstancesDataSource(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.tencentcloud_redis_instances.redis", "instance_list.0.ip"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_redis_instances.redis", "instance_list.0.port"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_redis_instances.redis", "instance_list.0.create_time"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_redis_instances.redis", "instance_list.0.charge_type"),
 
 					resource.TestMatchResourceAttr("data.tencentcloud_redis_instances.redis-tags", "instance_list.#", regexp.MustCompile(`^[1-9]\d*$`)),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_redis_instances.redis-tags", "instance_list.0.name"),

tencentcloud/extension_mysql.go

@@ -87,6 +87,16 @@ var (
 	MysqlPayByUse   = 1
 )
 
+const (
+	MYSQL_CHARGE_TYPE_PREPAID  = "PREPAID"
+	MYSQL_CHARGE_TYPE_POSTPAID = "POSTPAID"
+)
+
+var MYSQL_CHARGE_TYPE = map[int]string{
+	MysqlPayByMonth: MYSQL_CHARGE_TYPE_PREPAID,
+	MysqlPayByUse:   MYSQL_CHARGE_TYPE_POSTPAID,
+}
+
 const (
 	MysqlInstanceIdNotFound  = "InvalidParameter.InstanceNotFound"
 	MysqlInstanceIdNotFound2 = "InvalidParameter"