Merge pull request #510 from ttomzhou/master

1、resource instance support data disk with SnapshotId；2、add image res…

Author: gailwang

CHANGELOG.md

@@ -1,7 +1,12 @@
 ## 1.42.3 (Unreleased)
 
+FEATURES:
+
+* **New Resource**: `tencentcloud_image`
+
 ENHANCEMENTS:
 
+* Resource: `tencentcloud_instance` add new argument `data_disk_snapshot_id` to support data disk with `SnapshotId`([#469](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/469))
 * Data Source: `tencentcloud_instances` support filter by tags.
 
 ## 1.42.2 (September 14, 2020)
@@ -12,6 +17,7 @@ BUG FIXES:
 ## 1.42.1 (September 10, 2020)
 
 BUG FIXES:
+
 * Resource: `tencentcloud_mongodb_instance` Fix the error of releasing associated resources when destroying mongodb postpaid instance.
 * Resource: `tencentcloud_mongodb_sharding_instance` Fix the error of releasing associated resources when destroying mongodb postpaid sharding instance.
 * Resource: `tencentcloud_mongodb_standby_instance` Fix the error of releasing associated resources when destroying mongodb postpaid standby instance.

examples/tencentcloud-image/main.tf

@@ -0,0 +1,12 @@
+provider "tencentcloud" {
+  region = "ap-guangzhou"
+}
+
+resource "tencentcloud_image" "image_instance" {
+   image_name         = var.image_imstance_name
+   instance_id        = "ins-2ju245xg"
+   data_disk_ids      = ["disk-gii0vtwi"]
+   force_poweroff     = true
+   sysprep            = false
+   image_description  = "create image with instance"
+}

examples/tencentcloud-image/variables.tf

@@ -0,0 +1,3 @@
+variable "image_imstance_name" {
+    default = "image-instance-keep"
+}

examples/tencentcloud-image/version.tf

@@ -0,0 +1,3 @@
+terraform {
+  required_version = ">= 0.12"
+}

tencentcloud/extension_images.go

@@ -0,0 +1,6 @@
+package tencentcloud
+
+const (
+	TRUE  = "true"
+	FALSE = "false"
+)

tencentcloud/provider.go

@@ -200,6 +200,7 @@ CVM
     tencentcloud_key_pair
     tencentcloud_placement_group
     tencentcloud_reserved_instance
+    tencentcloud_image
 
 Direct Connect(DC)
   Data Source
@@ -761,6 +762,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_ckafka_user":                     resourceTencentCloudCkafkaUser(),
 			"tencentcloud_ckafka_acl":                      resourceTencentCloudCkafkaAcl(),
 			"tencentcloud_ckafka_topic":                    resourceTencentCloudCkafkaTopic(),
+			"tencentcloud_image":                           resourceTencentCloudImage(),
 		},
 
 		ConfigureFunc: providerConfigure,

tencentcloud/resource_tc_image.go

@@ -0,0 +1,289 @@
+/*
+Provide a resource to manage image.
+
+Example Usage
+
+```hcl
+resource "tencentcloud_image" "image_snap" {
+	image_name   		= "image-snapshot-keep"
+	snapshot_ids 		= ["snap-nbp3xy1d", "snap-nvzu3dmh"]
+	force_poweroff 		= true
+	image_description 	= "create image with snapshot"
+}
+```
+
+Import
+
+image instance can be imported using the id, e.g.
+
+```
+$ terraform import tencentcloud_image.image_snap img-gf7jspk6
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
+)
+
+func resourceTencentCloudImage() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudImageCreate,
+		Read:   resourceTencentCloudImageRead,
+		Update: resourceTencentCloudImageUpdate,
+		Delete: resourceTencentCloudImageDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"image_name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Image name.",
+			},
+			"instance_id": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				ExactlyOneOf: []string{"snapshot_ids"},
+				Description:  "Cloud server instance ID.",
+			},
+			"snapshot_ids": {
+				Type:         schema.TypeSet,
+				Optional:     true,
+				ForceNew:     true,
+				ExactlyOneOf: []string{"instance_id"},
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Description: "Cloud disk snapshot ID list; creating a mirror based on a snapshot must include a system disk snapshot. It cannot be passed in simultaneously with InstanceId.",
+			},
+			"image_description": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Image Description.",
+			},
+			"force_poweroff": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Set whether to force shutdown during mirroring. The default value is false, when set to true, it means that the mirror will be made after shutdown.",
+			},
+			"sysprep": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Description: "Sysprep function under Windows. When creating a Windows image, you can select true or false to enable or disable the Syspre function.",
+			},
+			"data_disk_ids": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Description: "Cloud disk id list, When creating a whole machine image based on an instance, specify the data disk Id contained in the image.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudImageCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_image.create")()
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	cvmService := CvmService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+
+	request := cvm.NewCreateImageRequest()
+	request.ImageName = helper.String(d.Get("image_name").(string))
+	if d.Get("force_poweroff").(bool) {
+		request.ForcePoweroff = helper.String(TRUE)
+	} else {
+		request.ForcePoweroff = helper.String(FALSE)
+	}
+
+	if v, ok := d.GetOk("image_description"); ok {
+		request.ImageDescription = helper.String(v.(string))
+	}
+	if v, ok := d.GetOkExists("sysprep"); ok {
+		value := v.(bool)
+		if value {
+			request.Sysprep = helper.String(TRUE)
+		} else {
+			request.Sysprep = helper.String(FALSE)
+		}
+	}
+	if v, ok := d.GetOk("data_disk_ids"); ok {
+		diskIds := v.(*schema.Set).List()
+		diskArr := make([]*string, 0, len(diskIds))
+		for _, id := range diskIds {
+			diskArr = append(diskArr, helper.String(id.(string)))
+		}
+		request.DataDiskIds = diskArr
+	}
+	if v, ok := d.GetOk("instance_id"); ok {
+		request.InstanceId = helper.String(v.(string))
+	}
+	if v, ok := d.GetOk("snapshot_ids"); ok {
+		ids := v.(*schema.Set).List()
+		snapshotIds := make([]*string, 0, len(ids))
+		for _, v := range ids {
+			snapshotIds = append(snapshotIds, helper.String(v.(string)))
+		}
+		request.SnapshotIds = snapshotIds
+	}
+
+	if len(request.SnapshotIds) > 0 && len(request.DataDiskIds) > 0 {
+		return fmt.Errorf("`%s` and `%s` Can't appear in the profile China at the same time,The parameter `%s` depends on the pre_parameter `%s`",
+			"snapshot_ids", "data_disk_ids", "data_disk_ids", "instance_id")
+	}
+
+	imageId := ""
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		response, err := cvmService.client.UseCvmClient().CreateImage(request)
+		if err != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), err.Error())
+			return retryError(err)
+		}
+		imageId = *response.Response.ImageId
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	d.SetId(imageId)
+
+	// wait for status
+	_, has, errRet := cvmService.DescribeImageById(ctx, imageId, false)
+	if errRet != nil {
+		return errRet
+	}
+	if !has {
+		return fmt.Errorf("[CRITAL]%s creating cvm image failed, image doesn't exist", logId)
+	}
+
+	return resourceTencentCloudImageRead(d, meta)
+}
+
+func resourceTencentCloudImageRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_image.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	imageId := d.Id()
+	cvmService := CvmService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+
+	image, has, errRet := cvmService.DescribeImageById(ctx, imageId, false)
+	if errRet != nil {
+		return errRet
+	}
+	if !has {
+		d.SetId("")
+		return nil
+	}
+
+	_ = d.Set("image_name", image.ImageName)
+	if image.ImageDescription != nil && *image.ImageDescription != "" {
+		_ = d.Set("image_description", image.ImageDescription)
+	}
+
+	// Use the resource value when the instance_id in the resource is not empty.
+	// the instance ID is not returned in the query response body.
+	instanceId := ""
+	if v, ok := d.GetOk("instance_id"); ok {
+		instanceId = v.(string)
+	}
+
+	snapShotSysDisk := make([]interface{}, 0, len(image.SnapshotSet))
+	for _, v := range image.SnapshotSet {
+		snapShotSysDisk = append(snapShotSysDisk, v.SnapshotId)
+	}
+
+	if instanceId != "" {
+		_ = d.Set("instance_id", helper.String(instanceId))
+	} else {
+		_ = d.Set("snapshot_ids", snapShotSysDisk)
+	}
+
+	return nil
+}
+
+func resourceTencentCloudImageUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_image.update")()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	instanceId := d.Id()
+	cvmService := CvmService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+
+	if d.HasChange("image_name") || d.HasChange("image_description") {
+		imageName := d.Get("image_name").(string)
+		imageDesc := d.Get("image_description").(string)
+
+		if err := cvmService.ModifyImage(ctx, instanceId, imageName, imageDesc); nil != err {
+			return err
+		}
+	}
+
+	return resourceTencentCloudImageRead(d, meta)
+}
+
+func resourceTencentCloudImageDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_image.delete")()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	cvmService := CvmService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+
+	imageId := d.Id()
+
+	if err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		e := cvmService.DeleteImage(ctx, imageId)
+		if e != nil {
+			return retryError(e)
+		}
+		return nil
+	}); nil != err {
+		return err
+	}
+
+	//check image
+	if err := resource.Retry(3*readRetryTimeout, func() *resource.RetryError {
+		_, has, err := cvmService.DescribeImageById(ctx, imageId, true)
+		if err != nil {
+			return retryError(err)
+		}
+		if has {
+			return resource.RetryableError(fmt.Errorf("image exits error,image_id = %s", imageId))
+		}
+		return nil
+	}); nil != err {
+		return err
+	}
+
+	return nil
+}