adjust update logic for charge_type and period

Author: lyu571

tencentcloud/resource_tc_postgresql_instance.go

@@ -1,6 +1,8 @@
 /*
 Use this resource to create postgresql instance.
 
+-> **Note:** To update the charge type, please update the `charge_type` and specify the `period` for the charging period. It only supports updating from `POSTPAID_BY_HOUR` to `PREPAID`, and the `period` field only valid in that upgrading case.
+
 Example Usage
 
 ```hcl
@@ -211,12 +213,12 @@ func resourceTencentCloudPostgresqlInstance() *schema.Resource {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Default:     COMMON_PAYTYPE_POSTPAID,
-				Description: "Pay type of the postgresql instance. Values `POSTPAID_BY_HOUR` (Default), `PREPAID`. It support to update the type from `POSTPAID_BY_HOUR` to `PREPAID`.",
+				Description: "Pay type of the postgresql instance. Values `POSTPAID_BY_HOUR` (Default), `PREPAID`. It only support to update the type from `POSTPAID_BY_HOUR` to `PREPAID`.",
 			},
 			"period": {
 				Type:        schema.TypeInt,
 				Optional:    true,
-				Description: "Specify Prepaid period in month. Default `1`. Values: `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `10`, `11`, `12`, `24`, `36`.",
+				Description: "Specify Prepaid period in month. Default `1`. Values: `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `10`, `11`, `12`, `24`, `36`. This field is valid only when creating a `PREPAID` type instance, or updating the charge type from `POSTPAID_BY_HOUR` to `PREPAID`.",
 			},
 			"auto_renew_flag": {
 				Type:        schema.TypeInt,
@@ -803,6 +805,10 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
 		return err
 	}
 
+	if d.HasChange("period") && !d.HasChange("charge_type") {
+		return fmt.Errorf("The `period` field can be changed only when updating the charge type from `POSTPAID_BY_HOUR` to `PREPAID`.")
+	}
+
 	if d.HasChange("charge_type") {
 		var (
 			chargeTypeOld string
@@ -821,56 +827,58 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
 			chargeTypeNew = new.(string)
 		}
 
-		// The real Update operation rather than the operation from create
-		if chargeTypeOld != "" && chargeTypeOld != chargeTypeNew {
-			if v, ok := d.GetOk("period"); ok {
-				log.Printf("period set")
-				period = v.(int)
-			} else {
-				log.Printf("period not set")
-			}
+		if chargeTypeOld != "POSTPAID_BY_HOUR" || chargeTypeNew != "PREPAID" {
+			return fmt.Errorf("It only support to update the charge type from `POSTPAID_BY_HOUR` to `PREPAID`.")
+		}
 
-			if v, ok := d.GetOk("auto_renew_flag"); ok {
-				log.Printf("auto_renew_flag set")
-				autoRenew = v.(int)
-			} else {
-				log.Printf("auto_renew_flag not set")
-			}
+		if v, ok := d.GetOk("period"); ok {
+			log.Printf("period set")
+			period = v.(int)
+		} else {
+			log.Printf("period not set")
+		}
 
-			if v, ok := d.GetOk("auto_voucher"); ok {
-				log.Printf("auto_voucher set")
-				autoVoucher = v.(int)
-			} else {
-				log.Printf("auto_voucher not set")
-			}
+		if v, ok := d.GetOk("auto_renew_flag"); ok {
+			log.Printf("auto_renew_flag set")
+			autoRenew = v.(int)
+		} else {
+			log.Printf("auto_renew_flag not set")
+		}
 
-			request.DBInstanceId = &instanceId
-			request.InstanceChargeType = &chargeTypeNew
-			request.Period = helper.IntInt64(period)
-			request.AutoRenewFlag = helper.IntInt64(autoRenew)
-			request.AutoVoucher = helper.IntInt64(autoVoucher)
-
-			err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-				result, e := meta.(*TencentCloudClient).apiV3Conn.UsePostgresqlClient().ModifyDBInstanceChargeType(request)
-				if e != nil {
-					return retryError(e)
-				} else {
-					log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
-				}
-				return nil
-			})
-			if err != nil {
-				log.Printf("[CRITAL]%s operate postgresql ModifyDbInstanceChargeType failed, reason:%+v", logId, err)
-				return err
-			}
+		if v, ok := d.GetOk("auto_voucher"); ok {
+			log.Printf("auto_voucher set")
+			autoVoucher = v.(int)
+		} else {
+			log.Printf("auto_voucher not set")
+		}
+
+		request.DBInstanceId = &instanceId
+		request.InstanceChargeType = &chargeTypeNew
+		request.Period = helper.IntInt64(period)
+		request.AutoRenewFlag = helper.IntInt64(autoRenew)
+		request.AutoVoucher = helper.IntInt64(autoVoucher)
 
-			// wait unit charge type changing operation of instance done
-			service := PostgresqlService{client: meta.(*TencentCloudClient).apiV3Conn}
-			conf := BuildStateChangeConf([]string{}, []string{"running"}, 2*readRetryTimeout, time.Second, service.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
-			if _, e := conf.WaitForState(); e != nil {
-				return e
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			result, e := meta.(*TencentCloudClient).apiV3Conn.UsePostgresqlClient().ModifyDBInstanceChargeType(request)
+			if e != nil {
+				return retryError(e)
+			} else {
+				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 			}
+			return nil
+		})
+		if err != nil {
+			log.Printf("[CRITAL]%s operate postgresql ModifyDbInstanceChargeType failed, reason:%+v", logId, err)
+			return err
+		}
+
+		// wait unit charge type changing operation of instance done
+		service := PostgresqlService{client: meta.(*TencentCloudClient).apiV3Conn}
+		conf := BuildStateChangeConf([]string{}, []string{"running"}, 2*readRetryTimeout, time.Second, service.PostgresqlDBInstanceStateRefreshFunc(instanceId, []string{}))
+		if _, e := conf.WaitForState(); e != nil {
+			return e
 		}
+
 	}
 
 	var outErr, inErr, checkErr error

tencentcloud/resource_tc_postgresql_modify_account_remark_operation.go

@@ -5,9 +5,9 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_postgresql_modify_account_remark_operation" "modify_account_remark_operation" {
-  db_instance_id = ""
-  user_name = ""
-  remark = ""
+  db_instance_id = local.pgsql_id
+  user_name = "root"
+  remark = "hello_world"
 }
 ```
 */

