feat(postgresql): [121024406] Add new resource tencentcloud_postgresql_instance_network_access

.changelog/3004.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_postgresql_instance_network_access
+```

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1034
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1078
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1099
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1103
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1053
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1058
@@ -70,7 +70,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.1066
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.853
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.1038
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.1010
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.1103
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.1038
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts v1.0.762
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.1008

go.sum

@@ -941,6 +941,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1096 h1:DMo
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1096/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1099 h1:4fQ53ORk6Eayw1H2kg43PoBnUuhGR6WRG6rtec/i3oI=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1099/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1103 h1:iXN1f1GxuX9wdluA+knK8xKsAWsOlz29V19fVcuuv9g=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1103/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -1001,6 +1003,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.1038
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.1038/go.mod h1:ZcauOIKWXstNwe6IlD3iBBxzljEWdQjZbTc6PfwsPxQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.1010 h1:lx554ZfB++mge+/Gk7LnDUI5Dwm9r+DgGNN9C/DqhE4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.1010/go.mod h1:GGhAf2ehV2/jwKf3Sezr2x/soJ3nDuefJFlcoZnlflA=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.1103 h1:lJW5ID6x9DS2xZzzALJVpY9zhNfqhBl/e2YDUkbzBcg=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.1103/go.mod h1:PI4OqbnLLCWw6u/vNHnVVZeV/awmB9+zpLdhjYhWbKs=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.1038 h1:4rzyVxkDB27v73jDXPr5eGAwjN859R7SsqniCt+46XE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.1038/go.mod h1:TAHhxxDVV36Pe4P4Gel3dgX4kHUfQO7f27GzRf8DAro=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/pts v1.0.762 h1:rZDKucVVtTnmnbZFDyh6t47dHswkb2oSuOxOHTTkygA=

tencentcloud/connectivity/client.go

@@ -228,6 +228,7 @@ type TencentCloudClient struct {
 	wafv20180125Conn            *waf.Client
 	camv20190116Conn            *cam.Client
 	clsv20201016Conn            *cls.Client
+	postgresqlv20170312Conn     *postgre.Client
 	monitor20180724Conn         *monitor.Client
 	cdcv20201214Conn            *cdc.Client
 	mqttv20240516Conn           *mqtt.Client
@@ -2022,6 +2023,19 @@ func (me *TencentCloudClient) UseClsV20201016Client() *cls.Client {
 	return me.clsv20201016Conn
 }
 
+// UsePostgresqlV20170312Client return POSTGRESQL client for service
+func (me *TencentCloudClient) UsePostgresqlV20170312Client() *postgre.Client {
+	if me.postgresqlv20170312Conn != nil {
+		return me.postgresqlv20170312Conn
+	}
+	cpf := me.NewClientProfile(300)
+	cpf.Language = "zh-CN"
+	me.postgresqlv20170312Conn, _ = postgre.NewClient(me.Credential, me.Region, cpf)
+	me.postgresqlv20170312Conn.WithHttpTransport(&LogRoundTripper{})
+
+	return me.postgresqlv20170312Conn
+}
+
 // UseMonitorV20180724Client returns MONITOR client for service
 func (me *TencentCloudClient) UseMonitorV20180724Client() *monitor.Client {
 	if me.monitor20180724Conn != nil {

tencentcloud/provider.go

@@ -1554,6 +1554,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_postgresql_account_privileges_operation":                                  postgresql.ResourceTencentCloudPostgresqlAccountPrivilegesOperation(),
 			"tencentcloud_postgresql_apply_parameter_template_operation":                            postgresql.ResourceTencentCloudPostgresqlApplyParameterTemplateOperation(),
 			"tencentcloud_postgresql_clone_db_instance":                                             postgresql.ResourceTencentCloudPostgresqlCloneDbInstance(),
+			"tencentcloud_postgresql_instance_network_access":                                       postgresql.ResourceTencentCloudPostgresqlInstanceNetworkAccess(),
 			"tencentcloud_sqlserver_instance":                                                       sqlserver.ResourceTencentCloudSqlserverInstance(),
 			"tencentcloud_sqlserver_db":                                                             sqlserver.ResourceTencentCloudSqlserverDB(),
 			"tencentcloud_sqlserver_account":                                                        sqlserver.ResourceTencentCloudSqlserverAccount(),

tencentcloud/provider.md

@@ -912,6 +912,7 @@ TencentDB for PostgreSQL(PostgreSQL)
     tencentcloud_postgresql_account
     tencentcloud_postgresql_apply_parameter_template_operation
     tencentcloud_postgresql_clone_db_instance
+    tencentcloud_postgresql_instance_network_access
 
 TencentDB for Redis(crs)
   Data Source

tencentcloud/services/postgresql/resource_tc_postgresql_instance_network_access.go

@@ -0,0 +1,304 @@
+package postgresql
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	postgresqlv20170312 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
+
+	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func ResourceTencentCloudPostgresqlInstanceNetworkAccess() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudPostgresqlInstanceNetworkAccessCreate,
+		Read:   resourceTencentCloudPostgresqlInstanceNetworkAccessRead,
+		Delete: resourceTencentCloudPostgresqlInstanceNetworkAccessDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Schema: map[string]*schema.Schema{
+			"db_instance_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Instance ID in the format of postgres-6bwgamo3.",
+			},
+
+			"vpc_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Unified VPC ID.",
+			},
+
+			"subnet_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Subnet ID.",
+			},
+
+			"vip": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				ForceNew:    true,
+				Description: "Target VIP.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudPostgresqlInstanceNetworkAccessCreate(d *schema.ResourceData, meta interface{}) error {
+	defer tccommon.LogElapsed("resource.tencentcloud_postgresql_instance_network_access.create")()
+	defer tccommon.InconsistentCheck(d, meta)()
+
+	var (
+		logId        = tccommon.GetLogId(tccommon.ContextNil)
+		ctx          = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
+		request      = postgresqlv20170312.NewCreateDBInstanceNetworkAccessRequest()
+		response     = postgresqlv20170312.NewCreateDBInstanceNetworkAccessResponse()
+		dbInsntaceId string
+		vpcId        string
+		subnetId     string
+		vip          string
+	)
+
+	if v, ok := d.GetOk("db_instance_id"); ok {
+		request.DBInstanceId = helper.String(v.(string))
+		dbInsntaceId = v.(string)
+	}
+
+	if v, ok := d.GetOk("vpc_id"); ok {
+		request.VpcId = helper.String(v.(string))
+		vpcId = v.(string)
+	}
+
+	if v, ok := d.GetOk("subnet_id"); ok {
+		request.SubnetId = helper.String(v.(string))
+		subnetId = v.(string)
+	}
+
+	request.IsAssignVip = helper.Bool(false)
+
+	if v, ok := d.GetOk("vip"); ok {
+		request.Vip = helper.String(v.(string))
+		request.IsAssignVip = helper.Bool(true)
+		vip = v.(string)
+	}
+
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlV20170312Client().CreateDBInstanceNetworkAccessWithContext(ctx, request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+
+		if result == nil || result.Response == nil {
+			return resource.NonRetryableError(fmt.Errorf("Create postgresql instance network access failed, Response is nil."))
+		}
+
+		response = result
+		return nil
+	})
+
+	if err != nil {
+		log.Printf("[CRITAL]%s create postgresql instance network access failed, reason:%+v", logId, err)
+		return err
+	}
+
+	if response.Response.FlowId == nil {
+		return fmt.Errorf("FlowId is nil.")
+	}
+
+	// wait & get vip
+	flowId := *response.Response.FlowId
+	flowRequest := postgresqlv20170312.NewDescribeTasksRequest()
+	flowRequest.TaskId = helper.Int64Uint64(flowId)
+	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlV20170312Client().DescribeTasksWithContext(ctx, flowRequest)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+
+		if result == nil || result.Response == nil || result.Response.TaskSet == nil {
+			return resource.NonRetryableError(fmt.Errorf("Describe tasks failed, Response is nil."))
+		}
+
+		if len(result.Response.TaskSet) == 0 {
+			return resource.RetryableError(fmt.Errorf("wait TaskSet init."))
+		}
+
+		if result.Response.TaskSet[0].Status != nil && *result.Response.TaskSet[0].Status == "Success" {
+			if result.Response.TaskSet[0].TaskDetail != nil && result.Response.TaskSet[0].TaskDetail.Output != nil {
+				outPutObj := make(map[string]interface{})
+				outputStr := *result.Response.TaskSet[0].TaskDetail.Output
+				e := json.Unmarshal([]byte(outputStr), &outPutObj)
+				if e != nil {
+					return resource.NonRetryableError(fmt.Errorf("Json unmarshall output error: %s.", e.Error()))
+				}
+
+				dBInstanceNetInfo := outPutObj["DBInstanceNetInfo"].(map[string]interface{})
+				vip = dBInstanceNetInfo["Ip"].(string)
+				return nil
+			}
+		}
+
+		return resource.RetryableError(fmt.Errorf("postgresql instance network access is running, status is %s.", *result.Response.TaskSet[0].Status))
+	})
+
+	if err != nil {
+		log.Printf("[CRITAL]%s create postgresql instance network access failed, reason:%+v", logId, err)
+		return err
+	}
+
+	d.SetId(strings.Join([]string{dbInsntaceId, vpcId, subnetId, vip}, tccommon.FILED_SP))
+
+	return resourceTencentCloudPostgresqlInstanceNetworkAccessRead(d, meta)
+}
+
+func resourceTencentCloudPostgresqlInstanceNetworkAccessRead(d *schema.ResourceData, meta interface{}) error {
+	defer tccommon.LogElapsed("resource.tencentcloud_postgresql_instance_network_access.read")()
+	defer tccommon.InconsistentCheck(d, meta)()
+
+	var (
+		logId   = tccommon.GetLogId(tccommon.ContextNil)
+		ctx     = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
+		service = PostgresqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+	)
+
+	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
+	if len(idSplit) != 4 {
+		return fmt.Errorf("id is broken,%s", d.Id())
+	}
+
+	dbInsntaceId := idSplit[0]
+	vpcId := idSplit[1]
+	subnetId := idSplit[2]
+	vip := idSplit[3]
+
+	_ = d.Set("db_instance_id", dbInsntaceId)
+
+	_ = d.Set("vpc_id", vpcId)
+
+	_ = d.Set("subnet_id", subnetId)
+
+	respData, err := service.DescribePostgresqlInstanceNetworkAccessById(ctx, dbInsntaceId)
+	if err != nil {
+		return err
+	}
+
+	if respData == nil {
+		d.SetId("")
+		log.Printf("[WARN]%s resource `postgresql_instance_network_access` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
+		return nil
+	}
+
+	var checkFlag bool
+	if respData.DBInstanceNetInfo != nil && len(respData.DBInstanceNetInfo) > 0 {
+		for _, item := range respData.DBInstanceNetInfo {
+			if *item.Ip == vip {
+				_ = d.Set("vip", item.Ip)
+				checkFlag = true
+				break
+			}
+		}
+	}
+
+	if checkFlag == false {
+		return fmt.Errorf("Not found vip %s, please check if it has been deleted.", vip)
+	}
+
+	return nil
+}
+
+func resourceTencentCloudPostgresqlInstanceNetworkAccessDelete(d *schema.ResourceData, meta interface{}) error {
+	defer tccommon.LogElapsed("resource.tencentcloud_postgresql_instance_network_access.delete")()
+	defer tccommon.InconsistentCheck(d, meta)()
+
+	var (
+		logId    = tccommon.GetLogId(tccommon.ContextNil)
+		ctx      = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
+		request  = postgresqlv20170312.NewDeleteDBInstanceNetworkAccessRequest()
+		response = postgresqlv20170312.NewDeleteDBInstanceNetworkAccessResponse()
+	)
+
+	idSplit := strings.Split(d.Id(), tccommon.FILED_SP)
+	if len(idSplit) != 4 {
+		return fmt.Errorf("id is broken,%s", d.Id())
+	}
+
+	dbInsntaceId := idSplit[0]
+	vpcId := idSplit[1]
+	subnetId := idSplit[2]
+	vip := idSplit[3]
+
+	request.DBInstanceId = helper.String(dbInsntaceId)
+	request.VpcId = helper.String(vpcId)
+	request.SubnetId = helper.String(subnetId)
+	request.Vip = helper.String(vip)
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlV20170312Client().DeleteDBInstanceNetworkAccessWithContext(ctx, request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+
+		if result == nil || result.Response == nil {
+			return resource.NonRetryableError(fmt.Errorf("Delete postgresql instance network access failed, Response is nil."))
+		}
+
+		response = result
+		return nil
+	})
+
+	if err != nil {
+		log.Printf("[CRITAL]%s delete postgresql instance network access failed, reason:%+v", logId, err)
+		return err
+	}
+
+	// wait
+	flowId := *response.Response.FlowId
+	flowRequest := postgresqlv20170312.NewDescribeTasksRequest()
+	flowRequest.TaskId = helper.Int64Uint64(flowId)
+	err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlV20170312Client().DescribeTasksWithContext(ctx, flowRequest)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+
+		if result == nil || result.Response == nil || result.Response.TaskSet == nil {
+			return resource.NonRetryableError(fmt.Errorf("Describe tasks failed, Response is nil."))
+		}
+
+		if len(result.Response.TaskSet) == 0 {
+			return resource.RetryableError(fmt.Errorf("wait TaskSet init."))
+		}
+
+		if result.Response.TaskSet[0].Status != nil && *result.Response.TaskSet[0].Status == "Success" {
+			return nil
+		}
+
+		return resource.RetryableError(fmt.Errorf("postgresql instance network access is running, status is %s.", *result.Response.TaskSet[0].Status))
+	})
+
+	if err != nil {
+		log.Printf("[CRITAL]%s delete postgresql instance network access failed, reason:%+v", logId, err)
+		return err
+	}
+
+	return nil
+}