Merge pull request #1485 from tencentcloudstack/feat/add_service_type

add service type for vpc endpoint

Author: tongyiming

.changelog/1485.txt

@@ -0,0 +1,8 @@
+```release-note:enhancement
+resource/tencentcloud_vpc_end_point_service: support service type.
+```
+
+```release-note:new-resource
+tencentcloud_vpc_end_point_service_white_list
+```
+

go.mod

@@ -35,7 +35,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.564
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.569
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.488
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
@@ -78,7 +78,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.529
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.549
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.515
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.569
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.40
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1

go.sum

@@ -534,6 +534,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553/go.mod
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.562/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.564 h1:nAs/LXDw+ut10MI0TmWO+lejvGyqXLIk5Wefzru7MWM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.564/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.569 h1:ucwAQxGji/1kHSsnFf/w/BJ35rU7lFaUAq+uUKzwufE=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.569/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445 h1:Bh7XD0ypNMHYyBOM8hhKsSu+y0VVKUnJVS+YKKhfpGg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445/go.mod h1:jMDD351efCFpT1+KVFbcpu6SbmP4TYmp4qkoCfr63nQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553 h1:Pl1kYgFhJp0QSoVFSzRsiGk+HfEAkBTQg7+O60tytNA=
@@ -635,6 +637,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199/go.mod h1:Yw6OQ33z3s4k0HVYTNSffB12qOzEJ2Zf1Vj4+5S3sRs=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.515 h1:OWA3zSqC+tY42DwnlzAZVNYkB5dWgcwk435n+84jXNM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.515/go.mod h1:LGZP3nY3duqIACvT7Xi+wjWKpJvibZh71JgZX39nUNI=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.569 h1:rrtTVqu44XEXf88RDE0G7dgT+MwR1XA/YfM11a/+F5g=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.569/go.mod h1:Xt85jPTJISGWwEq1NSpPvoMZ8h/lxhUXdoH7pFQ9PPU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJPnZ9GvA677cTB6ELBR6B68wCR2QY1sNoGQc4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199/go.mod h1:nnY91/H3j/Gu7V/oCA6Zeg8T5D3q36EUdBh4EjmHwqY=
 github.com/tencentyun/cos-go-sdk-v5 v0.7.38 h1:EsMD39fDk5GRD8ouOcHG5MAb0CIT0ndDm6kZgSAYuBg=

tencentcloud/provider.go

@@ -630,6 +630,7 @@ Private Link(PLS)
   Resource
 	tencentcloud_vpc_end_point_service
 	tencentcloud_vpc_end_point
+	tencentcloud_vpc_end_point_service_white_list
 
 Flow Logs(FL)
   Resource

tencentcloud/resource_tc_vpc_end_point_service.go

@@ -9,6 +9,7 @@ resource "tencentcloud_vpc_end_point_service" "end_point_service" {
   end_point_service_name = "terraform-endpoint-service"
   auto_accept_flag = false
   service_instance_id = "lb-o5f6x7ke"
+  service_type = "CLB"
 }
 ```
 
@@ -67,6 +68,13 @@ func resourceTencentCloudVpcEndPointService() *schema.Resource {
 				Description: "Id of service instance, like lb-xxx.",
 			},
 
+			"service_type": {
+				Optional:    true,
+				Computed:    true,
+				Type:        schema.TypeString,
+				Description: "Type of service instance, like `CLB`, `CDB`, `CRS`, default is `CLB`.",
+			},
+
 			"service_owner": {
 				Computed:    true,
 				Type:        schema.TypeString,
@@ -121,6 +129,10 @@ func resourceTencentCloudVpcEndPointServiceCreate(d *schema.ResourceData, meta i
 		request.ServiceInstanceId = helper.String(v.(string))
 	}
 
+	if v, ok := d.GetOk("service_type"); ok {
+		request.ServiceType = helper.String(v.(string))
+	}
+
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		result, e := meta.(*TencentCloudClient).apiV3Conn.UseVpcClient().CreateVpcEndPointService(request)
 		if e != nil {
@@ -181,6 +193,10 @@ func resourceTencentCloudVpcEndPointServiceRead(d *schema.ResourceData, meta int
 		_ = d.Set("service_instance_id", endPointService.ServiceInstanceId)
 	}
 
+	if endPointService.ServiceType != nil {
+		_ = d.Set("service_type", endPointService.ServiceType)
+	}
+
 	if endPointService.ServiceOwner != nil {
 		_ = d.Set("service_owner", endPointService.ServiceOwner)
 	}
@@ -218,6 +234,7 @@ func resourceTencentCloudVpcEndPointServiceUpdate(d *schema.ResourceData, meta i
 
 	unsupportedUpdateFields := []string{
 		"vpc_id",
+		"service_type",
 	}
 	for _, field := range unsupportedUpdateFields {
 		if d.HasChange(field) {

tencentcloud/resource_tc_vpc_end_point_service_test.go

@@ -34,6 +34,7 @@ resource "tencentcloud_vpc_end_point_service" "end_point_service" {
   end_point_service_name = "terraform-endpoint-service"
   auto_accept_flag = false
   service_instance_id = "lb-6ksdvyqw"
+  service_type = "CLB"
 }
 
 `