Skip to content

Commit 6054983

Browse files
author
WeiMengXS
committed
fix: commit
1 parent c8e03f2 commit 6054983

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

tencentcloud/resource_tc_cam_mfa_flag.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ package tencentcloud
3434

3535
import (
3636
"context"
37-
"fmt"
3837
"log"
3938
"strconv"
4039

@@ -57,6 +56,7 @@ func resourceTencentCloudCamMfaFlag() *schema.Resource {
5756
Schema: map[string]*schema.Schema{
5857
"op_uin": {
5958
Required: true,
59+
ForceNew: true,
6060
Type: schema.TypeInt,
6161
Description: "Operate uin.",
6262
},
@@ -135,11 +135,14 @@ func resourceTencentCloudCamMfaFlagRead(d *schema.ResourceData, meta interface{}
135135
logId := getLogId(contextNil)
136136

137137
ctx := context.WithValue(context.TODO(), logIdKey, logId)
138-
upUin := d.Id()
139-
138+
opUin := d.Id()
139+
uin, err := strconv.Atoi(opUin)
140+
if err != nil {
141+
return err
142+
}
140143
service := CamService{client: meta.(*TencentCloudClient).apiV3Conn}
141144

142-
loginFlag, actionFlag, err := service.DescribeCamMfaFlagById(ctx, upUin)
145+
loginFlag, actionFlag, err := service.DescribeCamMfaFlagById(ctx, uint64(uin))
143146
if err != nil {
144147
return err
145148
}
@@ -201,14 +204,6 @@ func resourceTencentCloudCamMfaFlagUpdate(d *schema.ResourceData, meta interface
201204
}
202205
request.OpUin = common.Uint64Ptr(uint64(uin))
203206

204-
immutableArgs := []string{"op_uin"}
205-
206-
for _, v := range immutableArgs {
207-
if d.HasChange(v) {
208-
return fmt.Errorf("argument '&s cannot be changed", v)
209-
}
210-
}
211-
212207
if d.HasChange("login_flag") {
213208
if dMap, ok := helper.InterfacesHeadMap(d, "login_flag"); ok {
214209
loginActionMfaFlag := cam.LoginActionMfaFlag{}

tencentcloud/resource_tc_ssl_pay_certificate.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ func resourceTencentCloudSSLInstance() *schema.Resource {
159159
Type: schema.TypeString,
160160
Optional: true,
161161
Default: CsrTypeOnline,
162-
ForceNew: true,
163162
ValidateFunc: validateAllowedStringValue(CsrTypeArr),
164163
Description: "CSR generation method. Valid values: `online`, `parse`. " +
165164
"`online` means online generation, `parse` means manual upload.",

tencentcloud/service_tencentcloud_cam.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,11 +1356,11 @@ func (me *CamService) DeleteCamUserSamlConfigById(ctx context.Context) (errRet e
13561356
return
13571357
}
13581358

1359-
func (me *CamService) DescribeCamMfaFlagById(ctx context.Context, id string) (loginFlag *cam.LoginActionFlag, actionFlag *cam.LoginActionFlag, errRet error) {
1359+
func (me *CamService) DescribeCamMfaFlagById(ctx context.Context, id uint64) (loginFlag *cam.LoginActionFlag, actionFlag *cam.LoginActionFlag, errRet error) {
13601360
logId := getLogId(ctx)
13611361

13621362
request := cam.NewDescribeSafeAuthFlagCollRequest()
1363-
1363+
request.SubUin = &id
13641364
defer func() {
13651365
if errRet != nil {
13661366
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())

0 commit comments

Comments
 (0)