remove parameter speccode

Author: gailwang

tencentcloud/data_source_tc_postgresql_instances_test.go

@@ -49,7 +49,6 @@ charge_type = "POSTPAID_BY_HOUR"
 engine_version		= "9.3.5"
 root_password                 = "1qaA2k1wgvfa3ZZZ"
 charset = "UTF8"
-spec_code = "cdb.pg.z1.2g"
 project_id = 0
 memory = 2
 storage = 100

tencentcloud/resource_tc_postgresql_instance.go

@@ -85,13 +85,12 @@ func resourceTencentCloudPostgresqlInstance() *schema.Resource {
 			"storage": {
 				Type:        schema.TypeInt,
 				Required:    true,
-				Description: "Disk size (in GB). Allowed value is range from 10 to 1000, and the value must be a multiple of 10.",
+				Description: "Disk size (in GB). Allowed value must be a multiple of 10. The storage must be set with the limit of `storage_min` and `storage_max` which data source `tencentcloud_postgresql_specinfos` provides.",
 			},
 			"memory": {
 				Type:        schema.TypeInt,
-				Optional:    true,
-				Computed:    true,
-				Description: "Memory size (in MB).",
+				Required:    true,
+				Description: "Memory size (in GB). Allowed value must be larger than `memory` that data source `tencentcloud_postgresql_specinfos` provides.",
 			},
 			"project_id": {
 				Type:        schema.TypeInt,
@@ -106,12 +105,6 @@ func resourceTencentCloudPostgresqlInstance() *schema.Resource {
 				Computed:    true,
 				Description: "Availability zone.",
 			},
-			"spec_code": {
-				Type:        schema.TypeString,
-				ForceNew:    true,
-				Required:    true,
-				Description: "The id of specification of the postgresql instance, like `cdb.pg.z1.2g`, which can be queried with data source `tencentcloud_postgresql_specinfos`.",
-			},
 			"root_password": {
 				Type:         schema.TypeString,
 				Required:     true,
@@ -175,28 +168,41 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 		name      = d.Get("name").(string)
 		dbVersion = d.Get("engine_version").(string)
 		payType   = d.Get("charge_type").(string)
-		specCode  = d.Get("spec_code").(string)
 		projectId = d.Get("project_id").(int)
 		subnetId  = d.Get("subnet_id").(string)
 		vpcId     = d.Get("vpc_id").(string)
 		zone      = d.Get("availability_zone").(string)
 		storage   = d.Get("storage").(int)
+		memory    = d.Get("memory").(int)
 	)
 
 	var period = 1
 	//the sdk asks to set value with 1 when paytype is postpaid
 
-	/*
-		if payType == COMMON_PAYTYPE_PREPAID {
-			payType = POSTGRESQL_PAYTYPE_PREPAID
-		} else {
-			payType = POSTGRESQL_PAYTYPE_POSTPAID
-		}
+	var instanceId, specCode string
+	var outErr, inErr error
 
-	*/
+	//get speccode with engine_version and memory
+	outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		speccodes, inErr := postgresqlService.DescribeSpecinfos(ctx, zone)
+		if inErr != nil {
+			return retryError(inErr)
+		}
+		for _, info := range speccodes {
+			if *info.Version == dbVersion && int(*info.Memory) == 1024*memory {
+				specCode = *info.SpecCode
+				break
+			}
+		}
+		return nil
+	})
+	if outErr != nil {
+		return outErr
+	}
 
-	var instanceId string
-	var outErr, inErr error
+	if specCode == "" {
+		return fmt.Errorf("there is no legal speccode matched with engine_version %s and memory %d matched, please check again", dbVersion, memory)
+	}
 
 	outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		instanceId, inErr = postgresqlService.CreatePostgresqlInstance(ctx, name, dbVersion, payType, specCode, 0, projectId, period, subnetId, vpcId, zone, storage)
