Fix/cfs (#2044)

* ftx/cynosdb

* fix/vpc

* fix/cfs

* fix/cfs

* fix/cfs

* fix/cfs

* fix/cfs

Author: SevenEarth

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."
 }
 ```
 
@@ -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
@@ -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)

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."
 }
 `

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 != "" {

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

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."
 }
 ```
 
@@ -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
 ```