Skip to content

Commit ea3f45c

Browse files
authored
update tem gateway (#1217)
1 parent 386e073 commit ea3f45c

File tree

3 files changed

+20
-32
lines changed

3 files changed

+20
-32
lines changed

tencentcloud/resource_tc_clb_target_group.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@ resource "tencentcloud_clb_target_group" "test"{
1010
}
1111
```
1212
13-
Create target group
14-
15-
```hcl
16-
resource "tencentcloud_clb_target_group" "test"{
17-
target_group_name = "hello1"
18-
port = 18082
19-
target_group_instances {
20-
bind_ip = "10.0.0.4"
21-
port = 18080
22-
}
23-
}
24-
```
2513
2614
Import
2715
@@ -73,6 +61,8 @@ func resourceTencentCloudClbTargetGroup() *schema.Resource {
7361
Type: schema.TypeList,
7462
Optional: true,
7563
Description: "The backend server of target group bind.",
64+
Deprecated: "It has been deprecated from version 1.77.3. " +
65+
"please use `tencentcloud_clb_target_group_instance_attachment` instead.",
7666
Elem: &schema.Resource{
7767
Schema: map[string]*schema.Schema{
7868
"bind_ip": {

tencentcloud/service_tencentcloud_tem.go

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ package tencentcloud
22

33
import (
44
"context"
5+
"fmt"
56
"log"
67

8+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
9+
710
tem "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem/v20210701"
811
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
912
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
@@ -418,16 +421,24 @@ func (me *TemService) DescribeTemGateway(ctx context.Context, environmentId stri
418421
request.IngressName = &ingressName
419422
request.ClusterNamespace = helper.String("default")
420423

421-
response, err := me.client.UseTemClient().DescribeIngress(request)
424+
err := resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
425+
response, errRet := me.client.UseTemClient().DescribeIngress(request)
426+
if errRet != nil {
427+
return retryError(errRet, InternalError)
428+
}
429+
gateway = response.Response.Result
430+
if *gateway.ClbId != "" && *gateway.Vip != "" {
431+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
432+
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
433+
return nil
434+
}
435+
return resource.RetryableError(fmt.Errorf("gateway clb is not ready..."))
436+
})
437+
422438
if err != nil {
423-
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
424-
logId, request.GetAction(), request.ToJsonString(), err.Error())
425439
errRet = err
426440
return
427441
}
428-
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
429-
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
430-
gateway = response.Response.Result
431442
return
432443
}
433444

website/docs/r/clb_target_group.html.markdown

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,12 @@ resource "tencentcloud_clb_target_group" "test" {
2020
}
2121
```
2222

23-
Create target group
24-
25-
```hcl
26-
resource "tencentcloud_clb_target_group" "test" {
27-
target_group_name = "hello1"
28-
port = 18082
29-
target_group_instances {
30-
bind_ip = "10.0.0.4"
31-
port = 18080
32-
}
33-
}
34-
```
35-
3623
## Argument Reference
3724

3825
The following arguments are supported:
3926

4027
* `port` - (Optional, Int) The default port of target group, add server after can use it.
41-
* `target_group_instances` - (Optional, List) The backend server of target group bind.
28+
* `target_group_instances` - (Optional, List, **Deprecated**) It has been deprecated from version 1.77.3. please use `tencentcloud_clb_target_group_instance_attachment` instead. The backend server of target group bind.
4229
* `target_group_name` - (Optional, String) Target group name.
4330
* `vpc_id` - (Optional, String, ForceNew) VPC ID, default is based on the network.
4431

0 commit comments

Comments
 (0)