Skip to content

Commit f5c7e5c

Browse files
authored
fix(dasb): [117762490] update param phone Adapter country area code (#2734)
* add * add
1 parent ecdfca7 commit f5c7e5c

File tree

8 files changed

+2414
-1012
lines changed

8 files changed

+2414
-1012
lines changed

.changelog/2734.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_dasb_user: update param phone Adapter country area code
3+
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ require (
109109
github.com/hashicorp/go-uuid v1.0.3
110110
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwpg v1.0.772
111111
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860
112-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.798
112+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.964
113113
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831
114114
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/region v1.0.920
115115
github.com/wI2L/jsondiff v0.3.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692 h1:lD4
960960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692/go.mod h1:nH1mCLxOm21eqEYORMJ5pifOfHoupCIx8YwMOu9YW2c=
961961
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.798 h1:8FQbCEPIL0dL+sTdQBZxqqwdLxmJEfkyu17w6r7ZrQg=
962962
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.798/go.mod h1:ch3pOoPfIs0i+l8qV5yO+Tpk45ubgdltYF/0MfDk4YA=
963+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.964 h1:GLUcK8t83ay4+W90gWCl4mMDcwbWiF8VHw7iOhzQ1ZM=
964+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.964/go.mod h1:EErTkW1DHjRtNTlhBmXm+y3plwYreiwoi9o/YEAUNXc=
963965
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335 h1:D8qrelkK5udv8RzJJIABMzItGIyaZoYnxEVeIsYqiNw=
964966
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335/go.mod h1:pz4s3nOhoB9cY0+uWzifuwr7lfh/Gvi1rv0ADxpPzD4=
965967
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.652 h1:agjXNi5342DaL0TzRx1FjFlT+9VU2l6aN0yERmxiLLc=

tencentcloud/services/bh/resource_tc_dasb_user.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"log"
77
"strconv"
8+
"strings"
89

910
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
1011

@@ -38,12 +39,12 @@ func ResourceTencentCloudDasbUser() *schema.Resource {
3839
"phone": {
3940
Optional: true,
4041
Type: schema.TypeString,
41-
Description: "Fill in the mainland mobile phone number directly. If it is a number from other countries or regions, enter it in the format of country area code|mobile phone number. For example: +852|xxxxxxxx.",
42+
Description: "Enter it in the format of country area code|mobile phone number. For example: +86|***********, +852|xxxxxxxx. Please provide at least one of `phone` or `email`.",
4243
},
4344
"email": {
4445
Optional: true,
4546
Type: schema.TypeString,
46-
Description: "Email.",
47+
Description: "Email. Please provide at least one of `phone` or `email`.",
4748
},
4849
"validate_from": {
4950
Optional: true,
@@ -198,7 +199,10 @@ func resourceTencentCloudDasbUserRead(d *schema.ResourceData, meta interface{})
198199
}
199200

200201
if user.Phone != nil {
201-
_ = d.Set("phone", user.Phone)
202+
parts := strings.Split(*user.Phone, "|")
203+
if len(parts) == 2 && parts[1] != "" {
204+
_ = d.Set("phone", user.Phone)
205+
}
202206
}
203207

204208
if user.Email != nil {

0 commit comments

Comments
 (0)