Add "include_data_disks" option, fixes #141

Since there is no way to correlate the disk IDs we get back from the DescribeInstances with the data disk definitions we have in our template, we can't selectively exclude data disks from the image. But at least this is better than nothing.

Author: Jalle19

.web-docs/components/builder/cvm/README.md

@@ -134,6 +134,8 @@ a [communicator](/packer/docs/templates/legacy_json_templates/communicator) can
   type for all data disks, and each data disk size will use the origin
   value in source image.
 
+- `include_data_disks` (bool) - Whether to include data disks in the resulting image. Defaults to true.
+
 - `vpc_id` (string) - Specify vpc your cvm will be launched by.
 
 - `vpc_name` (string) - Specify vpc name you will create. if `vpc_id` is not set, Packer will

builder/tencentcloud/cvm/builder.hcl2spec.go

@@ -60,6 +60,8 @@ type TencentCloudRunConfig struct {
 	// type for all data disks, and each data disk size will use the origin
 	// value in source image.
 	DataDisks []TencentCloudDataDisk `mapstructure:"data_disks"`
+	// Whether to include data disks in the resulting image. Defaults to true.
+	IncludeDataDisks bool `mapstructure:"include_data_disks" required:"false" default:"true"`
 	// Specify vpc your cvm will be launched by.
 	VpcId string `mapstructure:"vpc_id" required:"false"`
 	// Specify vpc name you will create. if `vpc_id` is not set, Packer will

builder/tencentcloud/cvm/run_config.go

@@ -28,12 +28,17 @@ func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) mul
 	req.ImageDescription = &config.ImageDescription
 	req.InstanceId = instance.InstanceId
 
-	// TODO: We should allow user to specify which data disk should be
-	// included into created image.
 	var dataDiskIds []*string
-	for _, disk := range instance.DataDisks {
-		dataDiskIds = append(dataDiskIds, disk.DiskId)
+	// There is no way to correlate instance disk IDs to our own data disk definitions,
+	// so the best we can do is to either include all disks or include none.
+	if config.IncludeDataDisks {
+		for _, disk := range instance.DataDisks {
+			dataDiskIds = append(dataDiskIds, disk.DiskId)
+		}
+	} else {
+		Message(state, "Not including configured data disks in the resulting image", "")
 	}
+
 	if len(dataDiskIds) > 0 {
 		req.DataDiskIds = dataDiskIds
 	}

builder/tencentcloud/cvm/step_create_image.go

@@ -28,6 +28,8 @@
   type for all data disks, and each data disk size will use the origin
   value in source image.
 
+- `include_data_disks` (bool) - Whether to include data disks in the resulting image. Defaults to true.
+
 - `vpc_id` (string) - Specify vpc your cvm will be launched by.
 
 - `vpc_name` (string) - Specify vpc name you will create. if `vpc_id` is not set, Packer will