to fit the SDK changes

Author: gailwang

tencentcloud/data_source_tc_postgresql_instances.go

@@ -203,6 +203,7 @@ func dataSourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta i
 		listItem["public_access_switch"] = false
 		listItem["charset"] = v.DBCharset
 		listItem["public_access_host"] = ""
+
 		for _, netInfo := range v.DBInstanceNetInfo {
 			if *netInfo.NetType == "public" {
 				if *netInfo.Status == "opened" || *netInfo.Status == "1" {
@@ -211,12 +212,13 @@ func dataSourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta i
 				listItem["public_access_host"] = netInfo.Address
 				listItem["public_access_port"] = netInfo.Port
 			}
-			if *netInfo.NetType == "private" {
+			if (*netInfo.NetType == "private" || *netInfo.NetType == "inner") && *netInfo.Ip != "" {
 				listItem["private_access_ip"] = netInfo.Ip
 				listItem["private_access_port"] = netInfo.Port
 			}
 		}
-		if *v.PayType == POSTGRESQL_PAYTYPE_PREPAID {
+
+		if *v.PayType == POSTGRESQL_PAYTYPE_PREPAID || *v.PayType == COMMON_PAYTYPE_PREPAID {
 			listItem["charge_type"] = COMMON_PAYTYPE_PREPAID
 		} else {
 			listItem["charge_type"] = COMMON_PAYTYPE_POSTPAID

tencentcloud/data_source_tc_postgresql_instances_test.go

@@ -45,9 +45,7 @@ default = "ap-guangzhou-2"
 resource "tencentcloud_postgresql_instance" "test" {
 name = "tf_postsql_instance"
 availability_zone = var.availability_zone
-charge_type = "postpaid"
-vpc_id                   = "` + defaultVpcId + `"
-subnet_id = "subnet-pyio7yog"
+charge_type = "POSTPAID_BY_HOUR"
 engine_version		= "9.3.5"
 root_password                 = "1qaA2k1wgvfa3ZZZ"
 charset = "UTF8"

tencentcloud/resource_tc_postgresql_instance.go

@@ -57,7 +57,7 @@ func resourceTencentCloudPostgresqlInstance() *schema.Resource {
 			"charge_type": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      POSTGRESQL_PAYTYPE_POSTPAID,
+				Default:      COMMON_PAYTYPE_POSTPAID,
 				ForceNew:     true,
 				ValidateFunc: validateAllowedStringValue(POSTGRESQL_PAYTYPE),
 				Description:  "Pay type of the postgresql instance. For now, only `POSTPAID_BY_HOUR` is valid.",
@@ -186,11 +186,14 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 	var period = 1
 	//the sdk asks to set value with 1 when paytype is postpaid
 
-	if payType == COMMON_PAYTYPE_PREPAID {
-		payType = POSTGRESQL_PAYTYPE_PREPAID
-	} else {
-		payType = POSTGRESQL_PAYTYPE_POSTPAID
-	}
+	/*
+		if payType == COMMON_PAYTYPE_PREPAID {
+			payType = POSTGRESQL_PAYTYPE_PREPAID
+		} else {
+			payType = POSTGRESQL_PAYTYPE_POSTPAID
+		}
+
+	*/
 
 	var instanceId string
 	var outErr, inErr error
@@ -443,12 +446,14 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int
 	_ = d.Set("engine_version", instance.DBVersion)
 	_ = d.Set("name", instance.DBInstanceName)
 	_ = d.Set("charset", instance.DBCharset)
+	_ = d.Set("charge_type", instance.PayType)
 
-	if *instance.PayType == POSTGRESQL_PAYTYPE_PREPAID {
+	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
 	if len(instance.DBInstanceNetInfo) > 0 {
@@ -462,7 +467,8 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int
 				_ = d.Set("public_access_host", v.Address)
 				_ = d.Set("public_access_port", v.Port)
 			}
-			if *v.NetType == "private" {
+			//private or inner will not appear at same time, private for instance with vpc
+			if (*v.NetType == "private" || *v.NetType == "inner") && *v.Ip != "" {
 				_ = d.Set("private_access_ip", v.Ip)
 				_ = d.Set("private_access_port", v.Port)
 			}

tencentcloud/service_tencentcloud_postgresql.go

@@ -81,11 +81,6 @@ func (me *PostgresqlService) InitPostgresqlInstance(ctx context.Context, instanc
 	if response == nil || response.Response == nil {
 		errRet = fmt.Errorf("TencentCloud SDK return nil response, %s", request.GetAction())
 	}
-	if len(response.Response.DBInstanceIdSet) == 0 {
-		errRet = errors.New("TencentCloud SDK returns empty postgresql instance ID")
-	} else if len(response.Response.DBInstanceIdSet) > 1 {
-		errRet = errors.New("TencentCloud SDK returns more than one postgresql instance ID")
-	}
 
 	return
 }