add resrouce tencentcloud_postgresql_instance;

CHANGELOG.md

@@ -1,4 +1,10 @@
 ## 1.37.0 (Unreleased)
+
+FEATURES:
+* **New Resource**: `tencentcloud_postgresql_instance`
+* **New Data Source**: `tencentcloud_postgresql_instances`
+* **New Data Source**: `tencentcloud_postgresql_speccodes`
+
 ## 1.36.1 (June 12, 2020)
 
 ENHANCEMENTS:

examples/tencentcloud-postgresql/main.tf

@@ -0,0 +1,43 @@
+resource "tencentcloud_vpc" "foo" {
+  name       = "example"
+  cidr_block = "10.0.0.0/16"
+}
+
+resource "tencentcloud_subnet" "foo" {
+  name              = "example"
+  availability_zone = var.availability_zone
+  vpc_id            = tencentcloud_vpc.foo.id
+  cidr_block        = "10.0.0.0/24"
+  is_multicast      = false
+}
+
+resource "tencentcloud_postgresql_instance" "example" {
+  name              = "tf_postsql_instance_111"
+  availability_zone = var.availability_zone
+  charge_type       = "POSTPAID_BY_HOUR"
+  vpc_id            = tencentcloud_vpc.foo.id
+  subnet_id         = tencentcloud_subnet.foo.id
+  engine_version    = "9.3.5"
+  root_password     = "1qaA2k1wgvfa3ZZZ"
+  charset           = "UTF8"
+  spec_code         = "cdb.pg.z1.2g"
+  project_id        = 0
+  memory            = 2
+  storage           = 10
+}
+
+data "tencentcloud_postgresql_instances" "id_example" {
+  id = tencentcloud_postgresql_instance.example.id
+}
+
+data "tencentcloud_postgresql_instances" "project_example" {
+  project_id = 0
+}
+
+data "tencentcloud_postgresql_instances" "charge_example" {
+  name = tencentcloud_postgresql_instance.example.name
+}
+
+data "tencentcloud_postgresql_specinfos" "example" {
+  availability_zone = var.availability_zone
+}

examples/tencentcloud-postgresql/variables.tf

@@ -0,0 +1,3 @@
+variable "availability_zone" {
+  default = "ap-guangzhou-2"
+}

examples/tencentcloud-postgresql/version.tf

@@ -0,0 +1,3 @@
+terraform {
+  required_version = ">= 0.12"
+}

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v3.0.187+incompatible
+	github.com/tencentcloud/tencentcloud-sdk-go v3.0.189+incompatible
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -454,8 +454,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
-github.com/tencentcloud/tencentcloud-sdk-go v3.0.187+incompatible h1:9hr93p945INwxa67N68EUJuIkUE2iGnMq/YZ6x3JHik=
-github.com/tencentcloud/tencentcloud-sdk-go v3.0.187+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.189+incompatible h1:eLVHwxLW2HFvr48l5sqROircYlq6Lp39EXhyCkK6Jlw=
+github.com/tencentcloud/tencentcloud-sdk-go v3.0.189+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/connectivity/client.go

