fix ckafka (#974)

hellertang · web-flow · commit d9e23aea41cc · 2022-04-19T20:31:36.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.69.1 (April 19, 2022)
+
+BUGFIXES:
+
+* resource `tencentcloud_ckafka_instance` plan change
+* resource `tencentcloud_mysql_instance`  ignore lowercase when 8.0
+
 ## 1.69.0 (April 19, 2022)
 
 FEATURES:
diff --git a/tencentcloud/data_source_tc_ckafka_acls_test.go b/tencentcloud/data_source_tc_ckafka_acls_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccTencentCloudDataSourceCkafkaAcls(t *testing.T) {
+func TestAccTencentCloudCkafkaAclsDataSource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
diff --git a/tencentcloud/data_source_tc_ckafka_users_test.go b/tencentcloud/data_source_tc_ckafka_users_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccTencentCloudDataSourceCkafkaUsers(t *testing.T) {
+func TestAccTencentCloudCkafkaUsersDataSource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
diff --git a/tencentcloud/resource_tc_ckafka_instance.go b/tencentcloud/resource_tc_ckafka_instance.go
@@ -7,17 +7,24 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_ckafka_instance" "foo" {
-  instance_name      = "demo-hello"
-  zone_id            = 100006
+  band_width         = 40
+  disk_size          = 500
+  disk_type          = "CLOUD_BASIC"
   period             = 1
-  vpc_id             = "vpc-boi1ah65"
-  subnet_id          = "subnet-7ros461e"
+  instance_name      = "ckafka-instance-tf-test"
+  kafka_version      = "1.1.1"
   msg_retention_time = 1300
+  multi_zone_flag    = true
+  partition          = 800
+  public_network     = 3
   renew_flag         = 0
-  kafka_version      = "1.1.1"
-  disk_size          = 500
-  disk_type          = "CLOUD_BASIC"
-
+  subnet_id          = "subnet-4vwihrzk"
+  vpc_id             = "vpc-82p1t1nv"
+  zone_id            = 100006
+  zone_ids           = [
+    100006,
+    100007,
+  ]
 
   config {
     auto_create_topic_enable   = true
@@ -26,7 +33,10 @@ resource "tencentcloud_ckafka_instance" "foo" {
   }
 
   dynamic_retention_config {
-    enable = 1
+    bottom_retention        = 0
+    disk_quota_percentage   = 0
+    enable                  = 1
+    step_forward_percentage = 0
   }
 }
 ```
@@ -88,7 +98,7 @@ func resourceTencentCloudCkafkaInstance() *schema.Resource {
 			},
 			"period": {
 				Type:        schema.TypeInt,
-				Required:    true,
+				Optional:    true,
 				ForceNew:    true,
 				Description: "Prepaid purchase time, such as 1, is one month.",
 			},
@@ -127,26 +137,29 @@ func resourceTencentCloudCkafkaInstance() *schema.Resource {
 				ForceNew:    true,
 				Description: "Kafka version (0.10.2/1.1.1/2.4.1).",
 			},
-			"disk_size": {
-				Type:        schema.TypeInt,
-				Optional:    true,
-				Computed:    true,
-				ForceNew:    true,
-				Description: "Disk Size.",
-			},
 			"band_width": {
-				Type:        schema.TypeInt,
-				Optional:    true,
-				Computed:    true,
-				ForceNew:    true,
-				Description: "Instance bandwidth in Mbps.",
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Computed:     true,
+				ForceNew:     true,
+				ValidateFunc: validateIntegerInRange(40, 1200),
+				Description:  "Instance bandwidth in MBps. interval:40-1200.",
+			},
+			"disk_size": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				Description: "Disk Size. Its interval varies with bandwidth, and the input must be within the interval, which can be viewed through the control. " +
+					"If it is not within the interval, the plan will cause a change when first created.",
 			},
 			"partition": {
-				Type:        schema.TypeInt,
-				Optional:    true,
-				Computed:    true,
-				ForceNew:    true,
-				Description: "Partition size, the professional version does not need set.",
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				Description: "Partition Size. Its interval varies with bandwidth, and the input must be within the interval, which can be viewed through the control. " +
+					"If it is not within the interval, the plan will cause a change when first created.",
 			},
 			"multi_zone_flag": {
 				Type:        schema.TypeBool,
@@ -484,16 +497,17 @@ func resourceTencentCloudCkafkaInstanceRead(d *schema.ResourceData, meta interfa
 	_ = d.Set("instance_name", info.InstanceName)
 	_ = d.Set("zone_id", info.ZoneId)
 	// calculate period
-	createTime := *info.CreateTime
-	expireTime := *info.ExpireTime
-	period := (expireTime - createTime) / (3600 * 24 * 31)
-	_ = d.Set("period", &period)
+	//createTime := *info.CreateTime
+	//expireTime := *info.ExpireTime
+	//period := (expireTime - createTime) / (3600 * 24 * 31)
+	//_ = d.Set("period", &period)
 	_ = d.Set("vpc_id", info.VpcId)
 	_ = d.Set("subnet_id", info.SubnetId)
 	_ = d.Set("renew_flag", info.RenewFlag)
 	_ = d.Set("kafka_version", info.Version)
 	_ = d.Set("disk_size", info.DiskSize)
-	_ = d.Set("band_width", info.Bandwidth)
+	bandWidth := info.Bandwidth
+	_ = d.Set("band_width", *bandWidth/8)
 	_ = d.Set("partition", info.MaxPartitionNumber)
 
 	if len(info.ZoneIds) > 0 {
diff --git a/tencentcloud/resource_tc_ckafka_instance_test.go b/tencentcloud/resource_tc_ckafka_instance_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccTencentCloudKafkaInstance(t *testing.T) {
+func TestAccTencentCloudCKafkaInstance(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
diff --git a/tencentcloud/resource_tc_ckafka_topic_test.go b/tencentcloud/resource_tc_ckafka_topic_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccTencentCloudKafkaTopic(t *testing.T) {
+func TestAccTencentCloudCKafkaTopic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
diff --git a/website/docs/r/ckafka_instance.html.markdown b/website/docs/r/ckafka_instance.html.markdown
@@ -17,16 +17,24 @@ Use this resource to create ckafka instance.
 
 ```hcl
 resource "tencentcloud_ckafka_instance" "foo" {
-  instance_name      = "demo-hello"
-  zone_id            = 100006
+  band_width         = 40
+  disk_size          = 500
+  disk_type          = "CLOUD_BASIC"
   period             = 1
-  vpc_id             = "vpc-boi1ah65"
-  subnet_id          = "subnet-7ros461e"
+  instance_name      = "ckafka-instance-tf-test"
+  kafka_version      = "1.1.1"
   msg_retention_time = 1300
+  multi_zone_flag    = true
+  partition          = 800
+  public_network     = 3
   renew_flag         = 0
-  kafka_version      = "1.1.1"
-  disk_size          = 500
-  disk_type          = "CLOUD_BASIC"
+  subnet_id          = "subnet-4vwihrzk"
+  vpc_id             = "vpc-82p1t1nv"
+  zone_id            = 100006
+  zone_ids = [
+    100006,
+    100007,
+  ]
 
   config {
     auto_create_topic_enable   = true
@@ -35,7 +43,10 @@ resource "tencentcloud_ckafka_instance" "foo" {
   }
 
   dynamic_retention_config {
-    enable = 1
+    bottom_retention        = 0
+    disk_quota_percentage   = 0
+    enable                  = 1
+    step_forward_percentage = 0
   }
 }
 ```
@@ -45,19 +56,19 @@ resource "tencentcloud_ckafka_instance" "foo" {
 The following arguments are supported:
 
 * `instance_name` - (Required) Instance name.
-* `period` - (Required, ForceNew) Prepaid purchase time, such as 1, is one month.
 * `subnet_id` - (Required, ForceNew) Subnet id.
 * `vpc_id` - (Required, ForceNew) Vpc id.
 * `zone_id` - (Required, ForceNew) Available zone id.
-* `band_width` - (Optional, ForceNew) Instance bandwidth in Mbps.
+* `band_width` - (Optional, ForceNew) Instance bandwidth in MBps. interval:40-1200.
 * `config` - (Optional) Instance configuration.
-* `disk_size` - (Optional, ForceNew) Disk Size.
+* `disk_size` - (Optional, ForceNew) Disk Size. Its interval varies with bandwidth, and the input must be within the interval, which can be viewed through the control. If it is not within the interval, the plan will cause a change when first created.
 * `disk_type` - (Optional, ForceNew) Type of disk.
 * `dynamic_retention_config` - (Optional) Dynamic message retention policy configuration.
 * `kafka_version` - (Optional, ForceNew) Kafka version (0.10.2/1.1.1/2.4.1).
 * `msg_retention_time` - (Optional) The maximum retention time of instance logs, in minutes. the default is 10080 (7 days), the maximum is 30 days, and the default 0 is not filled, which means that the log retention time recovery policy is not enabled.
 * `multi_zone_flag` - (Optional, ForceNew) Indicates whether the instance is multi zones. NOTE: if set to `true`, `zone_ids` must set together.
-* `partition` - (Optional, ForceNew) Partition size, the professional version does not need set.
+* `partition` - (Optional, ForceNew) Partition Size. Its interval varies with bandwidth, and the input must be within the interval, which can be viewed through the control. If it is not within the interval, the plan will cause a change when first created.
+* `period` - (Optional, ForceNew) Prepaid purchase time, such as 1, is one month.
 * `public_network` - (Optional) Timestamp.
 * `rebalance_time` - (Optional) Modification of the rebalancing time after upgrade.
 * `renew_flag` - (Optional, ForceNew) Prepaid automatic renewal mark, 0 means the default state, the initial state, 1 means automatic renewal, 2 means clear no automatic renewal (user setting).

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/hashicorp/terraform-plugin-sdk/helper/resource"`
`7`	`7`	`)`
`8`	`8`
`9`		`-func TestAccTencentCloudDataSourceCkafkaAcls(t *testing.T) {`
	`9`	`+func TestAccTencentCloudCkafkaAclsDataSource(t *testing.T) {`
`10`	`10`	`t.Parallel()`
`11`	`11`	`resource.Test(t, resource.TestCase{`
`12`	`12`	`PreCheck: func() { testAccPreCheck(t) },`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/hashicorp/terraform-plugin-sdk/terraform"`
`10`	`10`	`)`
`11`	`11`
`12`		`-func TestAccTencentCloudKafkaInstance(t *testing.T) {`
	`12`	`+func TestAccTencentCloudCKafkaInstance(t *testing.T) {`
`13`	`13`	`t.Parallel()`
`14`	`14`	`resource.Test(t, resource.TestCase{`
`15`	`15`	`PreCheck: func() { testAccPreCheck(t) },`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/hashicorp/terraform-plugin-sdk/terraform"`
`11`	`11`	`)`
`12`	`12`
`13`		`-func TestAccTencentCloudKafkaTopic(t *testing.T) {`
	`13`	`+func TestAccTencentCloudCKafkaTopic(t *testing.T) {`
`14`	`14`	`t.Parallel()`
`15`	`15`	`resource.Test(t, resource.TestCase{`
`16`	`16`	`PreCheck: func() { testAccPreCheck(t) },`