Skip to content

feat(crs): [122437999] support wan address #3220

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/3220.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
tencentcloud_redis_wan_address
```
1 change: 1 addition & 0 deletions tencentcloud/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -1392,6 +1392,7 @@ func Provider() *schema.Provider {
"tencentcloud_redis_backup_operation": crs.ResourceTencentCloudRedisBackupOperation(),
"tencentcloud_redis_security_group_attachment": crs.ResourceTencentCloudRedisSecurityGroupAttachment(),
"tencentcloud_redis_log_delivery": crs.ResourceTencentCloudRedisLogDelivery(),
"tencentcloud_redis_wan_address": crs.ResourceTencentCloudRedisWanAddress(),
Copy link
Collaborator

@hellertang hellertang Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1、这个资源感觉设计的有问题,不是应该是一个开启和关闭的逻辑么?
2、是不是直接放在redis_instance资源比较好

"tencentcloud_as_load_balancer": as.ResourceTencentCloudAsLoadBalancer(),
"tencentcloud_as_scaling_config": as.ResourceTencentCloudAsScalingConfig(),
"tencentcloud_as_scaling_group": as.ResourceTencentCloudAsScalingGroup(),
Expand Down
1 change: 1 addition & 0 deletions tencentcloud/provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@ tencentcloud_redis_backup_operation
tencentcloud_redis_security_group_attachment
tencentcloud_redis_connection_config
tencentcloud_redis_log_delivery
tencentcloud_redis_wan_address

Serverless Cloud Function(SCF)
Data Source
Expand Down
160 changes: 160 additions & 0 deletions tencentcloud/services/crs/resource_tc_redis_wan_address.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions tencentcloud/services/crs/resource_tc_redis_wan_address.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Provides a resource to create a redis wan_address

Example Usage

```hcl
resource "tencentcloud_redis_wan_address" "wan_address" {
instance_id = "crs-dekqpd8v"
}
```

Import

redis wan_address can be imported using the instanceId, e.g.

```
terraform import tencentcloud_redis_wan_address.wan_address crs-dekqpd8v
```
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package crs
71 changes: 71 additions & 0 deletions tencentcloud/services/crs/resource_tc_redis_wan_address_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package crs_test

import (
"context"
"fmt"
"testing"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
svccrs "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/crs"
)

func TestAccTencentCloudRedisWanAddressResource_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() {
tcacctest.AccPreCheck(t)
},
Providers: tcacctest.AccProviders,
CheckDestroy: testAccTencentCloudRedisInstanceWanAddressDestroy,
Steps: []resource.TestStep{
{
Config: testAccRedisWanAddress,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("tencentcloud_redis_wan_address.redis_wan_address", "id"),
resource.TestCheckResourceAttrSet("tencentcloud_redis_wan_address.redis_wan_address", "wan_address"),
),
},
{
ResourceName: "tencentcloud_redis_wan_address.redis_wan_address",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccTencentCloudRedisInstanceWanAddressDestroy(s *terraform.State) error {

logId := tccommon.GetLogId(tccommon.ContextNil)
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)

service := svccrs.NewRedisService(tcacctest.AccProvider.Meta().(tccommon.ProviderMeta).GetAPIV3Conn())
for _, rs := range s.RootModule().Resources {
if rs.Type != "tencentcloud_redis_wan_address" {
continue
}
time.Sleep(5 * time.Second)
has, _, instance, err := service.CheckRedisOnlineOk(ctx, rs.Primary.ID, 20*tccommon.ReadRetryTimeout)
if err != nil {
return err
}
if !has {
return fmt.Errorf("failed to get redis")
}
if instance.WanAddress != nil && *instance.WanAddress != "" {
return fmt.Errorf("redis wanAddress close failed: %v", *instance.WanAddress)
}
}
return nil
}

const testAccRedisWanAddress = `

resource "tencentcloud_redis_wan_address" "redis_wan_address" {
instance_id = "crs-dekqpd8v"
}
`
29 changes: 29 additions & 0 deletions tencentcloud/services/crs/service_tencentcloud_redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -2029,3 +2029,32 @@ func (me *RedisService) DescribeRedisLogDeliveryById(ctx context.Context, instan
ret = response.Response.SlowLog
return
}

func (me *RedisService) DescribeRedisWanAddressById(ctx context.Context, instanceId string) (ret *redis.InstanceSet, errRet error) {
logId := tccommon.GetLogId(ctx)

request := redis.NewDescribeInstancesRequest()
request.InstanceId = helper.String(instanceId)

defer func() {
if errRet != nil {
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
}
}()

ratelimit.Check(request.GetAction())

response, err := me.client.UseRedisClient().DescribeInstances(request)
if err != nil {
errRet = err
return
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

if len(response.Response.InstanceSet) < 1 {
return
}

ret = response.Response.InstanceSet[0]
return
}
43 changes: 43 additions & 0 deletions website/docs/r/redis_wan_address.html.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
subcategory: "TencentDB for Redis(crs)"
layout: "tencentcloud"
page_title: "TencentCloud: tencentcloud_redis_wan_address"
sidebar_current: "docs-tencentcloud-resource-redis_wan_address"
description: |-
Provides a resource to create a redis wan_address
---

# tencentcloud_redis_wan_address

Provides a resource to create a redis wan_address

## Example Usage

```hcl
resource "tencentcloud_redis_wan_address" "wan_address" {
instance_id = "crs-dekqpd8v"
}
```

## Argument Reference

The following arguments are supported:

* `instance_id` - (Required, String, ForceNew) Instance ID.

## Attributes Reference

In addition to all arguments above, the following attributes are exported:

* `id` - ID of the resource.
* `wan_address` - Allocate Wan Address.


## Import

redis wan_address can be imported using the instanceId, e.g.

```
terraform import tencentcloud_redis_wan_address.wan_address crs-dekqpd8v
```

3 changes: 3 additions & 0 deletions website/tencentcloud.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6234,6 +6234,9 @@
<li>
<a href="/docs/providers/tencentcloud/r/redis_upgrade_proxy_version_operation.html">tencentcloud_redis_upgrade_proxy_version_operation</a>
</li>
<li>
<a href="/docs/providers/tencentcloud/r/redis_wan_address.html">tencentcloud_redis_wan_address</a>
</li>
</ul>
</li>
</ul>
Expand Down
Loading