Merge pull request #1837 from tencentcloudstack/feat/support-postgres-operation

support postgresql: operation resource

Author: lyu571

.changelog/1837.txt

@@ -0,0 +1,15 @@
+```release-note:enhancement
+resource/tencentcloud_postgresql_instance: support to update `charge_type` and `period`
+```
+
+```release-note:enhancement
+resource/tencentcloud_postgresql_readonly_instance: support the `read_only_group_id` field
+```
+
+```release-note:new-resource
+tencentcloud_postgresql_modify_account_remark_operation
+```
+
+```release-note:new-resource
+tencentcloud_postgresql_modify_switch_time_period_operation
+```

tencentcloud/basic_test.go

@@ -467,8 +467,18 @@ data "tencentcloud_postgresql_instances" "foo" {
   name = "` + defaultPGOperationName + `"
 }
 
+data "tencentcloud_postgresql_readonly_groups" "ro_groups" {
+  filters {
+	name = "db-master-instance-id"
+	values = [data.tencentcloud_postgresql_instances.foo.instance_list.0.id]
+  }
+  order_by = "CreateTime"
+  order_by_type = "asc"
+}
+
 locals {
   pgsql_id = data.tencentcloud_postgresql_instances.foo.instance_list.0.id
+  pgrogroup_id = data.tencentcloud_postgresql_readonly_groups.ro_groups.read_only_group_list.0.read_only_group_id
 }
 `
 const defaultPGSQLName = "keep-postgresql"

tencentcloud/provider.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,13 +213,12 @@ func resourceTencentCloudPostgresqlInstance() *schema.Resource {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Default:     COMMON_PAYTYPE_POSTPAID,
-				ForceNew:    true,
-				Description: "Pay type of the postgresql instance. Values `POSTPAID_BY_HOUR` (Default), `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,
@@ -795,15 +796,91 @@ func resourceTencentCloudPostgresqlInstanceUpdate(d *schema.ResourceData, meta i
 	d.Partial(true)
 
 	if err := helper.ImmutableArgsChek(d,
-		"charge_type",
-		"period",
-		"auto_renew_flag",
-		"auto_voucher",
+		// "charge_type",
+		// "period",
+		// "auto_renew_flag",
+		// "auto_voucher",
 		"voucher_ids",
 	); err != nil {
 		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
+			chargeTypeNew string
+			period        = 1
+			autoRenew     = 0
+			autoVoucher   = 0
+			request       = postgresql.NewModifyDBInstanceChargeTypeRequest()
+		)
+
+		old, new := d.GetChange("charge_type")
+		if old != nil {
+			chargeTypeOld = old.(string)
+		}
+		if new != nil {
+			chargeTypeNew = new.(string)
+		}
+
+		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("period"); ok {
+			log.Printf("period set")
+			period = v.(int)
+		} else {
+			log.Printf("period 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")
+		}
+
+		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)
+
+		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
 	// update vpc and subnet
 	if d.HasChange("vpc_id") || d.HasChange("subnet_id") {

tencentcloud/resource_tc_postgresql_instance.go

@@ -234,6 +234,44 @@ func TestAccTencentCloudPostgresqlInstanceResource_prepaid(t *testing.T) {
 	})
 }
 
