fix: suport import vpc (#1605)

* fix: suport import vpc

* fix: update field properties

* feat: add changelog

---------

Co-authored-by: anonymous <anonymous@mail.org>

Author: gitmkn

.changelog/1605.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_mysql_instance: import support vpc_id and subnet_id
+```

tencentcloud/resource_tc_mysql_instance.go

@@ -157,12 +157,14 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 		"vpc_id": {
 			Type:         schema.TypeString,
 			Optional:     true,
+			Computed:     true,
 			ValidateFunc: validateStringLengthInRange(1, 100),
 			Description:  "ID of VPC, which can be modified once every 24 hours and can't be removed.",
 		},
 		"subnet_id": {
 			Type:         schema.TypeString,
 			Optional:     true,
+			Computed:     true,
 			ValidateFunc: validateStringLengthInRange(1, 100),
 			Description:  "Private network ID. If `vpc_id` is set, this value is required.",
 		},
@@ -798,12 +800,8 @@ func tencentMsyqlBasicInfoRead(ctx context.Context, d *schema.ResourceData, meta
 	_ = d.Set("mem_size", mysqlInfo.Memory)
 	_ = d.Set("cpu", mysqlInfo.Cpu)
 	_ = d.Set("volume_size", mysqlInfo.Volume)
-	if d.Get("vpc_id").(string) != "" {
-		errRet = d.Set("vpc_id", mysqlInfo.UniqVpcId)
-	}
-	if d.Get("subnet_id").(string) != "" {
-		errRet = d.Set("subnet_id", mysqlInfo.UniqSubnetId)
-	}
+	_ = d.Set("vpc_id", mysqlInfo.UniqVpcId)
+	_ = d.Set("subnet_id", mysqlInfo.UniqSubnetId)
 
 	isUniversal := mysqlInfo.DeviceType != nil && *mysqlInfo.DeviceType == "UNIVERSAL"
 	if _, ok := d.GetOk("device_type"); ok || !isUniversal {

tencentcloud/resource_tc_mysql_instance_test.go

@@ -95,6 +95,7 @@ func testSweepMySQLInstance(region string) error {
 	return nil
 }
 
+// go test -i; go test -test.run TestAccTencentCloudMysqlInstanceResource_prepaid -v
 func TestAccTencentCloudMysqlInstanceResource_prepaid(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY) },
@@ -107,6 +108,8 @@ func TestAccTencentCloudMysqlInstanceResource_prepaid(t *testing.T) {
 					testAccCheckMysqlMasterInstanceExists("tencentcloud_mysql_instance.prepaid"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.prepaid", "id"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.prepaid", "charge_type", "PREPAID"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.prepaid", "vpc_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.prepaid", "subnet_id"),
 				),
 			},
 			{