add affinity

Author: hellertang

tencentcloud/services/cvm/resource_tc_placement_group.go

@@ -3,6 +3,9 @@ package cvm
 import (
 	"context"
 
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+	svctag "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tag"
+
 	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -34,6 +37,18 @@ func ResourceTencentCloudPlacementGroup() *schema.Resource {
 				ValidateFunc: tccommon.ValidateAllowedStringValue(CVM_PLACEMENT_GROUP_TYPE),
 				Description:  "Type of the placement group. Valid values: `HOST`, `SW` and `RACK`.",
 			},
+			"affinity": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: tccommon.ValidateIntegerInRange(1, 10),
+				Description:  "Affinity of the placement group.Valid values: 1~10, default is 1.",
+			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Tags of the placement group.",
+			},
 
 			// computed
 			"cvm_quota_total": {
@@ -65,10 +80,26 @@ func resourceTencentCloudPlacementGroupCreate(d *schema.ResourceData, meta inter
 	}
 	placementName := d.Get("name").(string)
 	placementType := d.Get("type").(string)
+
+	var affinity int
+	if v, ok := d.GetOkExists("affinity"); ok {
+		affinity = v.(int)
+	}
+
+	tags := make([]*cvm.Tag, 0)
+	if v := helper.GetTags(d, "tags"); len(v) > 0 {
+		for tagKey, tagValue := range v {
+			tag := cvm.Tag{
+				Key:   helper.String(tagKey),
+				Value: helper.String(tagValue),
+			}
+			tags = append(tags, &tag)
+		}
+	}
 	var id string
 	var errRet error
 	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-		id, errRet = cvmService.CreatePlacementGroup(ctx, placementName, placementType)
+		id, errRet = cvmService.CreatePlacementGroup(ctx, placementName, placementType, affinity, tags)
 		if errRet != nil {
 			return tccommon.RetryError(errRet)
 		}
@@ -116,6 +147,10 @@ func resourceTencentCloudPlacementGroupRead(d *schema.ResourceData, meta interfa
 	_ = d.Set("current_num", placement.CurrentNum)
 	_ = d.Set("create_time", placement.CreateTime)
 
+	if len(placement.Tags) > 0 {
+		_ = d.Set("tags", flattenInstanceTagsMapping(placement.Tags))
+	}
+
 	return nil
 }
 
@@ -142,6 +177,20 @@ func resourceTencentCloudPlacementGroupUpdate(d *schema.ResourceData, meta inter
 		}
 	}
 
+	if d.HasChange("tags") {
+		oldValue, newValue := d.GetChange("tags")
+		replaceTags, deleteTags := svctag.DiffTags(oldValue.(map[string]interface{}), newValue.(map[string]interface{}))
+
+		client := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
+		tagService := svctag.NewTagService(client)
+		region := client.Region
+		resourceName := tccommon.BuildTagResourceName("cvm", "ps", region, d.Id())
+		err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resourceTencentCloudPlacementGroupRead(d, meta)
 }
 

tencentcloud/services/cvm/resource_tc_placement_group.md

@@ -4,8 +4,12 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_placement_group" "foo" {
-  name = "test"
-  type = "HOST"
+  name     = "test"
+  type     = "HOST"
+  affinity = 2
+  tags     = {
+    createBy = "terraform"
+  }
 }
 ```
 

tencentcloud/services/cvm/service_tencentcloud_cvm.go

@@ -759,12 +759,24 @@ func (me *CvmService) BindKeyPair(ctx context.Context, keyIds []*string, instanc
 	return nil
 }
 
-func (me *CvmService) CreatePlacementGroup(ctx context.Context, placementName, placementType string) (placementId string, errRet error) {
+func (me *CvmService) CreatePlacementGroup(ctx context.Context, placementName, placementType string, affinity int, tags []*cvm.Tag) (placementId string, errRet error) {
 	logId := tccommon.GetLogId(ctx)
 	request := cvm.NewCreateDisasterRecoverGroupRequest()
 	request.Name = &placementName
 	request.Type = &placementType
 
+	if affinity != 0 {
+		request.Affinity = helper.IntInt64(affinity)
+	}
+
+	if len(tags) > 0 {
+		tagSpecification := cvm.TagSpecification{
+			ResourceType: helper.String("ps"),
+			Tags:         tags,
+		}
+		request.TagSpecification = append(request.TagSpecification, &tagSpecification)
+	}
+
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseCvmClient().CreateDisasterRecoverGroup(request)
 	if err != nil {
@@ -1905,3 +1917,11 @@ func (me *CvmService) DeleteCvmInstanceActionTimerById(ctx context.Context, acti
 
 	return
 }
+
+func flattenInstanceTagsMapping(list []*cvm.Tag) map[string]interface{} {
+	result := make(map[string]interface{}, len(list))
+	for _, v := range list {
+		result[*v.Key] = *v.Value
+	}
+	return result
+}

website/docs/r/placement_group.html.markdown

@@ -15,8 +15,12 @@ Provide a resource to create a placement group.
 
 ```hcl
 resource "tencentcloud_placement_group" "foo" {
-  name = "test"
-  type = "HOST"
+  name     = "test"
+  type     = "HOST"
+  affinity = 2
+  tags = {
+    createBy = "terraform"
+  }
 }
 ```
 
@@ -26,6 +30,8 @@ The following arguments are supported:
 
 * `name` - (Required, String) Name of the placement group, 1-60 characters in length.
 * `type` - (Required, String, ForceNew) Type of the placement group. Valid values: `HOST`, `SW` and `RACK`.
+* `affinity` - (Optional, Int, ForceNew) Affinity of the placement group.Valid values: 1~10, default is 1.
+* `tags` - (Optional, Map) Tags of the placement group.
 
 ## Attributes Reference