Merge pull request #764 from tencentcloudstack/feat/support_pg_modify_params

[feat]support pg modify params

Author: tongyiming

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.306
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.199
@@ -41,7 +41,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.291
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.199
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.306
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.275

go.sum

@@ -473,6 +473,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291/go.mod h1:
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264 h1:USf7I8ohzoqCwAcCHz5rz0hD57mmNXZgrLfxFLx1WmA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.306 h1:wQe/QkYMFu41adzjalR4Un3z7g1g7pmc2aixjqxIyP0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.306/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199 h1:ajgJogYSIQ5u1PIbiV5nsvr5K0fYpm1/T7Dy+mxEM6U=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199/go.mod h1:AqyM/ZZMD7q5mHBqNY9YImbSpEpoEe7E/vrTbUWX+po=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.199 h1:L0twFkJMOZzLkX08w8S14nX6oanD8YxMQDIaYXVim6A=
@@ -498,6 +500,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.291 h1:EIU
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.291/go.mod h1:aMwrB/fRSIS8IFabcF0hfRC89y76DptUknUjAf1jlHE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.199 h1:Opze570l6JbOc+/nYftYmheyCU9omz+emNJpDUBYYFQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.199/go.mod h1:Rh/4NXBd0aqmaRGDYcW4gL2Zi8JShGZiB23zrfVaS90=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.306 h1:R/nD8qAexHLwcKhWOTmr9rzIrvnH1C4sEudpS4qUBWY=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.306/go.mod h1:Rh/4NXBd0aqmaRGDYcW4gL2Zi8JShGZiB23zrfVaS90=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290 h1:osYZxh9ApEc8UpvIMwjAUfdl7ytRcWUpcnnqLIpiJ/U=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290/go.mod h1:En+pdagcHkAASorHT1l8R6tUtieRNNxaQ7nfyqWPefk=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.199 h1:lXCng7HQqvubF7uwa7x5COsDZlJEjEJ/RBpaeYGc0+I=

tencentcloud/resource_tc_postgresql_instance.go

@@ -57,7 +57,9 @@ package tencentcloud
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
 
@@ -176,6 +178,16 @@ func resourceTencentCloudPostgresqlInstance() *schema.Resource {
 				Optional:    true,
 				Description: "The available tags within this postgresql.",
 			},
+			"max_standby_archive_delay": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "max_standby_archive_delay applies when WAL data is being read from WAL archive (and is therefore not current). Units are milliseconds if not specified.",
+			},
+			"max_standby_streaming_delay": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "max_standby_streaming_delay applies when WAL data is being received via streaming replication. Units are milliseconds if not specified.",
+			},
 			// Computed values
 			"public_access_host": {
 				Type:        schema.TypeString,
@@ -381,6 +393,30 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 		}
 	}
 
+	// set pg params
+	paramEntrys := make(map[string]string)
+	if v, ok := d.GetOkExists("max_standby_archive_delay"); ok {
+		paramEntrys["max_standby_archive_delay"] = strconv.Itoa(v.(int))
+	}
+	if v, ok := d.GetOkExists("max_standby_streaming_delay"); ok {
+		paramEntrys["max_standby_streaming_delay"] = strconv.Itoa(v.(int))
+	}
+
+	if len(paramEntrys) != 0 {
+		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			inErr := postgresqlService.ModifyPgParams(ctx, instanceId, paramEntrys)
+			if inErr != nil {
+				return retryError(inErr)
+			}
+			return nil
+		})
+		if outErr != nil {
+			return outErr
+		}
+		// 10s is required to synchronize the data(`DescribeParamsEvent`).
+		time.Sleep(10 * time.Second)
+	}
+
 	return resourceTencentCloudPostgresqlInstanceRead(d, meta)
 }
 
@@ -536,6 +572,34 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
 		}
 		d.SetPartial("tags")
 	}
