feat(postgresql): [117103987]support vip for pg ro group. (#2595)

* feat(postgresql): [117103987]support vip for pg ro group.

* 1.e2e passed. 2.add docs

* delete the useless  pg html.md

Author: lyu571

.changelog/2595.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_postgresql_readonly_group: Support the computed param `ip` of the `net_info_list`
+```

tencentcloud/services/postgresql/resource_tc_postgresql_readonly_group.go

@@ -52,6 +52,25 @@ func ResourceTencentCloudPostgresqlReadonlyGroup() *schema.Resource {
 				Required:    true,
 				Description: "VPC subnet ID.",
 			},
+			"net_info_list": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "List of db instance net info.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"ip": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Ip address of the net info.",
+						},
+						"port": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Port of the net info.",
+						},
+					},
+				},
+			},
 			"replay_lag_eliminate": {
 				Type:     schema.TypeInt,
 				Required: true,
@@ -191,8 +210,7 @@ func resourceTencentCloudPostgresqlReadOnlyGroupCreate(d *schema.ResourceData, m
 		return err
 	}
 
-	//return resourceTencentCloudPostgresqlReadOnlyGroupRead(d, meta)
-	return nil
+	return resourceTencentCloudPostgresqlReadOnlyGroupRead(d, meta)
 }
 
 func resourceTencentCloudPostgresqlReadOnlyGroupRead(d *schema.ResourceData, meta interface{}) error {
@@ -202,17 +220,34 @@ func resourceTencentCloudPostgresqlReadOnlyGroupRead(d *schema.ResourceData, met
 	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
 
 	// for now, the id should be the master db instance id, cause the describe api only support this kind of filter.
-	var id string
+	var masterInsId string
 	if v, ok := d.GetOk("master_db_instance_id"); ok {
-		id = v.(string)
+		masterInsId = v.(string)
 	}
+	roGroupId := d.Id()
 
 	postgresqlService := PostgresqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
-	_, err := postgresqlService.DescribePostgresqlReadOnlyGroupById(ctx, id)
+	netInfos, err := postgresqlService.DescribePostgresqlReadonlyGroupNetInfosById(ctx, masterInsId, roGroupId)
 	if err != nil {
 		return err
 	}
 
+	if netInfos != nil {
+		netInfoList := []interface{}{}
+		for _, netInfo := range netInfos {
+			netInfoMap := map[string]interface{}{}
+
+			if netInfo.Ip != nil {
+				netInfoMap["ip"] = *netInfo.Ip
+			}
+			if netInfo.Port != nil {
+				netInfoMap["port"] = helper.UInt64Int64(*netInfo.Port)
+			}
+			netInfoList = append(netInfoList, netInfoMap)
+		}
+		_ = d.Set("net_info_list", netInfoList)
+	}
+
 	return nil
 }
 
@@ -362,7 +397,7 @@ func resourceTencentCloudPostgresqlReadOnlyGroupUpdate(d *schema.ResourceData, m
 	if err != nil {
 		return err
 	}
-	return nil
+	return resourceTencentCloudPostgresqlReadOnlyGroupRead(d, meta)
 }
 
 func resourceTencentCLoudPostgresqlReadOnlyGroupDelete(d *schema.ResourceData, meta interface{}) error {

tencentcloud/services/postgresql/resource_tc_postgresql_readonly_group_test.go

@@ -37,6 +37,10 @@ func TestAccTencentCloudPostgresqlReadonlyGroupResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(testPostgresqlReadonlyGroupResourceKey, "max_replay_lag", "100"),
 					resource.TestCheckResourceAttr(testPostgresqlReadonlyGroupResourceKey, "max_replay_latency", "512"),
 					resource.TestCheckResourceAttr(testPostgresqlReadonlyGroupResourceKey, "min_delay_eliminate_reserve", "1"),
+					resource.TestCheckResourceAttr(testPostgresqlReadonlyGroupResourceKey, "min_delay_eliminate_reserve", "1"),
+					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "net_info_list.#"),
+					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "net_info_list.0.ip"),
+					resource.TestCheckResourceAttr(testPostgresqlReadonlyGroupResourceKey, "net_info_list.0.port", "5432"),
 				),
 			},
 			{
@@ -51,15 +55,37 @@ func TestAccTencentCloudPostgresqlReadonlyGroupResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(testPostgresqlReadonlyGroupResourceKey, "name", "tf_ro_group_test_updated"),
 					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "vpc_id"),
 					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "subnet_id"),
+					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "net_info_list.#"),
+					resource.TestCheckResourceAttrSet(testPostgresqlReadonlyGroupResourceKey, "net_info_list.0.ip"),
+					resource.TestCheckResourceAttr(testPostgresqlReadonlyGroupResourceKey, "net_info_list.0.port", "5432"),
 				),
 			},
 		},
 	})
 }
 
-const testAccPostgresqlReadonlyGroupInstance string = tcacctest.CommonPresetPGSQL + tcacctest.DefaultVpcSubnets + `
+const testAccPostgresqlReadonlyGroupInstance string = tcacctest.DefaultVpcSubnets + `
+resource "tencentcloud_postgresql_instance" "test" {
+	name              = "example"
+	availability_zone = var.default_az
+	charge_type       = "POSTPAID_BY_HOUR"
+	vpc_id            = local.vpc_id
+	subnet_id         = local.subnet_id
+	engine_version    = "10.4"
+	root_user         = "root123"
+	root_password     = "Root123$"
+	charset           = "UTF8"
+	project_id        = 0
+	memory            = 2
+	storage           = 10
+  
+	tags = {
+	  test = "tf"
+	}
+  }
+
 resource "tencentcloud_postgresql_readonly_group" "group" {
-	master_db_instance_id = local.pgsql_id
+	master_db_instance_id = tencentcloud_postgresql_instance.test.id
 	name = "tf_ro_group_test"
 	project_id = 0
 	vpc_id  = local.vpc_id
@@ -72,8 +98,27 @@ resource "tencentcloud_postgresql_readonly_group" "group" {
   }
 `
 
-const testAccPostgresqlReadonlyGroupInstance_update string = tcacctest.CommonPresetPGSQL + tcacctest.DefaultVpcSubnets + `
-resource "tencentcloud_vpc" "vpc" {
+const testAccPostgresqlReadonlyGroupInstance_update string = tcacctest.DefaultVpcSubnets + `
+  resource "tencentcloud_postgresql_instance" "test" {
+	name              = "example"
+	availability_zone = var.default_az
+	charge_type       = "POSTPAID_BY_HOUR"
+	vpc_id            = local.vpc_id
+	subnet_id         = local.subnet_id
+	engine_version    = "10.4"
+	root_user         = "root123"
+	root_password     = "Root123$"
+	charset           = "UTF8"
+	project_id        = 0
+	memory            = 2
+	storage           = 10
+  
+	tags = {
+	  test = "tf"
+	}
+  }
+
+  resource "tencentcloud_vpc" "vpc" {
 	cidr_block = "172.18.111.0/24"
 	name       = "test-pg-rogroup-network-vpc"
   }
@@ -91,7 +136,7 @@ resource "tencentcloud_vpc" "vpc" {
   }
 
 resource "tencentcloud_postgresql_readonly_group" "group" {
-	master_db_instance_id = local.pgsql_id
+	master_db_instance_id = tencentcloud_postgresql_instance.test.id
 	name = "tf_ro_group_test_updated"
 	project_id = 0
 	vpc_id  	  		= local.new_vpc_id

tencentcloud/services/postgresql/service_tencentcloud_postgresql.go

@@ -1309,6 +1309,10 @@ func (me *PostgresqlService) DescribePostgresqlReadonlyGroupNetInfosById(ctx con
 				Name:   helper.String("db-master-instance-id"),
 				Values: []*string{helper.String(dbInstanceId)},
 			},
+			{
+				Name:   helper.String("read-only-group-id"),
+				Values: []*string{helper.String(roGroupId)},
+			},
 		},
 	}
 

website/docs/r/postgresql_instance_network_access_attachment.html.markdown

@@ -51,5 +51,8 @@ In addition to all arguments above, the following attributes are exported:
 
 * `id` - ID of the resource.
 * `create_time` - Create time of the postgresql instance.
+* `net_info_list` - List of db instance net info.
+  * `ip` - Ip address of the net info.
+  * `port` - Port of the net info.