Skip to content

fix(postgresql): [122175325] tencentcloud_postgresql_instance support update charge_type, period, auto_renew_flag #3223

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.

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
Mar 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/3223.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_postgresql_instance: support update `charge_type`, `period`, `auto_renew_flag`
```
115 changes: 76 additions & 39 deletions tencentcloud/services/postgresql/resource_tc_postgresql_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
cpu = v.(int)
}

if v, ok := d.GetOk("period"); ok {
if v, ok := d.GetOkExists("period"); ok {
log.Printf("period set")
period = v.(int)
} else {
Expand All @@ -404,7 +404,7 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
dbKernelVersion = v.(string)
}

if v, ok := d.GetOk("need_support_tde"); ok {
if v, ok := d.GetOkExists("need_support_tde"); ok {
needSupportTde = v.(int)
}

Expand All @@ -416,12 +416,12 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
kmsRegion = v.(string)
}

if v, ok := d.Get("auto_renew_flag").(int); ok {
autoRenewFlag = v
if v, ok := d.GetOkExists("auto_renew_flag"); ok {
autoRenewFlag = v.(int)
}

if v, ok := d.Get("auto_voucher").(int); ok {
autoVoucher = v
if v, ok := d.GetOkExists("auto_voucher"); ok {
autoVoucher = v.(int)
}

if v, ok := d.GetOk("voucher_ids"); ok {
Expand Down Expand Up @@ -1004,10 +1004,7 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
d.Partial(true)

if err := helper.ImmutableArgsChek(d,
// "charge_type",
// "period",
// "auto_renew_flag",
// "auto_voucher",
"auto_voucher",
"voucher_ids",
"root_user",
); err != nil {
Expand All @@ -1023,18 +1020,11 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
waitSwitch = v.(int)
}

if d.HasChange("period") && !d.HasChange("charge_type") {
return fmt.Errorf("The `period` field can be changed only when updating the charge type from `POSTPAID_BY_HOUR` to `PREPAID`.")
}

if d.HasChange("charge_type") {
var (
request = postgresql.NewModifyDBInstanceChargeTypeRequest()
chargeTypeOld string
chargeTypeNew string
period = 1
autoRenew = 0
autoVoucher = 0
request = postgresql.NewModifyDBInstanceChargeTypeRequest()
)

old, new := d.GetChange("charge_type")
Expand All @@ -1050,34 +1040,81 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
return fmt.Errorf("It only support to update the charge type from `POSTPAID_BY_HOUR` to `PREPAID`.")
}

if v, ok := d.GetOk("period"); ok {
log.Printf("period set")
period = v.(int)
} else {
log.Printf("period not set")
request.DBInstanceId = &instanceId
request.InstanceChargeType = &chargeTypeNew
request.Period = helper.IntInt64(1)
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlClient().ModifyDBInstanceChargeType(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())
}

return nil
})

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

if v, ok := d.GetOk("auto_renew_flag"); ok {
log.Printf("auto_renew_flag set")
autoRenew = v.(int)
} else {
log.Printf("auto_renew_flag not set")
// wait unit charge type changing operation of instance done
service := PostgresqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
conf := tccommon.BuildStateChangeConf([]string{}, []string{"running"}, 2*tccommon.ReadRetryTimeout, time.Second, service.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}
}

if v, ok := d.GetOk("auto_voucher"); ok {
log.Printf("auto_voucher set")
autoVoucher = v.(int)
} else {
log.Printf("auto_voucher not set")
if d.HasChange("auto_renew_flag") {
request := postgresql.NewSetAutoRenewFlagRequest()
request.DBInstanceIdSet = helper.Strings([]string{instanceId})
if v, ok := d.GetOkExists("auto_renew_flag"); ok {
request.AutoRenewFlag = helper.IntInt64(v.(int))
}

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlClient().SetAutoRenewFlag(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())
}

return nil
})

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

// wait unit charge type changing operation of instance done
service := PostgresqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
conf := tccommon.BuildStateChangeConf([]string{}, []string{"running"}, 2*tccommon.ReadRetryTimeout, time.Second, service.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
if _, e := conf.WaitForState(); e != nil {
return e
}
}

if d.HasChange("period") {
request := postgresql.NewRenewInstanceRequest()
request.DBInstanceId = &instanceId
request.InstanceChargeType = &chargeTypeNew
request.Period = helper.IntInt64(period)
request.AutoRenewFlag = helper.IntInt64(autoRenew)
request.AutoVoucher = helper.IntInt64(autoVoucher)
if v, ok := d.GetOkExists("period"); ok {
request.Period = helper.IntInt64(v.(int))
}

if v, ok := d.GetOkExists("auto_voucher"); ok {
request.AutoVoucher = helper.IntInt64(v.(int))
}

if v, ok := d.GetOk("voucher_ids"); ok {
request.VoucherIds = helper.InterfacesStringsPoint(v.([]interface{}))
}

err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlClient().ModifyDBInstanceChargeType(request)
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlClient().RenewInstance(request)
if e != nil {
return tccommon.RetryError(e)
} else {
Expand All @@ -1088,7 +1125,7 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
})

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

Expand Down
Loading