feat: support import (#1958)

* feat: support import

* feat: add changelog

---------

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

Author: gitmkn

.changelog/1958.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_mysql_readonly_instance: support import
+```

go.mod

@@ -32,7 +32,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.409
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.520
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.688
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.699
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
@@ -41,7 +41,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.693
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.663
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.696
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.699
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692

go.sum

@@ -788,6 +788,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591 h1:TPGLjH6
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591/go.mod h1:nCAGfVTXZkVnurkbjF3b0FM6RwGztE9t8D9Ms1unaKo=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.688 h1:496SFS8Byk5FFBAbKgmnD7AemK5swkp21PKhOAC+HH4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.688/go.mod h1:W9nkytcj6/fzGhil86wGtD8oZmY1Z4JuwJ3m11/mWCg=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.699 h1:LhFt0HW7xPS1KamfnNrPk5F7NVu7q72DO9usnxyQPQ4=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.699/go.mod h1:wgCS1KCnSX7HbSI/mYghFSwfEDnZVeb3gwtPBXIppv4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539 h1:0L6nZhT2bToTc/n1z3HOpNgdu5VX5ulmqIuPY+8UozA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539/go.mod h1:6Syk7W5fdDf0BLvX+RXL5obQ6unkt3Id4aN2QqVrV6U=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627 h1:nChNdoCUWQZciiJj3gRCWoHBO/8LituLQOdCRREIrS4=
@@ -855,6 +857,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.693/go.mod
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.695/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.696 h1:DcHz4rxqICf1U+fgNaDLqCmaBxUl2EmPu4F1yfa6eIg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.696/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.699 h1:Unc4bMPZCAe964aOLHU05RAN59pMRNNy52E1fZ0My70=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.699/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624/go.mod h1:+TXSVyeKwt1IhZRqKPbTREteBcP+K07Q846/ilNzLWA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589 h1:LZihgirMH0vsaGScYexxwY0fTss9vHaSZs/YOQUVESg=

tencentcloud/resource_tc_mysql_readonly_instance.go

@@ -22,6 +22,12 @@ resource "tencentcloud_mysql_readonly_instance" "default" {
   }
 }
 ```
+Import
+
+mysql read-only database instances can be imported using the id, e.g.
+```
+terraform import tencentcloud_mysql_readonly_instance.default cdb-dnqksd9f
+```
 */
 package tencentcloud
 
@@ -70,6 +76,12 @@ func resourceTencentCloudMysqlReadonlyInstance() *schema.Resource {
 		Update: resourceTencentCloudMysqlReadonlyInstanceUpdate,
 		Delete: resourceTencentCloudMysqlReadonlyInstanceDelete,
 
+		Importer: &schema.ResourceImporter{
+			State: helper.ImportWithDefaultValue(map[string]interface{}{
+				"prepaid_period": 1,
+				"force_delete":   false,
+			}),
+		},
 		Schema: readonlyInstanceInfo,
 	}
 }
@@ -309,6 +321,81 @@ func resourceTencentCloudMysqlReadonlyInstanceRead(d *schema.ResourceData, meta
 	if err != nil {
 		return fmt.Errorf("Fail to get basic info from mysql, reaseon %s", err.Error())
 	}
+
+	mysqlInfo, errRet := mysqlService.DescribeDBInstanceById(ctx, d.Id())
+	if errRet != nil {
+		return fmt.Errorf("Describe mysql instance fails, reaseon %v", errRet.Error())
+	}
+	if mysqlInfo == nil {
+		d.SetId("")
+		return nil
+	}
+	if MysqlDelStates[*mysqlInfo.Status] {
+		mysqlInfo = nil
+		d.SetId("")
+		return nil
+	}
+
+	_ = d.Set("instance_name", *mysqlInfo.InstanceName)
+
+	_ = d.Set("charge_type", MYSQL_CHARGE_TYPE[int(*mysqlInfo.PayType)])
+	_ = d.Set("pay_type", -1)
+	_ = d.Set("period", -1)
+	if int(*mysqlInfo.PayType) == MysqlPayByMonth {
+		tempInt, _ := d.Get("prepaid_period").(int)
+		if tempInt == 0 {
+			_ = d.Set("prepaid_period", 1)
+		}
+	}
+
+	if *mysqlInfo.AutoRenew == MYSQL_RENEW_CLOSE {
+		*mysqlInfo.AutoRenew = MYSQL_RENEW_NOUSE
+	}
+	_ = d.Set("auto_renew_flag", int(*mysqlInfo.AutoRenew))
+	_ = d.Set("mem_size", mysqlInfo.Memory)
+	_ = d.Set("cpu", mysqlInfo.Cpu)
+	_ = d.Set("volume_size", mysqlInfo.Volume)
+	_ = d.Set("vpc_id", mysqlInfo.UniqVpcId)
+	_ = d.Set("subnet_id", mysqlInfo.UniqSubnetId)
+	_ = d.Set("device_type", mysqlInfo.DeviceType)
+
+	securityGroups, err := mysqlService.DescribeDBSecurityGroups(ctx, d.Id())
+	if err != nil {
+		sdkErr, ok := err.(*sdkError.TencentCloudSDKError)
+		if ok {
+			if sdkErr.Code == MysqlInstanceIdNotFound3 {
+				mysqlInfo = nil
+				d.SetId("")
+				return nil
+			}
+		}
+		return err
+	}
+	_ = d.Set("security_groups", securityGroups)
+
+	tcClient := meta.(*TencentCloudClient).apiV3Conn
+	tagService := &TagService{client: tcClient}
+	tags, err := tagService.DescribeResourceTags(ctx, "cdb", "instanceId", tcClient.Region, d.Id())
+	if err != nil {
+		return err
+	}
+
+	if err := d.Set("tags", tags); err != nil {
+		log.Printf("[CRITAL]%s provider set tags fail, reason:%s\n ", logId, err.Error())
+		return nil
+	}
+
+	_ = d.Set("intranet_ip", mysqlInfo.Vip)
+	_ = d.Set("intranet_port", int(*mysqlInfo.Vport))
+
+	if *mysqlInfo.CdbError != 0 {
+		_ = d.Set("locked", 1)
+	} else {
+		_ = d.Set("locked", 0)
+	}
+	_ = d.Set("status", mysqlInfo.Status)
+	_ = d.Set("task_status", mysqlInfo.TaskStatus)
+
 	return nil
 }
 

tencentcloud/resource_tc_mysql_readonly_instance_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 )
 
+// go test -i; go test -test.run TestAccTencentCloudMysqlReadonlyInstanceResource_basic -v
 func TestAccTencentCloudMysqlReadonlyInstanceResource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
@@ -31,6 +32,11 @@ func TestAccTencentCloudMysqlReadonlyInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mysql_readonly_instance.mysql_readonly", "tags.test", "test-tf"),
 				),
 			},
+			{
+				ResourceName:      "tencentcloud_mysql_readonly_instance.mysql_readonly",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// add tag
 			{
 				Config: testAccMysqlReadonlyInstance_multiTags(CommonPresetMysql, "read"),

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb/v20170320/client.go

@@ -1064,7 +1064,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat/v20180409
 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591
 ## explicit; go 1.14
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs/v20170312
-# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.688
+# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.699
 ## explicit; go 1.14
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb/v20170320
 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
@@ -1091,7 +1091,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.663
 ## explicit; go 1.14
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
-# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.696
+# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.699
 ## explicit; go 1.14
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors