Merge branch 'master' into master

Author: ChrisdeR

CHANGELOG.md

@@ -1,10 +1,17 @@
-## 1.53.7 (Unreleased)
-## 1.53.6 (March 01, 2021)
+## 1.53.8 (Unreleased)
+## 1.53.7 (March 09, 2021)
 
 ENHANCEMENTS:
 
 * Resource `tencentcloud_kubernetes_node_pool` add `internet_max_bandwidth_out`, `public_ip_assigned` to support internet traffic setting.
 
+## 1.53.6 (March 09, 2021)
+
+ENHANCEMENTS:
+* Resource `tencentcloud_eip` support `internet_max_bandwidth_out` modification.
+* Resource `tencentcloud_kubernetes_cluster` add `hostname` to support node hostname setting.
+* Resource `tencentcloud_kubernetes_scale_worker` add `hostname` to support node hostname setting.
+
 ## 1.53.5 (March 01, 2021)
 
 ENHANCEMENTS:

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v1.0.88
+	github.com/tencentcloud/tencentcloud-sdk-go v1.0.112
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -441,8 +441,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.88 h1:PUrfD1dbgh/DC7YMZud27vBgLd6qq2BInHZvBg3vU3U=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.88/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.112 h1:/vDVXeIWSVteNNJULedeWnqrcQxJlMDSQfxdwkc2XgI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.112/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/connectivity/transport.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-const ReqClient = "Terraform-v1.53.5"
+const ReqClient = "Terraform-v1.53.6"
 
 type LogRoundTripper struct {
 }

tencentcloud/resource_tc_eip.go

@@ -87,7 +87,6 @@ func resourceTencentCloudEip() *schema.Resource {
 			"internet_max_bandwidth_out": {
 				Type:        schema.TypeInt,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "The bandwidth limit of EIP, unit is Mbps.",
 			},
 			"tags": {
@@ -271,6 +270,17 @@ func resourceTencentCloudEipUpdate(d *schema.ResourceData, meta interface{}) err
 		d.SetPartial("name")
 	}
 
+	if d.HasChange("internet_max_bandwidth_out") {
+		if v, ok := d.GetOk("internet_max_bandwidth_out"); ok {
+			bandwidthOut := v.(int)
+			err := vpcService.ModifyEipBandwidthOut(ctx, eipId, bandwidthOut)
+			if err != nil {
+				return err
+			}
+			d.SetPartial("internet_max_bandwidth_out")
+		}
+	}
+
 	if d.HasChange("tags") {
 		oldTags, newTags := d.GetChange("tags")
 		replaceTags, deleteTags := diffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
@@ -282,6 +292,7 @@ func resourceTencentCloudEipUpdate(d *schema.ResourceData, meta interface{}) err
 		}
 		d.SetPartial("tags")
 	}
+
 	d.Partial(false)
 
 	return resourceTencentCloudEipRead(d, meta)

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -459,6 +459,15 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "CAM role name authorized to access.",
 		},
+		"hostname": {
+			Type:     schema.TypeString,
+			ForceNew: true,
+			Optional: true,
+			Description: "The host name of the attached instance. " +
+				"Dot (.) and dash (-) cannot be used as the first and last characters of HostName and cannot be used consecutively. " +
+				"Windows example: The length of the name character is [2, 15], letters (capitalization is not restricted), numbers and dashes (-) are allowed, dots (.) are not supported, and not all numbers are allowed. " +
+				"Examples of other types (Linux, etc.): The character length is [2, 60], and multiple dots are allowed. There is a segment between the dots. Each segment allows letters (with no limitation on capitalization), numbers and dashes (-).",
+		},
 	}
 }
 
@@ -1069,6 +1078,10 @@ func tkeGetCvmRunInstancesPara(dMap map[string]interface{}, meta interface{},
 	}
 	request.InstanceCount = &count
 
+	if v, ok := dMap["hostname"]; ok {
+		request.HostName = helper.String(v.(string))
+	}
+
 	cvmJson = request.ToJsonString()
 
 	cvmJson = strings.Replace(cvmJson, `"Password":"",`, "", -1)

tencentcloud/service_tencentcloud_vpc.go

@@ -1922,6 +1922,25 @@ func (me *VpcService) ModifyEipName(ctx context.Context, eipId, eipName string)
 	return nil
 }
 
+func (me *VpcService) ModifyEipBandwidthOut(ctx context.Context, eipId string, bandwidthOut int) error {
+	logId := getLogId(ctx)
+	request := vpc.NewModifyAddressesBandwidthRequest()
+	request.AddressIds = []*string{&eipId}
+	request.InternetMaxBandwidthOut = helper.IntInt64(bandwidthOut)
+
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseVpcClient().ModifyAddressesBandwidth(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 err
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	return nil
+}
+
 func (me *VpcService) DeleteEip(ctx context.Context, eipId string) error {
 	logId := getLogId(ctx)
 	request := vpc.NewReleaseAddressesRequest()