Use Trilean instead of boolean for IncludeDataDisks

"default" annotation has no effect, so we need to use a data type that supports "true/false/unset"

Author: Jalle19

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

@@ -134,7 +134,7 @@ 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.
+- `include_data_disks` (boolean) - Whether to include data disks in the resulting image. Defaults to true.
 
 - `vpc_id` (string) - Specify vpc your cvm will be launched by.
 

builder/tencentcloud/cvm/builder.hcl2spec.go

@@ -61,7 +61,7 @@ type TencentCloudRunConfig struct {
 	// 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"`
+	IncludeDataDisks config.Trilean `mapstructure:"include_data_disks" required:"false"`
 	// 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
@@ -115,6 +115,11 @@ var ValidCBSType = []string{
 }
 
 func (cf *TencentCloudRunConfig) Prepare(ctx *interpolate.Context) []error {
+	// Include data disks by default
+	if cf.IncludeDataDisks != config.TriFalse {
+		cf.IncludeDataDisks = config.TriTrue
+	}
+
 	packerId := fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID()[:8])
 	if cf.Comm.SSHKeyPairName == "" && cf.Comm.SSHTemporaryKeyPairName == "" &&
 		cf.Comm.SSHPrivateKeyFile == "" && cf.Comm.SSHPassword == "" && cf.Comm.WinRMPassword == "" {

builder/tencentcloud/cvm/run_config.go

@@ -6,7 +6,6 @@ package cvm
 import (
 	"context"
 	"fmt"
-
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
@@ -31,7 +30,7 @@ func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) mul
 	var dataDiskIds []*string
 	// 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 {
+	if config.IncludeDataDisks.True() {
 		for _, disk := range instance.DataDisks {
 			dataDiskIds = append(dataDiskIds, disk.DiskId)
 		}

builder/tencentcloud/cvm/step_create_image.go

@@ -28,7 +28,7 @@
   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.
+- `include_data_disks` (boolean) - Whether to include data disks in the resulting image. Defaults to true.
 
 - `vpc_id` (string) - Specify vpc your cvm will be launched by.