add

Author: SevenEarth

tencentcloud/services/postgresql/resource_tc_postgresql_readonly_instance.go

@@ -397,8 +397,17 @@ func resourceTencentCloudPostgresqlReadOnlyInstanceRead(d *schema.ResourceData,
 	_ = d.Set("subnet_id", instance.SubnetId)
 	_ = d.Set("name", instance.DBInstanceName)
 	_ = d.Set("need_support_ipv6", instance.SupportIpv6)
-	// set readonly group when DescribeReadOnlyGroups ready for filter by the readonly group id
-	// _ = d.Set("read_only_group_id", readonlyGroup.Id)
+
+	// read only group
+	masterDBInstanceId := instance.MasterDBInstanceId
+	readOnlyGroupId, err := postgresqlService.DescribeReadOnlyGroupsById(ctx, *masterDBInstanceId, d.Id())
+	if err != nil {
+		return err
+	}
+
+	if readOnlyGroupId != nil {
+		_ = d.Set("read_only_group_id", readOnlyGroupId)
+	}
 
 	// security groups
 	sg, err := postgresqlService.DescribeDBInstanceSecurityGroupsById(ctx, d.Id())

tencentcloud/services/postgresql/resource_tc_postgresql_readonly_instance_test.go

@@ -3,6 +3,7 @@ package postgresql_test
 import (
 	"testing"
 
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
 	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -15,17 +16,12 @@ func TestAccTencentCloudPostgresqlReadonlyInstanceResource_basic(t *testing.T) {
 	// t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
-			tcacctest.AccStepSetRegion(t, "ap-guangzhou")
-			tcacctest.AccPreCheck(t)
+			acctest.AccPreCheck(t)
 		},
 		Providers: tcacctest.AccProviders,
 		Steps: []resource.TestStep{
 			{
-				PreConfig: func() {
-					tcacctest.AccStepSetRegion(t, "ap-guangzhou")
-					tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_PREPAY)
-				},
-				Config: testAccPostgresqlReadonlyInstanceInstance_basic_without_rogroup,
+				Config: testAccPostgresqlReadonlyInstanceInstance,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "id"),
 					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "master_db_instance_id"),
@@ -46,11 +42,7 @@ func TestAccTencentCloudPostgresqlReadonlyInstanceResource_basic(t *testing.T) {
 				),
 			},
 			{
-				PreConfig: func() {
-					tcacctest.AccStepSetRegion(t, "ap-guangzhou")
-					tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_PREPAY)
-				},
-				Config: testAccPostgresqlReadonlyInstanceInstance_basic_update_rogroup,
+				Config: testAccPostgresqlReadonlyInstanceInstanceUpdate,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "id"),
 					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyInstanceResourceKey, "master_db_instance_id"),
@@ -74,7 +66,7 @@ func TestAccTencentCloudPostgresqlReadonlyInstanceResource_basic(t *testing.T) {
 	})
 }
 
-const testAccPostgresqlReadonlyInstanceInstance_basic_without_rogroup string = `
+const testAccPostgresqlReadonlyInstanceInstance string = `
 variable "availability_zone" {
   default = "ap-guangzhou-3"
 }
@@ -153,7 +145,7 @@ resource "tencentcloud_postgresql_readonly_instance" "example" {
 }
 `
 
-const testAccPostgresqlReadonlyInstanceInstance_basic_update_rogroup string = `
+const testAccPostgresqlReadonlyInstanceInstanceUpdate string = `
 variable "availability_zone" {
   default = "ap-guangzhou-3"
 }
@@ -194,7 +186,7 @@ resource "tencentcloud_postgresql_instance" "example" {
   }
 }
 
-resource "tencentcloud_postgresql_readonly_group" "example_new" {
+resource "tencentcloud_postgresql_readonly_group" "example" {
   master_db_instance_id       = tencentcloud_postgresql_instance.example.id
   name                        = "tf_ro_group"
   project_id                  = 0
@@ -207,6 +199,19 @@ resource "tencentcloud_postgresql_readonly_group" "example_new" {
   min_delay_eliminate_reserve = 1
 }
 
+resource "tencentcloud_postgresql_readonly_group" "example_new" {
+  master_db_instance_id       = tencentcloud_postgresql_instance.example.id
+  name                        = "tf_ro_group_new"
+  project_id                  = 0
+  vpc_id                      = tencentcloud_vpc.vpc.id
+  subnet_id                   = tencentcloud_subnet.subnet.id
+  replay_lag_eliminate        = 1
+  replay_latency_eliminate    = 1
+  max_replay_lag              = 100
+  max_replay_latency          = 512
+  min_delay_eliminate_reserve = 1
+}
+
 resource "tencentcloud_postgresql_readonly_instance" "example" {
   read_only_group_id    = tencentcloud_postgresql_readonly_group.example_new.id
   master_db_instance_id = tencentcloud_postgresql_instance.example.id

tencentcloud/services/postgresql/service_tencentcloud_postgresql.go

@@ -492,6 +492,52 @@ func (me *PostgresqlService) DescribeDBInstanceSecurityGroupsById(ctx context.Co
 	return
 }
 
+func (me *PostgresqlService) DescribeReadOnlyGroupsById(ctx context.Context, masterDBInstanceId string, instanceId string) (readOnlyGroupId *string, errRet error) {
+	logId := tccommon.GetLogId(ctx)
+	request := postgresql.NewDescribeReadOnlyGroupsRequest()
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail,reason[%s]", logId, request.GetAction(), errRet.Error())
+		}
+	}()
+
+	request.Filters = []*postgresql.Filter{
+		{
+			Name: helper.String("db-master-instance-id"),
+			Values: []*string{
+				helper.String(masterDBInstanceId),
+			},
+		},
+	}
+
+	response, err := me.client.UsePostgresqlClient().DescribeReadOnlyGroups(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+
+	if response == nil || response.Response == nil {
+		errRet = fmt.Errorf("TencentCloud SDK return nil response, %s", request.GetAction())
+		return
+	}
+
+	roGroupList := response.Response.ReadOnlyGroupList
+	if len(roGroupList) > 0 {
+		for _, roGroup := range roGroupList {
+			roDBInstanceList := roGroup.ReadOnlyDBInstanceList
+			for _, roDBInstance := range roDBInstanceList {
+				roDBInstanceId := *roDBInstance.DBInstanceId
+				if roDBInstanceId == instanceId {
+					readOnlyGroupId = roGroup.ReadOnlyGroupId
+					return
+				}
+			}
+		}
+	}
+
+	return
+}
+
 func (me *PostgresqlService) ModifyDBInstanceSecurityGroupsById(ctx context.Context, instanceId string, securityGroupIds []*string) (errRet error) {
 	logId := tccommon.GetLogId(ctx)
 	request := postgresql.NewModifyDBInstanceSecurityGroupsRequest()