From 677912dc67d8aec0eeac500a3d0fa6c56e19244f Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 10 Aug 2023 19:46:07 +0800 Subject: [PATCH 1/7] ftx/cynosdb --- tencentcloud/resource_tc_cynosdb_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/resource_tc_cynosdb_cluster.go b/tencentcloud/resource_tc_cynosdb_cluster.go index 7d2bae599e..28b33b79f7 100644 --- a/tencentcloud/resource_tc_cynosdb_cluster.go +++ b/tencentcloud/resource_tc_cynosdb_cluster.go @@ -519,7 +519,7 @@ func resourceTencentCloudCynosdbClusterRead(d *schema.ResourceData, meta interfa oldValue := item["old_value"].(string) currentParamItem := make(map[string]string) currentParamItem["name"] = name - if currentParamMap[name] != nil { + if currentParamMap[name] != nil && currentParamMap[name].CurrentValue != nil { currentParamItem["current_value"] = *currentParamMap[name].CurrentValue } if oldValue != "" { From a6cab293dc3eab437418425ef3d8b192d7d84117 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 10 Aug 2023 20:24:33 +0800 Subject: [PATCH 2/7] fix/vpc --- tencentcloud/resource_tc_security_group_rule_set.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tencentcloud/resource_tc_security_group_rule_set.go b/tencentcloud/resource_tc_security_group_rule_set.go index 5e966879d9..be67113059 100644 --- a/tencentcloud/resource_tc_security_group_rule_set.go +++ b/tencentcloud/resource_tc_security_group_rule_set.go @@ -346,7 +346,7 @@ func resourceTencentCloudSecurityGroupRuleSetUpdate(d *schema.ResourceData, m in return e } - if result.Egress != nil { + if len(result.Egress) > 0 { tmpList := []*int64{} egressRulesList := marshalSecurityPolicy(result.Egress) for _, v := range egressRulesList { @@ -373,14 +373,13 @@ func resourceTencentCloudSecurityGroupRuleSetUpdate(d *schema.ResourceData, m in return e } - if result.Ingress != nil { + if len(result.Ingress) > 0 { tmpList := []*int64{} ingressRulesList := marshalSecurityPolicy(result.Ingress) for _, v := range ingressRulesList { item := v.(map[string]interface{}) tmpList = append(tmpList, item["policy_index"].(*int64)) } - e = service.DeleteSecurityGroupPolicyByPolicyIndexList(ctx, securityGroupId, tmpList, "ingress") if e != nil { return e From 790104ab01263c87846690c0ee01f4c110a8a630 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 10 Aug 2023 20:33:44 +0800 Subject: [PATCH 3/7] fix/cfs --- tencentcloud/resource_tc_cfs_access_group.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tencentcloud/resource_tc_cfs_access_group.go b/tencentcloud/resource_tc_cfs_access_group.go index 47de2034e1..b07c9d7c42 100644 --- a/tencentcloud/resource_tc_cfs_access_group.go +++ b/tencentcloud/resource_tc_cfs_access_group.go @@ -142,7 +142,8 @@ func resourceTencentCloudCfsAccessGroupUpdate(d *schema.ResourceData, meta inter if d.HasChange("description") { request.DescInfo = helper.String(d.Get("description").(string)) } - + id := d.Id() + request.PGroupId = &id err := resource.Retry(writeRetryTimeout, func() *resource.RetryError { ratelimit.Check(request.GetAction()) response, err := meta.(*TencentCloudClient).apiV3Conn.UseCfsClient().UpdateCfsPGroup(request) From 3db9f0b18a615fce2a4edfc88712f5b80e1ac897 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Fri, 11 Aug 2023 10:19:46 +0800 Subject: [PATCH 4/7] fix/cfs --- tencentcloud/resource_tc_cfs_access_group.go | 6 ++-- .../resource_tc_cfs_access_group_test.go | 35 +++++++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/tencentcloud/resource_tc_cfs_access_group.go b/tencentcloud/resource_tc_cfs_access_group.go index b07c9d7c42..6a7fca0193 100644 --- a/tencentcloud/resource_tc_cfs_access_group.go +++ b/tencentcloud/resource_tc_cfs_access_group.go @@ -4,9 +4,9 @@ Provides a resource to create a CFS access group. Example Usage ```hcl -resource "tencentcloud_cfs_access_group" "foo" { - name = "test_access_group" - description = "test" +resource "tencentcloud_cfs_access_group" "example" { + name = "tx_example" + description = "desc." } ``` diff --git a/tencentcloud/resource_tc_cfs_access_group_test.go b/tencentcloud/resource_tc_cfs_access_group_test.go index bb05530caf..32632b2754 100644 --- a/tencentcloud/resource_tc_cfs_access_group_test.go +++ b/tencentcloud/resource_tc_cfs_access_group_test.go @@ -63,7 +63,8 @@ func init() { }) } -func TestAccTencentCloudCfsAccessGroup(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudCfsAccessGroup_basic -v +func TestAccTencentCloudCfsAccessGroup_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -73,9 +74,22 @@ func TestAccTencentCloudCfsAccessGroup(t *testing.T) { { Config: testAccCfsAccessGroup, Check: resource.ComposeTestCheckFunc( - testAccCheckCfsAccessGroupExists("tencentcloud_cfs_access_group.foo"), - resource.TestCheckResourceAttr("tencentcloud_cfs_access_group.foo", "name", "test_cfs_access_group"), - resource.TestCheckResourceAttr("tencentcloud_cfs_access_group.foo", "description", "test"), + testAccCheckCfsAccessGroupExists("tencentcloud_cfs_access_group.example"), + resource.TestCheckResourceAttr("tencentcloud_cfs_access_group.example", "name", "tx_example"), + resource.TestCheckResourceAttr("tencentcloud_cfs_access_group.example", "description", "desc."), + ), + }, + { + ResourceName: "tencentcloud_cfs_access_group.example", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccCfsAccessGroupUpdate, + Check: resource.ComposeTestCheckFunc( + testAccCheckCfsAccessGroupExists("tencentcloud_cfs_access_group.example"), + resource.TestCheckResourceAttr("tencentcloud_cfs_access_group.example", "name", "tx_example_update"), + resource.TestCheckResourceAttr("tencentcloud_cfs_access_group.example", "description", "desc update."), ), }, }, @@ -149,8 +163,15 @@ func testAccCheckCfsAccessGroupExists(n string) resource.TestCheckFunc { } const testAccCfsAccessGroup = ` -resource "tencentcloud_cfs_access_group" "foo" { - name = "test_cfs_access_group" - description = "test" +resource "tencentcloud_cfs_access_group" "example" { + name = "tx_example" + description = "desc." +} +` + +const testAccCfsAccessGroupUpdate = ` +resource "tencentcloud_cfs_access_group" "example" { + name = "tx_example_update" + description = "desc update." } ` From 7267de148a3bf615ca5b658059923baaa99d0f1d Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Fri, 11 Aug 2023 10:27:18 +0800 Subject: [PATCH 5/7] fix/cfs --- tencentcloud/resource_tc_cls_data_transform.go | 3 ++- tencentcloud/resource_tc_cls_data_transform_test.go | 5 +++-- tencentcloud/resource_tc_cls_kafka_recharge.go | 5 +++-- tencentcloud/resource_tc_cls_kafka_recharge_test.go | 5 +++-- tencentcloud/resource_tc_cls_scheduled_sql.go | 5 +++-- tencentcloud/resource_tc_cls_scheduled_sql_test.go | 3 ++- website/docs/r/cfs_access_group.html.markdown | 6 +++--- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/tencentcloud/resource_tc_cls_data_transform.go b/tencentcloud/resource_tc_cls_data_transform.go index 33fb8dfd92..c0d1adb47c 100644 --- a/tencentcloud/resource_tc_cls_data_transform.go +++ b/tencentcloud/resource_tc_cls_data_transform.go @@ -68,11 +68,12 @@ package tencentcloud import ( "context" "fmt" + "log" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" - "log" ) func resourceTencentCloudClsDataTransform() *schema.Resource { diff --git a/tencentcloud/resource_tc_cls_data_transform_test.go b/tencentcloud/resource_tc_cls_data_transform_test.go index 43c9ff05cb..6bf9c90be8 100644 --- a/tencentcloud/resource_tc_cls_data_transform_test.go +++ b/tencentcloud/resource_tc_cls_data_transform_test.go @@ -3,10 +3,11 @@ package tencentcloud import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "testing" "time" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) // go test -i; go test -test.run TestAccTencentCloudClsDataTransformResource_basic -v diff --git a/tencentcloud/resource_tc_cls_kafka_recharge.go b/tencentcloud/resource_tc_cls_kafka_recharge.go index a73c51ff29..aa89d513f4 100644 --- a/tencentcloud/resource_tc_cls_kafka_recharge.go +++ b/tencentcloud/resource_tc_cls_kafka_recharge.go @@ -53,12 +53,13 @@ package tencentcloud import ( "context" "fmt" + "log" + "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" - "log" - "strings" ) func resourceTencentCloudClsKafkaRecharge() *schema.Resource { diff --git a/tencentcloud/resource_tc_cls_kafka_recharge_test.go b/tencentcloud/resource_tc_cls_kafka_recharge_test.go index 1587687e67..8a84adb01b 100644 --- a/tencentcloud/resource_tc_cls_kafka_recharge_test.go +++ b/tencentcloud/resource_tc_cls_kafka_recharge_test.go @@ -3,10 +3,11 @@ package tencentcloud import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "strings" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccTencentCloudClsKafkaRechargeResource_basic(t *testing.T) { diff --git a/tencentcloud/resource_tc_cls_scheduled_sql.go b/tencentcloud/resource_tc_cls_scheduled_sql.go index 9f3ab52db5..d9dff8f6b5 100644 --- a/tencentcloud/resource_tc_cls_scheduled_sql.go +++ b/tencentcloud/resource_tc_cls_scheduled_sql.go @@ -58,12 +58,13 @@ package tencentcloud import ( "context" "fmt" + "log" + "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" - "log" - "time" ) func resourceTencentCloudClsScheduledSql() *schema.Resource { diff --git a/tencentcloud/resource_tc_cls_scheduled_sql_test.go b/tencentcloud/resource_tc_cls_scheduled_sql_test.go index 17edddc1be..3f504a22f9 100644 --- a/tencentcloud/resource_tc_cls_scheduled_sql_test.go +++ b/tencentcloud/resource_tc_cls_scheduled_sql_test.go @@ -3,9 +3,10 @@ package tencentcloud import ( "context" "fmt" + "testing" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "testing" ) // go test -i; go test -test.run TestAccTencentCloudClsScheduledSqlResource_basic -v diff --git a/website/docs/r/cfs_access_group.html.markdown b/website/docs/r/cfs_access_group.html.markdown index 9c3114cc8f..007f2b9f34 100644 --- a/website/docs/r/cfs_access_group.html.markdown +++ b/website/docs/r/cfs_access_group.html.markdown @@ -14,9 +14,9 @@ Provides a resource to create a CFS access group. ## Example Usage ```hcl -resource "tencentcloud_cfs_access_group" "foo" { - name = "test_access_group" - description = "test" +resource "tencentcloud_cfs_access_group" "example" { + name = "tx_example" + description = "desc." } ``` From 905fe7d07dbc30d1f249c8d196edc4c1b9d96897 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Fri, 11 Aug 2023 10:31:55 +0800 Subject: [PATCH 6/7] fix/cfs --- tencentcloud/resource_tc_cfs_access_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/resource_tc_cfs_access_group.go b/tencentcloud/resource_tc_cfs_access_group.go index 6a7fca0193..f92055f296 100644 --- a/tencentcloud/resource_tc_cfs_access_group.go +++ b/tencentcloud/resource_tc_cfs_access_group.go @@ -15,7 +15,7 @@ Import CFS access group can be imported using the id, e.g. ``` -$ terraform import tencentcloud_cfs_access_group.foo pgroup-7nx89k7l +$ terraform import tencentcloud_cfs_access_group.example pgroup-7nx89k7l ``` */ package tencentcloud From 598e49fbb3937eee72da05fb9822067b57b2e6e1 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Fri, 11 Aug 2023 10:49:32 +0800 Subject: [PATCH 7/7] fix/cfs --- website/docs/r/cfs_access_group.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cfs_access_group.html.markdown b/website/docs/r/cfs_access_group.html.markdown index 007f2b9f34..b498c0f131 100644 --- a/website/docs/r/cfs_access_group.html.markdown +++ b/website/docs/r/cfs_access_group.html.markdown @@ -40,6 +40,6 @@ In addition to all arguments above, the following attributes are exported: CFS access group can be imported using the id, e.g. ``` -$ terraform import tencentcloud_cfs_access_group.foo pgroup-7nx89k7l +$ terraform import tencentcloud_cfs_access_group.example pgroup-7nx89k7l ```