Merge pull request #507 from oliverpei/master

attachment support import

Author: Himer

CHANGELOG.md

@@ -3,6 +3,10 @@
 ENHANCEMENTS:
 
 * Resource: `tencentcloud_vpc_acl_attachment` perfect example field `subnet_ids` to `subnet_id`([#505](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/505)).
+* Resource: `tencentcloud_cbs_storage_attachment` support import.
+* Resource: `tencentcloud_eip_association` support import.
+* Resource: `tencentcloud_route_table_entry` support import.
+* Resource: `tencentcloud_acl_attachment` support import.
 
 ## 1.41.2 (August 28, 2020)
 

tencentcloud/resource_tc_cbs_storage_attachment.go

@@ -9,6 +9,14 @@ resource "tencentcloud_cbs_storage_attachment" "attachment" {
   instance_id = "ins-jqlegd42"
 }
 ```
+
+Import
+
+CBS storage attachment can be imported using the id, e.g.
+
+```
+$ terraform import tencentcloud_cbs_storage_attachment.attachment disk-41s6jwy4
+```
 */
 package tencentcloud
 
@@ -27,6 +35,9 @@ func resourceTencentCloudCbsStorageAttachment() *schema.Resource {
 		Create: resourceTencentCloudCbsStorageAttachmentCreate,
 		Read:   resourceTencentCloudCbsStorageAttachmentRead,
 		Delete: resourceTencentCloudCbsStorageAttachmentDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"storage_id": {

tencentcloud/resource_tc_cbs_storage_attachment_test.go

@@ -25,6 +25,11 @@ func TestAccTencentCloudCbsStorageAttachment(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_cbs_storage_attachment.foo", "instance_id"),
 				),
 			},
+			{
+				ResourceName:      "tencentcloud_cbs_storage_attachment.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

tencentcloud/resource_tc_eip_association.go

@@ -21,6 +21,14 @@ resource "tencentcloud_eip_association" "bar" {
   private_ip           = "10.0.1.22"
 }
 ```
+
+Import
+
+Eip association can be imported using the id, e.g.
+
+```
+$ terraform import tencentcloud_eip_association.bar eip-41s6jwy4::ins-34jwj3
+```
 */
 package tencentcloud
 
@@ -41,6 +49,9 @@ func resourceTencentCloudEipAssociation() *schema.Resource {
 		Create: resourceTencentCloudEipAssociationCreate,
 		Read:   resourceTencentCloudEipAssociationRead,
 		Delete: resourceTencentCloudEipAssociationDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"eip_id": {

tencentcloud/resource_tc_eip_association_test.go

@@ -29,6 +29,11 @@ func TestAccTencentCloudEipAssociationWithInstance(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_eip.foo", "status", "UNBIND"),
 				),
 			},
+			{
+				ResourceName:      id,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

tencentcloud/resource_tc_route_table_entry.go

@@ -34,6 +34,14 @@ resource "tencentcloud_route_table_entry" "instance" {
   description            = "ci-test-route-table-entry"
 }
 ```
+
+Import
+
+Route table entry can be imported using the id, e.g.
+
+```
+$ terraform import tencentcloud_route_table_entry.foo 83517.rtb-mlhpg09u
+```
 */
 package tencentcloud
 
@@ -53,6 +61,9 @@ func resourceTencentCloudVpcRouteEntry() *schema.Resource {
 		Create: resourceTencentCloudVpcRouteEntryCreate,
 		Read:   resourceTencentCloudVpcRouteEntryRead,
 		Delete: resourceTencentCloudVpcRouteEntryDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"route_table_id": {

tencentcloud/resource_tc_route_table_entry_test.go

@@ -31,6 +31,11 @@ func TestAccTencentCloudVpcV3RouteEntryBasic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_route_table_entry.foo", "next_hub", "0"),
 				),
 			},
+			{
+				ResourceName:      "tencentcloud_route_table_entry.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

tencentcloud/resource_tc_vpc_acl_attachment.go

@@ -24,12 +24,19 @@ resource "tencentcloud_vpc_acl_attachment" "attachment"{
 		subnet_id = data.tencentcloud_vpc_instances.id_instances.instance_list[0].subnet_ids[0]
 }
 ```
+
+Import
+
+Acl attachment can be imported using the id, e.g.
+
+```
+$ terraform import tencentcloud_vpc_acl_attachment.attachment acl-eotx5qsg#subnet-91x0geu6
+```
 */
 package tencentcloud
 
 import (
 	"context"
-	"fmt"
 	"log"
 	"strings"
 
@@ -96,18 +103,27 @@ func resourceTencentCloudVpcAclAttachmentRead(d *schema.ResourceData, meta inter
 		ctx          = context.WithValue(context.TODO(), logIdKey, logId)
 		service      = VpcService{client: meta.(*TencentCloudClient).apiV3Conn}
 		attachmentId = d.Id()
-		aclId        string
 	)
 
-	aclId = strings.Split(attachmentId, FILED_SP)[0]
+	idSplit := strings.Split(attachmentId, FILED_SP)
+	if len(idSplit) < 2 {
+		d.SetId("")
+		return nil
+	}
+	aclId := idSplit[0]
+	subnetId := idSplit[1]
 	results, err := service.DescribeNetWorkAcls(ctx, aclId, "", "")
 	if err != nil {
 		return err
 	}
-	if len(results) > 0 && len(results[0].SubnetSet) < 1 {
+	if len(results) < 1 || len(results[0].SubnetSet) < 1 {
 		d.SetId("")
-		return fmt.Errorf("[TECENT_TERRAFORM_CHECK][ACL attachment][Read] check: ACL attachment  is not exist")
+		return nil
 	}
+
+	_ = d.Set("acl_id", aclId)
+	_ = d.Set("subnet_id", subnetId)
+
 	return nil
 
 }

tencentcloud/resource_tc_vpc_acl_attachment_test.go

@@ -22,6 +22,11 @@ func TestAccTencentCloudVpcAclAttachment_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_vpc_acl_attachment.attachment", "acl_id"),
 				),
 			},
+			{
+				ResourceName:      "tencentcloud_vpc_acl_attachment.attachment",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

tencentcloud/resource_tc_vpc_acl_test.go

@@ -24,6 +24,11 @@ func TestAccTencentCloudVpcAcl_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_vpc_acl.foo", "egress.#", "2"),
 				),
 			},
+			{
+				ResourceName:      "tencentcloud_vpc_acl.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }