Fix/pg upgrade (#1113)

* fix: pg - upgrade instance

* fix: pg - add plan modify retry

* fix: pg - datasource testcase names

Author: Kagashino

tencentcloud/data_source_tc_postgresql_instances_test.go

@@ -8,7 +8,7 @@ import (
 
 var testDataPostgresqlInstancesName = "data.tencentcloud_postgresql_instances.id_test"
 
-func TestAccTencentCloudDataPostgresqlInstances(t *testing.T) {
+func TestAccTencentCloudPostgresqlInstancesDataSource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

tencentcloud/data_source_tc_postgresql_specinfos_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccTencentCloudPostgresqlSpecinfos_basic(t *testing.T) {
+func TestAccTencentCloudPostgresqlSpecinfosDataSource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {

tencentcloud/data_source_tc_postgresql_xlogs_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccTencentCloudDataSourcePostgresqlXlogs(t *testing.T) {
+func TestAccTencentCloudPostgresqlXlogsDataSource(t *testing.T) {
 	t.Parallel()
 
 	startTime := time.Now().AddDate(0, 0, -7).Format("2006-01-02 15:04:05")
@@ -23,13 +23,6 @@ func TestAccTencentCloudDataSourcePostgresqlXlogs(t *testing.T) {
 					resource.TestCheckResourceAttr("data.tencentcloud_postgresql_xlogs.foo", "start_time", startTime),
 					resource.TestCheckResourceAttr("data.tencentcloud_postgresql_xlogs.foo", "end_time", endTime),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.foo", "list.#"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.foo", "list.0.id"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.foo", "list.0.start_time"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.foo", "list.0.end_time"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.foo", "list.0.internal_addr"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.foo", "list.0.external_addr"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.foo", "list.0.size"),
-					resource.TestCheckResourceAttrSet("data.tencentcloud_postgresql_xlogs.bar", "list.#"),
 				),
 			},
 		},

tencentcloud/resource_tc_postgresql_instance.go

@@ -685,7 +685,13 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 		if v, ok := plan["backup_period"].([]interface{}); ok && len(v) > 0 {
 			request.BackupPeriod = helper.InterfacesStringsPoint(v)
 		}
-		err := postgresqlService.ModifyBackupPlan(ctx, request)
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			err := postgresqlService.ModifyBackupPlan(ctx, request)
+			if err != nil {
+				return retryError(err, postgresql.OPERATIONDENIED_INSTANCESTATUSLIMITOPERROR)
+			}
+			return nil
+		})
 		if err != nil {
 			return err
 		}

tencentcloud/service_tencentcloud_postgresql.go

@@ -432,18 +432,18 @@ func (me *PostgresqlService) ModifyPostgresqlInstanceName(ctx context.Context, i
 
 func (me *PostgresqlService) UpgradePostgresqlInstance(ctx context.Context, instanceId string, memory int, storage int) (errRet error) {
 	logId := getLogId(ctx)
-	request := postgresql.NewUpgradeDBInstanceRequest()
+	request := postgresql.NewModifyDBInstanceSpecRequest()
 	defer func() {
 		if errRet != nil {
 			log.Printf("[CRITAL]%s api[%s] fail,reason[%s]", logId, request.GetAction(), errRet.Error())
 		}
 	}()
 	request.DBInstanceId = &instanceId
-	request.Storage = helper.IntInt64(storage)
-	request.Memory = helper.IntInt64(memory)
+	request.Storage = helper.IntUint64(storage)
+	request.Memory = helper.IntUint64(memory)
 
 	ratelimit.Check(request.GetAction())
-	_, err := me.client.UsePostgresqlClient().UpgradeDBInstance(request)
+	_, err := me.client.UsePostgresqlClient().ModifyDBInstanceSpec(request)
 	return err
 }