tencentcloud/resource_tc_postgresql_modify_switch_time_period_operation.go

@@ -5,8 +5,8 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_postgresql_modify_switch_time_period_operation" "modify_switch_time_period_operation" {
-  db_instance_id = ""
-  switch_tag =
+  db_instance_id = local.pgsql_id
+  switch_tag = 0
 }
 ```
 */

tencentcloud/resource_tc_postgresql_readonly_instance.go

@@ -467,30 +467,27 @@ func resourceTencentCloudPostgresqlReadOnlyInstanceUpdate(d *schema.ResourceData
 			roGroupIdNew = new.(string)
 		}
 
-		// The real Update operation rather than the operation from create
-		if roGroupIdOld != "" && roGroupIdOld != roGroupIdNew {
-			request.DBInstanceId = &instanceId
-			request.ReadOnlyGroupId = &roGroupIdOld
-			request.NewReadOnlyGroupId = &roGroupIdNew
-
-			err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-				result, e := meta.(*TencentCloudClient).apiV3Conn.UsePostgresqlClient().ModifyDBInstanceReadOnlyGroup(request)
-				if e != nil {
-					return retryError(e)
-				} else {
-					log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
-				}
-				return nil
-			})
-			if err != nil {
-				log.Printf("[CRITAL]%s operate postgresql ChangeDbInstanceReadOnlyGroupOperation failed, reason:%+v", logId, err)
-				return err
+		request.DBInstanceId = &instanceId
+		request.ReadOnlyGroupId = &roGroupIdOld
+		request.NewReadOnlyGroupId = &roGroupIdNew
+
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			result, e := meta.(*TencentCloudClient).apiV3Conn.UsePostgresqlClient().ModifyDBInstanceReadOnlyGroup(request)
+			if e != nil {
+				return retryError(e)
+			} else {
+				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 			}
+			return nil
+		})
+		if err != nil {
+			log.Printf("[CRITAL]%s operate postgresql ChangeDbInstanceReadOnlyGroupOperation failed, reason:%+v", logId, err)
+			return err
+		}
 
-			conf := BuildStateChangeConf([]string{}, []string{"ok"}, 2*readRetryTimeout, time.Second, service.PostgresqlReadonlyGroupStateRefreshFunc(masterInstanceId, roGroupIdNew, []string{}))
-			if _, e := conf.WaitForState(); e != nil {
-				return e
-			}
+		conf := BuildStateChangeConf([]string{}, []string{"ok"}, 2*readRetryTimeout, time.Second, service.PostgresqlReadonlyGroupStateRefreshFunc(masterInstanceId, roGroupIdNew, []string{}))
+		if _, e := conf.WaitForState(); e != nil {
+			return e
 		}
 	}
 

website/docs/r/postgresql_instance.html.markdown

@@ -11,6 +11,8 @@ description: |-
 
 Use this resource to create postgresql instance.
 
+-> **Note:** To update the charge type, please update the `charge_type` and specify the `period` for the charging period. It only supports updating from `POSTPAID_BY_HOUR` to `PREPAID`, and the `period` field only valid in that upgrading case.
+
 ## Example Usage
 
 ```hcl
