Add image_tags attribute for setting tags on the created image (#105)

Author: hellertang

builder/tencentcloud/cvm/builder.hcl2spec.go

@@ -36,6 +36,8 @@ type TencentCloudImageConfig struct {
 	ImageShareAccounts []string `mapstructure:"image_share_accounts" required:"false"`
 	// Do not check region and zone when validate.
 	SkipValidation bool `mapstructure:"skip_region_validation" required:"false"`
+	// Key/value pair tags that will be applied to the resulting image.
+	ImageTags map[string]string `mapstructure:"image_tags" required:"false"`
 }
 
 func (cf *TencentCloudImageConfig) Prepare(ctx *interpolate.Context) []error {
@@ -74,6 +76,10 @@ func (cf *TencentCloudImageConfig) Prepare(ctx *interpolate.Context) []error {
 		cf.ImageCopyRegions = regions
 	}
 
+	if cf.ImageTags == nil {
+		cf.ImageTags = make(map[string]string)
+	}
+
 	if len(errs) > 0 {
 		return errs
 	}

builder/tencentcloud/cvm/image_config.go

@@ -34,4 +34,11 @@ func TestTencentCloudImageConfig_Prepare(t *testing.T) {
 	if err := cf.Prepare(nil); err != nil {
 		t.Fatalf("shouldn't have err:%v", err)
 	}
+
+	cf.ImageTags = map[string]string{
+		"createdBy": "packer",
+	}
+	if err := cf.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err:%v", err)
+	}
 }

builder/tencentcloud/cvm/image_config_test.go

@@ -52,6 +52,26 @@ func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) mul
 		req.Sysprep = &False
 	}
 
+	var tags []*cvm.Tag
+	for k, v := range config.ImageTags {
+		k := k
+		v := v
+		tags = append(tags, &cvm.Tag{
+			Key:   &k,
+			Value: &v,
+		})
+	}
+
+	resourceType := "image"
+	if len(tags) > 0 {
+		req.TagSpecification = []*cvm.TagSpecification{
+			{
+				ResourceType: &resourceType,
+				Tags:         tags,
+			},
+		}
+	}
+
 	err := Retry(ctx, func(ctx context.Context) error {
 		_, e := client.CreateImage(req)
 		return e

builder/tencentcloud/cvm/step_create_image.go

@@ -20,4 +20,6 @@
 
 - `skip_region_validation` (bool) - Do not check region and zone when validate.
 
+- `image_tags` (map[string]string) - Key/value pair tags that will be applied to the resulting image.
+
 <!-- End of code generated from the comments of the TencentCloudImageConfig struct in builder/tencentcloud/cvm/image_config.go; -->

docs-partials/builder/tencentcloud/cvm/TencentCloudImageConfig-not-required.mdx

@@ -12,20 +12,25 @@ variable "secret_key" {
 }
 
 source "tencentcloud-cvm" "example" {
-  associate_public_ip_address = true
-  disk_type                   = "CLOUD_PREMIUM"
-  image_name                  = "PackerTest"
-  instance_type               = "S4.SMALL1"
-  packer_debug                = true
-  region                      = "ap-guangzhou"
-  run_tags = {
+  disk_type     = "CLOUD_PREMIUM"
+  image_name    = "PackerTest"
+  instance_type = "SA2.MEDIUM2"
+  packer_debug  = true
+  region        = "ap-guangzhou"
+  run_tags      = {
     good = "luck"
   }
-  secret_id       = "${var.secret_id}"
-  secret_key      = "${var.secret_key}"
-  source_image_id = "img-oikl1tzv"
-  ssh_username    = "root"
-  zone            = "ap-guangzhou-4"
+  secret_id                   = "${var.secret_id}"
+  secret_key                  = "${var.secret_key}"
+  source_image_id             = "img-9qrfy1xt"
+  ssh_username                = "root"
+  zone                        = "ap-guangzhou-3"
+  security_group_id           = "sg-r7kju7cf"
+  associate_public_ip_address = true
+  image_tags                  = {
+    createdBy = "packer"
+    usedBy    = "test"
+  }
 }
 
 build {