Skip to content

fix(postgresql): [124155593] tencentcloud_postgresql_instance Optimize and update network module code #3365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2025
Merged

fix(postgresql): [124155593] tencentcloud_postgresql_instance Optimize and update network module code #3365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
056592f
add
SevenEarth May 20, 2025
c11fb3d
add
SevenEarth May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3365.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_postgresql_instance: Optimize and update network module code
```
230 changes: 145 additions & 85 deletions tencentcloud/services/postgresql/resource_tc_postgresql_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,28 +834,41 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int

_ = d.Set("project_id", int(*instance.ProjectId))
_ = d.Set("availability_zone", instance.Zone)
_ = d.Set("vpc_id", instance.VpcId)
_ = d.Set("subnet_id", instance.SubnetId)
_ = d.Set("engine_version", instance.DBVersion)
_ = d.Set("db_kernel_version", instance.DBKernelVersion)
_ = d.Set("db_major_vesion", instance.DBMajorVersion)
_ = d.Set("db_major_version", instance.DBMajorVersion)
_ = d.Set("name", instance.DBInstanceName)
_ = d.Set("charset", instance.DBCharset)

if rootUser != "" {
_ = d.Set("root_user", &rootUser)
}
// check net num
if len(instance.DBInstanceNetInfo) == 3 {
_ = d.Set("vpc_id", instance.DBInstanceNetInfo[0].VpcId)
_ = d.Set("subnet_id", instance.DBInstanceNetInfo[0].SubnetId)
_ = d.Set("private_access_ip", instance.DBInstanceNetInfo[0].Ip)
_ = d.Set("private_access_port", instance.DBInstanceNetInfo[0].Port)

if *instance.PayType == POSTGRESQL_PAYTYPE_PREPAID || *instance.PayType == COMMON_PAYTYPE_PREPAID {
_ = d.Set("charge_type", COMMON_PAYTYPE_PREPAID)
} else {
_ = d.Set("charge_type", COMMON_PAYTYPE_POSTPAID)
}
// net status
public_access_switch := false
for _, v := range instance.DBInstanceNetInfo {
if *v.NetType == "public" {
// both 1 and opened used in SDK
if *v.Status == "opened" || *v.Status == "1" {
public_access_switch = true
}

// net status
public_access_switch := false
if len(instance.DBInstanceNetInfo) > 0 {
_ = d.Set("public_access_host", v.Address)
_ = d.Set("public_access_port", v.Port)
}
}

_ = d.Set("public_access_switch", public_access_switch)
} else if len(instance.DBInstanceNetInfo) == 2 {
_ = d.Set("vpc_id", instance.VpcId)
_ = d.Set("subnet_id", instance.SubnetId)

// net status
public_access_switch := false
for _, v := range instance.DBInstanceNetInfo {
if *v.NetType == "public" {
// both 1 and opened used in SDK
Expand All @@ -873,9 +886,21 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int
_ = d.Set("private_access_port", v.Port)
}
}

_ = d.Set("public_access_switch", public_access_switch)
} else {
return fmt.Errorf("DBInstanceNetInfo returned incorrect information.")
}

if rootUser != "" {
_ = d.Set("root_user", &rootUser)
}

_ = d.Set("public_access_switch", public_access_switch)
if *instance.PayType == POSTGRESQL_PAYTYPE_PREPAID || *instance.PayType == COMMON_PAYTYPE_PREPAID {
_ = d.Set("charge_type", COMMON_PAYTYPE_PREPAID)
} else {
_ = d.Set("charge_type", COMMON_PAYTYPE_POSTPAID)
}

// security groups
sg, err := postgresqlService.DescribeDBInstanceSecurityGroupsById(ctx, d.Id())
Expand Down Expand Up @@ -1227,95 +1252,130 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
// update vpc and subnet
if d.HasChange("vpc_id") || d.HasChange("subnet_id") {
var (
vpcOld string
vpcNew string
subnetOld string
subnetNew string
vipOld string
vipNew string
postgresqlService = PostgresqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
instance *postgresql.DBInstance
has bool
vpcOld string
vpcNew string
subnetOld string
subnetNew string
vipOld string
vipNew string
)

old, new := d.GetChange("vpc_id")
if old != nil {
vpcOld = old.(string)
}

if new != nil {
vpcNew = new.(string)
}

old, new = d.GetChange("subnet_id")
if old != nil {
subnetOld = old.(string)
}
// check net first
outErr = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
instance, has, inErr = postgresqlService.DescribePostgresqlInstanceById(ctx, d.Id())
if inErr != nil {
ee, ok := inErr.(*sdkErrors.TencentCloudSDKError)
if ok && (ee.GetCode() == "ResourceNotFound.InstanceNotFoundError" || ee.GetCode() == "InvalidParameter") {
return nil
}

if new != nil {
subnetNew = new.(string)
}
return tccommon.RetryError(inErr)
}

// Create new network first, then delete the old one
request := postgresql.NewCreateDBInstanceNetworkAccessRequest()
request.DBInstanceId = helper.String(instanceId)
request.VpcId = helper.String(vpcNew)
request.SubnetId = helper.String(subnetNew)
// ip assigned by system
request.IsAssignVip = helper.Bool(false)
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlClient().CreateDBInstanceNetworkAccess(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
if instance != nil && tccommon.IsContains(POSTGRESQL_RETRYABLE_STATUS, *instance.DBInstanceStatus) {
return resource.RetryableError(fmt.Errorf("instance %s is %s, retrying", *instance.DBInstanceId, *instance.DBInstanceStatus))
}

return nil
})

if err != nil {
log.Printf("[CRITAL]%s create postgresql Instance NetworkAccess failed, reason:%+v", logId, err)
return err
if outErr != nil {
return outErr
}

service := PostgresqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
// wait for new network enabled
conf := tccommon.BuildStateChangeConf([]string{}, []string{"opened"}, 3*tccommon.ReadRetryTimeout, time.Second, service.PostgresqlDBInstanceNetworkAccessStateRefreshFunc(instanceId, vpcNew, subnetNew, vipOld, "", []string{}))
if object, e := conf.WaitForState(); e != nil {
return e
} else {
// find the vip assiged by system
ret := object.(*postgresql.DBInstanceNetInfo)
vipNew = *ret.Ip
if !has {
d.SetId("")
return nil
}

// wait unit network changing operation of instance done
conf = tccommon.BuildStateChangeConf([]string{}, []string{"running"}, 3*tccommon.ReadRetryTimeout, time.Second, service.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}
// check net num
if instance.DBInstanceNetInfo != nil && len(instance.DBInstanceNetInfo) > 2 {
return fmt.Errorf("There are already %d network information for the current PostgreSQL instance %s. Please remove one before modifying the instance network information.", len(instance.DBInstanceNetInfo)-1, d.Id())
} else {
old, new := d.GetChange("vpc_id")
if old != nil {
vpcOld = old.(string)
}

// delete the old one
if v, ok := d.GetOk("private_access_ip"); ok {
vipOld = v.(string)
}
if new != nil {
vpcNew = new.(string)
}

if err := service.DeletePostgresqlDBInstanceNetworkAccessById(ctx, instanceId, vpcOld, subnetOld, vipOld); err != nil {
return err
}
old, new = d.GetChange("subnet_id")
if old != nil {
subnetOld = old.(string)
}

// wait for old network removed
conf = tccommon.BuildStateChangeConf([]string{}, []string{"closed"}, 3*tccommon.ReadRetryTimeout, time.Second, service.PostgresqlDBInstanceNetworkAccessStateRefreshFunc(instanceId, vpcOld, subnetOld, vipNew, vipOld, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}
if new != nil {
subnetNew = new.(string)
}

// wait unit network changing operation of instance done
conf = tccommon.BuildStateChangeConf([]string{}, []string{"running"}, 3*tccommon.ReadRetryTimeout, time.Second, service.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}
// Create new network first, then delete the old one
request := postgresql.NewCreateDBInstanceNetworkAccessRequest()
request.DBInstanceId = helper.String(instanceId)
request.VpcId = helper.String(vpcNew)
request.SubnetId = helper.String(subnetNew)
// ip assigned by system
request.IsAssignVip = helper.Bool(false)
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlClient().CreateDBInstanceNetworkAccess(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}

// refresh the private ip with new one
_ = d.Set("private_access_ip", vipNew)
return nil
})

if err != nil {
log.Printf("[CRITAL]%s create postgresql Instance NetworkAccess failed, reason:%+v", logId, err)
return err
}

// wait for new network enabled
conf := tccommon.BuildStateChangeConf([]string{}, []string{"opened"}, 3*tccommon.ReadRetryTimeout, time.Second, postgresqlService.PostgresqlDBInstanceNetworkAccessStateRefreshFunc(instanceId, vpcNew, subnetNew, vipOld, "", []string{}))
if object, e := conf.WaitForState(); e != nil {
return e
} else {
// find the vip assiged by system
ret := object.(*postgresql.DBInstanceNetInfo)
vipNew = *ret.Ip
}

// wait unit network changing operation of instance done
conf = tccommon.BuildStateChangeConf([]string{}, []string{"running"}, 3*tccommon.ReadRetryTimeout, time.Second, postgresqlService.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}

// delete the old one
if v, ok := d.GetOk("private_access_ip"); ok {
vipOld = v.(string)
}

if err := postgresqlService.DeletePostgresqlDBInstanceNetworkAccessById(ctx, instanceId, vpcOld, subnetOld, vipOld); err != nil {
return err
}

// wait for old network removed
conf = tccommon.BuildStateChangeConf([]string{}, []string{"closed"}, 3*tccommon.ReadRetryTimeout, time.Second, postgresqlService.PostgresqlDBInstanceNetworkAccessStateRefreshFunc(instanceId, vpcOld, subnetOld, vipNew, vipOld, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}

// wait unit network changing operation of instance done
conf = tccommon.BuildStateChangeConf([]string{}, []string{"running"}, 3*tccommon.ReadRetryTimeout, time.Second, postgresqlService.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}

// refresh the private ip with new one
_ = d.Set("private_access_ip", vipNew)
}
}

// update name
Expand Down
Loading