@@ -189,7 +191,7 @@ The following arguments are supported:
 * `auto_renew_flag` - (Optional, Int) Auto renew flag, `1` for enabled. NOTES: Only support prepaid instance.
 * `auto_voucher` - (Optional, Int) Whether to use voucher, `1` for enabled.
 * `backup_plan` - (Optional, List) Specify DB backup plan.
-* `charge_type` - (Optional, String) Pay type of the postgresql instance. Values `POSTPAID_BY_HOUR` (Default), `PREPAID`. It support to update the type from `POSTPAID_BY_HOUR` to `PREPAID`.
+* `charge_type` - (Optional, String) Pay type of the postgresql instance. Values `POSTPAID_BY_HOUR` (Default), `PREPAID`. It only support to update the type from `POSTPAID_BY_HOUR` to `PREPAID`.
 * `charset` - (Optional, String, ForceNew) Charset of the root account. Valid values are `UTF8`,`LATIN1`.
 * `db_kernel_version` - (Optional, String) PostgreSQL kernel version number. If it is specified, an instance running kernel DBKernelVersion will be created. It supports updating the minor kernel version immediately.
 * `db_major_version` - (Optional, String) PostgreSQL major version number. Valid values: 10, 11, 12, 13. If it is specified, an instance running the latest kernel of PostgreSQL DBMajorVersion will be created.
@@ -201,7 +203,7 @@ The following arguments are supported:
 * `max_standby_archive_delay` - (Optional, Int) 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` - (Optional, Int) max_standby_streaming_delay applies when WAL data is being received via streaming replication. Units are milliseconds if not specified.
 * `need_support_tde` - (Optional, Int) Whether to support data transparent encryption, 1: yes, 0: no (default).
-* `period` - (Optional, Int) Specify Prepaid period in month. Default `1`. Values: `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `10`, `11`, `12`, `24`, `36`.
+* `period` - (Optional, Int) Specify Prepaid period in month. Default `1`. Values: `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9`, `10`, `11`, `12`, `24`, `36`. This field is valid only when creating a `PREPAID` type instance, or updating the charge type from `POSTPAID_BY_HOUR` to `PREPAID`.
 * `project_id` - (Optional, Int) Project id, default value is `0`.
 * `public_access_switch` - (Optional, Bool) Indicates whether to enable the access to an instance from public network or not.
 * `root_user` - (Optional, String, ForceNew) Instance root account name. This parameter is optional, Default value is `root`.

website/docs/r/postgresql_modify_account_remark_operation.html.markdown

@@ -15,9 +15,9 @@ Provides a resource to create a postgresql modify_account_remark_operation
 
 ```hcl
 resource "tencentcloud_postgresql_modify_account_remark_operation" "modify_account_remark_operation" {
-  db_instance_id = ""
-  user_name      = ""
-  remark         = ""
+  db_instance_id = local.pgsql_id
+  user_name      = "root"
+  remark         = "hello_world"
 }
 ```
 

website/docs/r/postgresql_modify_switch_time_period_operation.html.markdown

@@ -15,8 +15,8 @@ Provides a resource to create a postgresql modify_switch_time_period_operation
 
 ```hcl
 resource "tencentcloud_postgresql_modify_switch_time_period_operation" "modify_switch_time_period_operation" {
-  db_instance_id = ""
-  switch_tag     =
+  db_instance_id = local.pgsql_id
+  switch_tag     = 0
 }
 ```
 

website/tencentcloud.erb

@@ -1834,9 +1834,6 @@
                                 <li>
                                     <a href="/docs/providers/tencentcloud/d/sqlserver_backup_upload_size.html">tencentcloud_sqlserver_backup_upload_size</a>
                                 </li>
-                                <li>
-                                    <a href="/docs/providers/tencentcloud/d/sqlserver_backups.html">tencentcloud_sqlserver_backups</a>
-                                </li>
                                 <li>
                                     <a href="/docs/providers/tencentcloud/d/sqlserver_basic_instances.html">tencentcloud_sqlserver_basic_instances</a>
                                 </li>