@@ -24,6 +24,7 @@ import (
 	gaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529"
 	mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20180408"
 	monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
+	postgre "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
 	redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"
 	scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416"
 	sts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts/v20180813"
@@ -64,6 +65,7 @@ type TencentCloudClient struct {
 	cdnConn     *cdn.Client
 	monitorConn *monitor.Client
 	esConn      *es.Client
+	postgreConn *postgre.Client
 }
 
 // NewClientProfile returns a new ClientProfile
@@ -398,3 +400,16 @@ func (me *TencentCloudClient) UseEsClient() *es.Client {
 
 	return me.esConn
 }
+
+// UsePostgreClient returns postgresql client for service
+func (me *TencentCloudClient) UsePostgresqlClient() *postgre.Client {
+	if me.postgreConn != nil {
+		return me.postgreConn
+	}
+
+	cpf := me.NewClientProfile(300)
+	me.postgreConn, _ = postgre.NewClient(me.Credential, me.Region, cpf)
+	me.postgreConn.WithHttpTransport(&LogRoundTripper{})
+
+	return me.postgreConn
+}

tencentcloud/data_source_tc_postgresql_instances.go

@@ -0,0 +1,238 @@
+/*
+Use this data source to query postgresql instances
+
+Example Usage
+
+```hcl
+data "tencentcloud_postgresql_instances" "name"{
+	name = "test"
+}
+
+data "tencentcloud_postgresql_instances" "project"{
+  project_id = 0
+}
+
+data "tencentcloud_postgresql_instances" "id"{
+  id = "postgres-h9t4fde1"
+}
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	postgresql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
+	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func dataSourceTencentCloudPostgresqlInstances() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceTencentCloudPostgresqlInstanceRead,
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Name of the postgresql instance to be queey.",
+			},
+			"id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Name of the postgresql instance to be query.",
+			},
+			"project_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "Project id of the postgresql instance to be query.",
+			},
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
+			"instance_list": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "A list of postgresql instances. Each element contains the following attributes.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Id of the postgresql instance.",
+						},
+						"name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Name of the postgresql instance.",
+						},
+						"charge_type": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Pay type of the postgresql instance.",
+						},
+						"auto_renew_flag": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Auto renew flag.",
+						},
+						"engine_version": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Version of the postgresql db engine.",
+						},
+						"vpc_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "ID of VPC.",
+						},
+						"subnet_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "ID of subnet.",
+						},
+						"storage": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Disk size (in GB).",
+						},
+						"memory": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Memory size (in MB).",
+						},
+						"project_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Project ID, default value is 0.",
+						},
+						"availability_zone": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Availability zone.",
+						},
+						"public_access_switch": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Description: "Indicates whether to enable the access to an instance from public network or not.",
+						},
+						"public_access_host": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Host for public access.",
+						},
+						"public_access_port": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Port for public access.",
+						},
+						"private_access_ip": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Ip address for private access.",
+						},
+						"private_access_port": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Port for private access.",
+						},
+						"charset": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Charset of the postgresql instance.",
+						},
+						"create_time": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Create time of the postgresql instance.",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func dataSourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_postgresql_instances.read")()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	service := PostgresqlService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	filter := make([]*postgresql.Filter, 0)
+	if v, ok := d.GetOk("name"); ok {
+		filter = append(filter, &postgresql.Filter{Name: helper.String("db-instance-name"), Values: []*string{helper.String(v.(string))}})
+	}
+	if v, ok := d.GetOk("id"); ok {
+		filter = append(filter, &postgresql.Filter{Name: helper.String("db-instance-id"), Values: []*string{helper.String(v.(string))}})
+	}
+	if v, ok := d.GetOk("project_id"); ok {
+		filter = append(filter, &postgresql.Filter{Name: helper.String("db-project-id"), Values: []*string{helper.String(v.(string))}})
+	}
+
+	instanceList, err := service.DescribePostgresqlInstances(ctx, filter)
+
+	if err != nil {
+		instanceList, err = service.DescribePostgresqlInstances(ctx, filter)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	ids := make([]string, 0, len(instanceList))
+	list := make([]map[string]interface{}, 0, len(instanceList))
+
+	for _, v := range instanceList {
+		listItem := make(map[string]interface{})
+		listItem["id"] = v.DBInstanceId
+		listItem["name"] = v.DBInstanceName
+		listItem["auto_renew_flag"] = v.AutoRenew
+		listItem["project_id"] = v.ProjectId
+		listItem["storage"] = v.DBInstanceStorage
+		listItem["memory"] = v.DBInstanceMemory
+		listItem["availability_zone"] = v.Zone
+		listItem["create_time"] = v.CreateTime
+		listItem["vpc_id"] = v.VpcId
+		listItem["subnet_id"] = v.SubnetId
+		listItem["engine_version"] = v.DBVersion
+		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" {
+					listItem["public_access_switch"] = true
+				}
+				listItem["public_access_host"] = netInfo.Address
+				listItem["public_access_port"] = netInfo.Port
+			}
+			if *netInfo.NetType == "private" {
+				listItem["private_access_ip"] = netInfo.Ip
+				listItem["private_access_port"] = netInfo.Port
+			}
+		}
+		if *v.PayType == POSTGRESQL_PAYTYPE_PREPAID {
+			listItem["charge_type"] = COMMON_PAYTYPE_PREPAID
+		} else {
+			listItem["charge_type"] = COMMON_PAYTYPE_POSTPAID
+		}
+		list = append(list, listItem)
+		ids = append(ids, *v.DBInstanceId)
+	}
+
+	d.SetId(helper.DataResourceIdsHash(ids))
+	if e := d.Set("instance_list", list); e != nil {
+		log.Printf("[CRITAL]%s provider set list fail, reason:%s\n", logId, e.Error())
+		return e
+	}
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		return writeToFile(output.(string), list)
+	}
+	return nil
+}