+	paramEntrys := make(map[string]string)
+	if d.HasChange("max_standby_archive_delay") {
+		if v, ok := d.GetOkExists("max_standby_archive_delay"); ok {
+			paramEntrys["max_standby_archive_delay"] = strconv.Itoa(v.(int))
+		}
+	}
+	if d.HasChange("max_standby_streaming_delay") {
+		if v, ok := d.GetOkExists("max_standby_streaming_delay"); ok {
+			paramEntrys["max_standby_streaming_delay"] = strconv.Itoa(v.(int))
+		}
+	}
+	if len(paramEntrys) != 0 {
+		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			inErr := postgresqlService.ModifyPgParams(ctx, instanceId, paramEntrys)
+			if inErr != nil {
+				return retryError(inErr)
+			}
+			return nil
+		})
+		if outErr != nil {
+			return outErr
+		}
+		for key := range paramEntrys {
+			d.SetPartial(key)
+		}
+		// 10s is required to synchronize the data(`DescribeParamsEvent`).
+		time.Sleep(10 * time.Second)
+	}
 
 	d.Partial(false)
 
@@ -650,6 +714,33 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int
 	}
 	_ = d.Set("tags", tags)
 
+	// pg params
+	var parmas map[string]string
+	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		parmas, inErr = postgresqlService.DescribePgParams(ctx, d.Id())
+		if inErr != nil {
+			ee, ok := inErr.(*sdkErrors.TencentCloudSDKError)
+			if ok && ee.GetCode() == "ResourceNotFound.InstanceNotFoundError" {
+				return nil
+			}
+			return retryError(inErr)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	maxStandbyStreamingDelayValue, err := strconv.Atoi(parmas["max_standby_streaming_delay"])
+	if err != nil {
+		return err
+	}
+	maxStandbyArchiveDelayValue, err := strconv.Atoi(parmas["max_standby_archive_delay"])
+	if err != nil {
+		return err
+	}
+	_ = d.Set("max_standby_streaming_delay", maxStandbyStreamingDelayValue)
+	_ = d.Set("max_standby_archive_delay", maxStandbyArchiveDelayValue)
+
 	return nil
 }
 

tencentcloud/service_tencentcloud_postgresql.go

@@ -454,3 +454,76 @@ func (me *PostgresqlService) DescribeRootUser(ctx context.Context, instanceId st
 
 	return accounts, errRet
 }
+
+func (me *PostgresqlService) ModifyPgParams(ctx context.Context, instanceId string, paramEntrys map[string]string) (err error) {
+	logId := getLogId(ctx)
+	request := postgresql.NewModifyDBInstanceParametersRequest()
+	request.DBInstanceId = &instanceId
+	request.ParamList = make([]*postgresql.ParamEntry, 0)
+
+	for key, value := range paramEntrys {
+		request.ParamList = append(request.ParamList, &postgresql.ParamEntry{
+			Name:          helper.String(key),
+			ExpectedValue: helper.String(value),
+		})
+	}
+	_, err = me.client.UsePostgresqlClient().ModifyDBInstanceParameters(request)
+
+	if err != nil {
+		log.Printf("[CRITAL]%s modify pgInstance parameter failed, reason: %v", logId, err)
+		return err
+	}
+	return nil
+}
+
+func (me *PostgresqlService) DescribePgParams(ctx context.Context, instanceId string) (params map[string]string, err error) {
+	logId := getLogId(ctx)
+	stateCheckRequest := postgresql.NewDescribeParamsEventRequest()
+	stateCheckRequest.DBInstanceId = &instanceId
+
+	// wait for param effective
+	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		stateCheckResponse, inErr := me.client.UsePostgresqlClient().DescribeParamsEvent(stateCheckRequest)
+		if inErr != nil {
+			ee, ok := inErr.(*sdkErrors.TencentCloudSDKError)
+			if ok && ee.GetCode() == "ResourceNotFound.InstanceNotFoundError" {
+				return nil
+			}
+			return retryError(inErr)
+		}
+
+		for _, eventItem := range stateCheckResponse.Response.EventItems {
+			eventDetail := eventItem.EventDetail
+			if eventDetail == nil {
+				continue
+			}
+			for _, eventDetailItem := range eventDetail {
+				if *(eventDetailItem.State) != "success" {
+					return resource.RetryableError(
+						fmt.Errorf("params is updating!"))
+				}
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return
+	}
+
+	request := postgresql.NewDescribeDBInstanceParametersRequest()
+	request.DBInstanceId = &instanceId
+
+	response, err := me.client.UsePostgresqlClient().DescribeDBInstanceParameters(request)
+
+	if err != nil {
+		log.Printf("[CRITAL]%s fetch pg instance parameter failed, reason: %v", logId, err)
+		return
+	}
+	detail := response.Response.Detail
+	params = make(map[string]string)
+	for _, item := range detail {
+		params[*item.Name] = *item.CurrentValue
+	}
+
+	return
+}