+func TestAccTencentCloudPostgresqlInstanceResource_postpaid_to_prepaid(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPostgresqlInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
+				Config:    testAccPostgresqlInstancePostpaid,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey),
+					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"),
+					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "name", "tf_postsql_postpaid"),
+					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "charge_type", "POSTPAID_BY_HOUR"),
+					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "period"),
+				),
+			},
+			{
+				PreConfig: func() { testAccStepPreConfigSetTempAKSK(t, ACCOUNT_TYPE_PREPAY) },
+				Config:    testAccPostgresqlInstancePostpaid_to_Prepaid,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPostgresqlInstanceExists(testPostgresqlInstanceResourceKey),
+					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "id"),
+					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "name", "tf_postsql_postpaid_updated_to_prepaid"),
+					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "charge_type", "PREPAID"),
+					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "period", "2"),
+				),
+			},
+			{
+				ResourceName:            testPostgresqlInstanceResourceKey,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"root_password", "spec_code", "public_access_switch", "charset", "backup_plan", "period"},
+			},
+		},
+	})
+}
+
 func TestAccTencentCloudPostgresqlInstanceResource_MAZ(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
@@ -363,6 +401,63 @@ resource "tencentcloud_postgresql_instance" "test" {
   }
 }
 `
+const testAccPostgresqlInstancePostpaid = defaultVpcSubnets + `
+data "tencentcloud_availability_zones_by_product" "zone" {
+  product = "postgres"
+}
+
+data "tencentcloud_security_groups" "internal" {
+  name = "default"
+}
+
+locals {
+  sg_id = data.tencentcloud_security_groups.internal.security_groups.0.security_group_id
+}
+
+resource "tencentcloud_postgresql_instance" "test" {
+  name 				= "tf_postsql_postpaid"
+  availability_zone = var.default_az
+  charge_type 		= "POSTPAID_BY_HOUR"
+  period            = 1
+  vpc_id  	  		= local.vpc_id
+  subnet_id 		= local.subnet_id
+  engine_version	= "13.3"
+  root_password	    = "t1qaA2k1wgvfa3?ZZZ"
+  security_groups   = [local.sg_id]
+  charset			= "LATIN1"
+  project_id 		= 0
+  memory 			= 2
+  storage 			= 20
+}`
+
+const testAccPostgresqlInstancePostpaid_to_Prepaid = defaultVpcSubnets + `
+data "tencentcloud_availability_zones_by_product" "zone" {
+  product = "postgres"
+}
+
+data "tencentcloud_security_groups" "internal" {
+  name = "default"
+}
+
+locals {
+  sg_id = data.tencentcloud_security_groups.internal.security_groups.0.security_group_id
+}
+
+resource "tencentcloud_postgresql_instance" "test" {
+  name 				= "tf_postsql_postpaid_updated_to_prepaid"
+  availability_zone = var.default_az
+  charge_type 		= "PREPAID"
+  period            = 2
+  vpc_id  	  		= local.vpc_id
+  subnet_id 		= local.subnet_id
+  engine_version	= "13.3"
+  root_password	    = "t1qaA2k1wgvfa3?ZZZ"
+  security_groups   = [local.sg_id]
+  charset			= "LATIN1"
+  project_id 		= 0
+  memory 			= 2
+  storage 			= 20
+}`
 
 const testAccPostgresqlInstancePrepaid = defaultVpcSubnets + `
 data "tencentcloud_availability_zones_by_product" "zone" {

tencentcloud/resource_tc_postgresql_instance_test.go

@@ -0,0 +1,109 @@
+/*
+Provides a resource to create a postgresql modify_account_remark_operation
+
+Example Usage
+
+```hcl
+resource "tencentcloud_postgresql_modify_account_remark_operation" "modify_account_remark_operation" {
+  db_instance_id = local.pgsql_id
+  user_name = "root"
+  remark = "hello_world"
+}
+```
+*/
+package tencentcloud
+
+import (
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	postgresql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func resourceTencentCloudPostgresqlModifyAccountRemarkOperation() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudPostgresqlModifyAccountRemarkOperationCreate,
+		Read:   resourceTencentCloudPostgresqlModifyAccountRemarkOperationRead,
+		Delete: resourceTencentCloudPostgresqlModifyAccountRemarkOperationDelete,
+		Schema: map[string]*schema.Schema{
+			"db_instance_id": {
+				Required:    true,
+				ForceNew:    true,
+				Type:        schema.TypeString,
+				Description: "Instance ID in the format of postgres-4wdeb0zv.",
+			},
+
+			"user_name": {
+				Required:    true,
+				ForceNew:    true,
+				Type:        schema.TypeString,
+				Description: "Instance username.",
+			},
+
+			"remark": {
+				Required:    true,
+				ForceNew:    true,
+				Type:        schema.TypeString,
+				Description: "New remarks corresponding to user `UserName`.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudPostgresqlModifyAccountRemarkOperationCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_postgresql_modify_account_remark_operation.create")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	var (
+		request      = postgresql.NewModifyAccountRemarkRequest()
+		dBInstanceId string
+	)
+	if v, ok := d.GetOk("db_instance_id"); ok {
+		request.DBInstanceId = helper.String(v.(string))
+		dBInstanceId = v.(string)
+	}
+
+	if v, ok := d.GetOk("user_name"); ok {
+		request.UserName = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("remark"); ok {
+		request.Remark = helper.String(v.(string))
+	}
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UsePostgresqlClient().ModifyAccountRemark(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 ModifyAccountRemarkOperation failed, reason:%+v", logId, err)
+		return err
+	}
+
+	d.SetId(dBInstanceId)
+
+	return resourceTencentCloudPostgresqlModifyAccountRemarkOperationRead(d, meta)
+}
+
+func resourceTencentCloudPostgresqlModifyAccountRemarkOperationRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_postgresql_modify_account_remark_operation.read")()
+	defer inconsistentCheck(d, meta)()
+
+	return nil
+}
+
+func resourceTencentCloudPostgresqlModifyAccountRemarkOperationDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_postgresql_modify_account_remark_operation.delete")()
+	defer inconsistentCheck(d, meta)()
+
+	return nil
+}