@@ -215,6 +221,7 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 		if err != nil {
 			return retryError(err)
 		} else if has && *instance.DBInstanceStatus == "init" {
+			memory = int(*instance.DBInstanceMemory)
 			return nil
 		} else if !has {
 			return resource.NonRetryableError(fmt.Errorf("create postgresql instance fail"))

tencentcloud/resource_tc_postgresql_instance_test.go

@@ -27,9 +27,8 @@ func TestAccTencentCloudPostgresqlInstanceResource(t *testing.T) {
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "charge_type", "POSTPAID_BY_HOUR"),
 					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "vpc_id"),
 					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "subnet_id"),
-					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "memory", "2"),
+					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "memory", "4"),
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "storage", "100"),
-					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "spec_code", "cdb.pg.z1.2g"),
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "project_id", "0"),
 					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "create_time"),
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "public_access_switch", "false"),
@@ -57,7 +56,6 @@ func TestAccTencentCloudPostgresqlInstanceResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "subnet_id"),
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "memory", "4"),
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "storage", "250"),
-					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "spec_code", "cdb.pg.z1.2g"),
 					resource.TestCheckResourceAttrSet(testPostgresqlInstanceResourceKey, "create_time"),
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "project_id", "1154137"),
 					resource.TestCheckResourceAttr(testPostgresqlInstanceResourceKey, "public_access_switch", "true"),
@@ -138,10 +136,9 @@ resource "tencentcloud_postgresql_instance" "test" {
   subnet_id = "subnet-pyio7yog"
   engine_version		= "9.3.5"
   root_password                 = "1qaA2k1wgvfa3ZZZ"
-  charset = "UTF8"
-  spec_code = "cdb.pg.z1.2g"
+  charset = "LATIN1"
   project_id = 0
-  memory = 2
+  memory = 4
   storage = 100
 }
 `
@@ -155,8 +152,7 @@ resource "tencentcloud_postgresql_instance" "test" {
   subnet_id = "subnet-pyio7yog"
   engine_version		= "9.3.5"
   root_password                 = "1qaA2k1wgvfa3ZZZZ"
-  charset = "UTF8"
-  spec_code = "cdb.pg.z1.2g"
+  charset = "LATIN1"
   project_id = 1154137
   public_access_switch = true
   memory = 4

website/docs/r/postgresql_instance.html.markdown

@@ -18,15 +18,14 @@ Use this resource to create postgresql instance
 
 The following arguments are supported:
 
+* `memory` - (Required) Memory size (in GB). Allowed value must be larger than `memory` that data source `tencentcloud_postgresql_specinfos` provides.
 * `name` - (Required) Name of the postgresql instance.
 * `root_password` - (Required) Password of root account. This parameter can be specified when you purchase master instances, but it should be ignored when you purchase read-only instances or disaster recovery instances.
-* `spec_code` - (Required, ForceNew) The id of specification of the postgresql instance, like `cdb.pg.z1.2g`, which can be queried with data source `tencentcloud_postgresql_specinfos`.
-* `storage` - (Required) Disk size (in GB). Allowed value is range from 10 to 1000, and the value must be a multiple of 10.
+* `storage` - (Required) Disk size (in GB). Allowed value must be a multiple of 10. The storage must be set with the limit of `storage_min` and `storage_max` which data source `tencentcloud_postgresql_specinfos` provides.
 * `availability_zone` - (Optional, ForceNew) Availability zone.
 * `charge_type` - (Optional, ForceNew) Pay type of the postgresql instance. For now, only `POSTPAID_BY_HOUR` is valid.
 * `charset` - (Optional, ForceNew) Charset of the root account. Valid values are `UTF8`,`LATIN1`.
 * `engine_version` - (Optional, ForceNew) Version of the postgresql database engine. Allowed values are `9.3.5`, `9.5.4`, `10.4`.
-* `memory` - (Optional) Memory size (in MB).
 * `project_id` - (Optional) Project ID, default value is 0.
 * `public_access_switch` - (Optional) Indicates whether to enable the access to an instance from public network or not.
 * `subnet_id` - (Optional, ForceNew) ID of subnet.