Skip to content

Commit a43ede9

Browse files
authored
feat/postgresql (#2316)
* feat/postgresql * feat/postgresql
1 parent eabfe6b commit a43ede9

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

.changelog/2316.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_postgresql_instance: Optimize isolation operations
3+
```

tencentcloud/extension_postgresql.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ const (
3434
var POSTGRESQL_DB_CHARSET = []string{POSTGRESQL_DB_CHARSET_UTF8, POSTGRESQL_DB_CHARSET_LATIN1}
3535

3636
const (
37-
POSTGRESQL_STAUTS_RUNNING = "running"
37+
POSTGRESQL_STAUTS_RUNNING = "running"
38+
POSTGRESQL_STAUTS_ISOLATED = "isolated"
3839
)
3940

4041
var POSTGRESQL_RETRYABLE_STATUS = []string{

tencentcloud/resource_tc_postgresql_instance.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,6 +1574,20 @@ func resourceTencentCLoudPostgresqlInstanceDelete(d *schema.ResourceData, meta i
15741574
return outErr
15751575
}
15761576

1577+
// Wait for status to isolated
1578+
_ = resource.Retry(readRetryTimeout*5, func() *resource.RetryError {
1579+
instance, _, err := postgresqlService.DescribePostgresqlInstanceById(ctx, instanceId)
1580+
if err != nil {
1581+
return retryError(err)
1582+
}
1583+
1584+
if *instance.DBInstanceStatus == POSTGRESQL_STAUTS_ISOLATED {
1585+
return nil
1586+
}
1587+
1588+
return resource.RetryableError(fmt.Errorf("waiting for instance isolating"))
1589+
})
1590+
15771591
outErr = postgresqlService.DeletePostgresqlInstance(ctx, instanceId)
15781592
if outErr != nil {
15791593
outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {

0 commit comments

Comments
 (0)