pgsql get uid attributess (#795)

Author: hellertang

tencentcloud/data_source_tc_image_test.go

@@ -65,7 +65,7 @@ data "tencentcloud_image" "public_image" {
 
 const testAccTencentCloudDataSourceImageBaseWithOsName = `
 data "tencentcloud_image" "public_image" {
-  os_name = "CentOS 7.5"
+  os_name = "TencentOS Server 3.2"
 
   filter {
     name   = "image-type"
@@ -76,7 +76,7 @@ data "tencentcloud_image" "public_image" {
 
 const testAccTencentCloudDataSourceImageBaseWithImageNameRegex = `
 data "tencentcloud_image" "public_image" {
-  image_name_regex = "^CentOS\\s+7\\.5\\s+64\\w*"
+  image_name_regex = "^Windows\\s.*$"
 
   filter {
     name   = "image-type"

tencentcloud/data_source_tc_mongodb_instances_test.go

@@ -29,14 +29,14 @@ func TestAccTencentCloudMongodbInstancesDataSource(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.vip"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.vport"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.create_time"),
-					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.engine_version", "MONGO_36_WT"),
+					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.engine_version", "MONGO_40_WT"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.cpu"),
 					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.memory", "4"),
 					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.volume", "100"),
 					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.machine_type", MONGODB_MACHINE_TYPE_HIO10G),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.shard_quantity"),
 					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.tags.test", "test"),
-					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.charge_type", "POSTPAID"),
+					resource.TestCheckResourceAttr("data.tencentcloud_mongodb_instances.mongodb_instances", "instance_list.0.charge_type", "POSTPAID_BY_HOUR"),
 				),
 			},
 		},
@@ -48,7 +48,7 @@ resource "tencentcloud_mongodb_instance" "mongodb_instance" {
   instance_name  = "tf-mongodb-test"
   memory         = 4
   volume         = 100
-  engine_version = "MONGO_36_WT"
+  engine_version = "MONGO_40_WT"
   machine_type   = "TGIO"
   available_zone = "ap-guangzhou-3"
   project_id     = 0

tencentcloud/data_source_tc_nat_gateway_snats_test.go

@@ -41,6 +41,7 @@ data "tencentcloud_images" "my_image" {
 data "tencentcloud_instance_types" "my_instance_types" {
   cpu_core_count = 1
   memory_size    = 1
+  availability_zone = data.tencentcloud_availability_zones.my_zones.zones.0.name 
 }
 
 # Create EIP
@@ -80,7 +81,7 @@ resource "tencentcloud_route_table_entry" "my_route_entry" {
 resource "tencentcloud_subnet" "my_subnet" {
   vpc_id            = data.tencentcloud_vpc.my_vpc.id
   name              = "terraform test"
-  cidr_block        = "172.29.23.0/24"
+  cidr_block        = "172.16.16.0/20"
   availability_zone = data.tencentcloud_availability_zones.my_zones.zones.0.name
   route_table_id    = tencentcloud_route_table.my_route_table.id
 }
@@ -110,7 +111,7 @@ resource "tencentcloud_instance" "my_instance" {
   project_id                 = 0
   vpc_id                     = data.tencentcloud_vpc.my_vpc.id
   subnet_id                  = tencentcloud_subnet.my_subnet.id
-  internet_max_bandwidth_out = 20
+  //internet_max_bandwidth_out = 20
 }
 
 # NetWorkInterface Nat gateway snat

tencentcloud/resource_tc_postgresql_instance.go

@@ -57,6 +57,8 @@ package tencentcloud
 import (
 	"context"
 	"fmt"
+	postgresql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
+	"log"
 	"strconv"
 	"strings"
 	"time"
@@ -708,7 +710,28 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int
 	_ = d.Set("status", instance.DBInstanceStatus)
 	_ = d.Set("memory", instance.DBInstanceMemory)
 	_ = d.Set("storage", instance.DBInstanceStorage)
-	_ = d.Set("uid", instance.Uid)
+
+	// Uid, must use
+	var filters = make([]*postgresql.Filter, 0, 10)
+	idFilter := &postgresql.Filter{
+		Name:   helper.String("db-instance-id"),
+		Values: []*string{helper.String(d.Id())},
+	}
+	filters = append(filters, idFilter)
+
+	instanceList, err := postgresqlService.DescribePostgresqlInstances(ctx, filters)
+	if err != nil {
+		log.Printf("[CRITAL]%s query postgreSql  error, reason:%s\n", logId, err.Error())
+		return err
+	}
+	if len(instanceList) == 0 {
+		return fmt.Errorf("no postgresql instance find by id: %s\n.", d.Id())
+	}
+	if len(instanceList) > 1 {
+		return fmt.Errorf("find more than one postgresql instance find by id: %s\n.", d.Id())
+	}
+
+	_ = d.Set("uid", instanceList[0].Uid)
 
 	// ignore spec_code
 	// qcs::postgres:ap-guangzhou:uin/123435236:DBInstanceId/postgres-xxx

tencentcloud/resource_tc_vpn_gateway.go

@@ -233,7 +233,7 @@ func resourceTencentCloudVpnGatewayCreate(d *schema.ResourceData, meta interface
 	// must wait for creating gateway finished
 	statRequest := vpc.NewDescribeVpnGatewaysRequest()
 	statRequest.VpnGatewayIds = []*string{helper.String(gatewayId)}
-	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+	err = resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
 		result, e := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().DescribeVpnGateways(statRequest)
 		if e != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",

tencentcloud/service_tencentcloud_postgresql.go

@@ -264,7 +264,7 @@ func (me *PostgresqlService) DescribePostgresqlInstances(ctx context.Context, fi
 		}
 	}()
 
-	var offset, limit uint64 = 0, 200
+	var offset, limit uint64 = 0, 10
 
 	for {
 		request.Offset = &offset