Skip to content

Commit 963f008

Browse files
tongyimingmikatong
tongyiming
and
mikatong
authored
fix(emr): [122175308] support update instance_name and tags (#3188)
* support update instance_name and tags * add changelog --------- Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 7a6e42c commit 963f008

File tree

9 files changed

+387
-68
lines changed

9 files changed

+387
-68
lines changed

‎.changelog/3188.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_serverless_hbase_instance: support update instance_name and tags
3+
```

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1078
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1111
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1115
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1053
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111
@@ -59,7 +59,7 @@ require (
5959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.628
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb v1.0.760
62-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1103
62+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1115
6363
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777
6464
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.970
6565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563

‎go.sum‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993/go.mod
911911
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
912912
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
913913
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1010/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
914-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1013/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
915914
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1015/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
916915
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1018/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
917916
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1031/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
@@ -921,7 +920,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1037/go.mod
921920
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1038/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
922921
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1053/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
923922
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1056/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
924-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1058/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
925923
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1066/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
926924
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1068/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1071/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
@@ -930,12 +928,11 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1078/go.mod
930928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1096/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1099/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1103/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
933-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1107 h1:q6GZzn6dvOeY2gFthWudL08hBq2+mwsBdideLRr6jtI=
934931
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1107/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
935-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1108 h1:yuRONtPue3RtEpCmMlM1HN2PPaoK9X89IE4qHA/Z0FA=
936932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1108/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1111 h1:f0RqQwdrXvT2behkBRo845d/x+soUU70Pm80DliiJk8=
938933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1111/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
934+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1115 h1:lYeFC379r76seyzN7PHmSxv1ji9knmsXQJglDB/K0WE=
935+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1115/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
940937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
941938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -944,8 +941,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1053 h1:x193cx
944941
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1053/go.mod h1:yM5i22uG9HKuUwwz+XvrDW9oBtZdb7avyDrMrS/FBIs=
945942
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69SP/wPsmnfozcQVZ6tUY6F6N/TpEe/7xtXrc/8=
946943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762/go.mod h1:1XylIfNUbAzmNqi4XMhwcM3VhmUHdu1OYybOeaJ4sOw=
947-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1058 h1:qgni/qIuUYkc5THMbtyGNSNleoac5ffMeM5TErJ9bnA=
948-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1058/go.mod h1:HqoJMWKikraStfU3fj5HRK8linrtr4mfWF03GbOj2j8=
949944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111 h1:Y7LLIZEQh8OAbnBWppUopu2PjPaQOO9Jzhp8LZO7adI=
950945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111/go.mod h1:hx4A0g62E4hq6vB0t9e/4vlUArok9R2qOYW5IzDiPYo=
951946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970 h1:qVIRHgG1twsqF4aVN/x2T2yMRfPpsZBTNefDkqzM06M=
@@ -968,8 +963,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.628 h1:cnhe9uh
968963
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.628/go.mod h1:JxTXEld643DHk5HeQe4xIvuuoxsCmbTjgmE64Mtrdxw=
969964
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb v1.0.760 h1:IKP2LFgJwbnP4IyQQw0k2gdVrd8H8e8X8TL/cIuCHEk=
970965
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb v1.0.760/go.mod h1:pSQXTeuC6BahiUIfssVqvL1/BoXccLkyD7nJ+tKgygw=
971-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1103 h1:TerozsZCbIFczAtwL8oqv3PzunrvcSY8TQWv1BgUb7E=
972-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1103/go.mod h1:sPIm+EDa1aKeoUt+eX600TPmri5ze13pb3xLTCWqK20=
966+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1115 h1:hKzATWx2kZm32piKYM5WZLsHA1pWlDw9w7tNL6jo+0g=
967+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1115/go.mod h1:Z9Bv1N30yjQKRACgpTewQXiuIaQrC0lKMrKPH1xF5aA=
973968
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777 h1:G1eX/DkiznhSjNVF97BAQyycFXOiPHxeTxgOadp5J/o=
974969
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777/go.mod h1:ehbc9eaNknF/VU/kPTFLZbIUmkL06vQ/JYydu6yeXp4=
975970
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.970 h1:Z82LbcEnE2m4CGvcOY024N7REhAN++xdEyE88HG2YBA=
@@ -1038,10 +1033,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955 h1:bi7brF
10381033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955/go.mod h1:somZaVT0k2Egv/VPHLRU+McOkGUo6pagucyRrsLjpfI=
10391034
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUroO+FAslUmsDWGi8nvczsqZBWVgQwlnyT0Aj8=
10401035
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
1041-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013 h1:Vcub4gbcTIs/uYINllI8eHXAhv652PpPLM+f/LWZroA=
1042-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013/go.mod h1:QUt5DeP3jmoYPrWwgupRPg/Xus21MjEiUzzhEUv0tOY=
1043-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1103 h1:Dzd9AWT+E+ZsB8eFY92pr4VmL6IuBExn2QcQdl0L77A=
1044-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1103/go.mod h1:yAKtHjrmFg4uAMiTsq3r1Luk+1iROMaZ3jYUNc2xPkg=
1036+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1108 h1:IjBfssGmmqK9VVwQKhETRWoOowRqytnLdeYADiFy1Bk=
1037+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1108/go.mod h1:yzldBIX7obRjbGohIb78bKNKvnDIoki2jJROQd5Rdb0=
10451038
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
10461039
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10471040
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1038 h1:tmK0aSj8zJrTx7aubJR8DBvtySj1uO8UdFANUDFtbmo=

‎tencentcloud/services/emr/resource_tc_serverless_hbase_instance.go‎

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
1414
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
1515
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
16+
svctag "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tag"
1617
)
1718

1819
func ResourceTencentCloudServerlessHbaseInstance() *schema.Resource {
@@ -52,6 +53,7 @@ func ResourceTencentCloudServerlessHbaseInstance() *schema.Resource {
5253
"node_type": {
5354
Type: schema.TypeString,
5455
Optional: true,
56+
Computed: true,
5557
Description: "Instance node type, can be filled in as 4C16G, 8C32G, 16C64G, 32C128G, case insensitive.",
5658
},
5759

@@ -249,8 +251,6 @@ func resourceTencentCloudServerlessHbaseInstanceCreate(d *schema.ResourceData, m
249251
instanceId := *response.Response.InstanceId
250252
d.SetId(instanceId)
251253

252-
time.Sleep(10 * time.Second)
253-
254254
emrService := EMRService{
255255
client: meta.(tccommon.ProviderMeta).GetAPIV3Conn(),
256256
}
@@ -366,6 +366,9 @@ func resourceTencentCloudServerlessHbaseInstanceRead(d *schema.ResourceData, met
366366
_ = d.Set("auto_renew_flag", respData.AutoRenewFlag)
367367
}
368368

369+
if respData.NodeType != nil {
370+
_ = d.Set("node_type", respData.NodeType)
371+
}
369372
_ = instanceId
370373
return nil
371374
}
@@ -378,14 +381,59 @@ func resourceTencentCloudServerlessHbaseInstanceUpdate(d *schema.ResourceData, m
378381

379382
ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
380383

381-
immutableArgs := []string{"instance_name", "pay_mode", "disk_type", "disk_size", "node_type", "tags", "time_span", "time_unit", "auto_renew_flag"}
384+
immutableArgs := []string{"pay_mode", "disk_type", "disk_size", "node_type", "time_span", "time_unit", "auto_renew_flag"}
382385
for _, v := range immutableArgs {
383386
if d.HasChange(v) {
384387
return fmt.Errorf("argument `%s` cannot be changed", v)
385388
}
386389
}
387390
instanceId := d.Id()
388391

392+
if d.HasChange("instance_name") {
393+
if v, ok := d.GetOk("instance_name"); ok {
394+
request := emr.NewModifySLInstanceBasicRequest()
395+
request.InstanceId = helper.String(instanceId)
396+
request.ClusterName = helper.String(v.(string))
397+
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
398+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseEmrClient().ModifySLInstanceBasic(request)
399+
if e != nil {
400+
return tccommon.RetryError(e)
401+
} else {
402+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
403+
}
404+
return nil
405+
})
406+
if err != nil {
407+
log.Printf("[CRITAL]%s update serverless hbase instance_name failed, reason:%+v", logId, err)
408+
return err
409+
}
410+
}
411+
}
412+
if d.HasChange("tags") {
413+
414+
oldValue, newValue := d.GetChange("tags")
415+
oldMap := make(map[string]interface{})
416+
newMap := make(map[string]interface{})
417+
418+
for _, o := range oldValue.([]interface{}) {
419+
oMap := o.(map[string]interface{})
420+
oldMap[oMap["tag_key"].(string)] = oMap["tag_value"].(string)
421+
}
422+
for _, n := range newValue.([]interface{}) {
423+
nMap := n.(map[string]interface{})
424+
newMap[nMap["tag_key"].(string)] = nMap["tag_value"].(string)
425+
}
426+
427+
replaceTags, deleteTags := svctag.DiffTags(oldMap, newMap)
428+
429+
tcClient := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
430+
tagService := svctag.NewTagService(tcClient)
431+
resourceName := tccommon.BuildTagResourceName("emr", "emr-serverless-instance", tcClient.Region, d.Id())
432+
err := tagService.ModifyTags(ctx, resourceName, replaceTags, deleteTags)
433+
if err != nil {
434+
return err
435+
}
436+
}
389437
needChange := false
390438
if d.HasChange("zone_settings") {
391439
for idx, zoneSetting := range d.Get("zone_settings").([]interface{}) {
@@ -434,8 +482,6 @@ func resourceTencentCloudServerlessHbaseInstanceUpdate(d *schema.ResourceData, m
434482
return err
435483
}
436484

437-
time.Sleep(10 * time.Second)
438-
439485
emrService := EMRService{
440486
client: meta.(tccommon.ProviderMeta).GetAPIV3Conn(),
441487
}

0 commit comments

Comments
 (0)