Skip to content

update tem gateway #1217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2022
+20 −32
Merged

update tem gateway #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions tencentcloud/resource_tc_clb_target_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@ resource "tencentcloud_clb_target_group" "test"{
}
```

Create target group

```hcl
resource "tencentcloud_clb_target_group" "test"{
target_group_name = "hello1"
port = 18082
target_group_instances {
bind_ip = "10.0.0.4"
port = 18080
}
}
```

Import

Expand Down Expand Up @@ -73,6 +61,8 @@ func resourceTencentCloudClbTargetGroup() *schema.Resource {
Type: schema.TypeList,
Optional: true,
Description: "The backend server of target group bind.",
Deprecated: "It has been deprecated from version 1.77.3. " +
"please use `tencentcloud_clb_target_group_instance_attachment` instead.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"bind_ip": {
Expand Down
23 changes: 17 additions & 6 deletions tencentcloud/service_tencentcloud_tem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ package tencentcloud

import (
"context"
"fmt"
"log"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"

tem "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem/v20210701"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
Expand Down Expand Up @@ -418,16 +421,24 @@ func (me *TemService) DescribeTemGateway(ctx context.Context, environmentId stri
request.IngressName = &ingressName
request.ClusterNamespace = helper.String("default")

response, err := me.client.UseTemClient().DescribeIngress(request)
err := resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
response, errRet := me.client.UseTemClient().DescribeIngress(request)
if errRet != nil {
return retryError(errRet, InternalError)
}
gateway = response.Response.Result
if *gateway.ClbId != "" && *gateway.Vip != "" {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
return nil
}
return resource.RetryableError(fmt.Errorf("gateway clb is not ready..."))
})

if err != nil {
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
logId, request.GetAction(), request.ToJsonString(), err.Error())
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
gateway = response.Response.Result
return
}

Expand Down
15 changes: 1 addition & 14 deletions website/docs/r/clb_target_group.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,12 @@ resource "tencentcloud_clb_target_group" "test" {
}
```

Create target group

```hcl
resource "tencentcloud_clb_target_group" "test" {
target_group_name = "hello1"
port = 18082
target_group_instances {
bind_ip = "10.0.0.4"
port = 18080
}
}
```

## Argument Reference

The following arguments are supported:

* `port` - (Optional, Int) The default port of target group, add server after can use it.
* `target_group_instances` - (Optional, List) The backend server of target group bind.
* `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.
* `target_group_name` - (Optional, String) Target group name.
* `vpc_id` - (Optional, String, ForceNew) VPC ID, default is based on the network.

Expand Down