Skip to content

Commit 079630d

Browse files
authored
Feat/optimize kms delete logic (#1107)
* optimize kms delete logic * optimize kms disable logic
1 parent 280ce26 commit 079630d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.74.1 (June 20, 2022)
2+
3+
ENHANCEMENTS:
4+
5+
* resource `tencentcloud_kms_key` optimize kms key disable logic
6+
17
## 1.74.0 (June 20, 2022)
28

39
FEATURES:

tencentcloud/resource_tc_kms_key.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,11 @@ func resourceTencentCloudKmsKeyDelete(d *schema.ResourceData, meta interface{})
372372
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
373373
e := kmsService.DisableKey(ctx, keyId)
374374
if e != nil {
375-
return retryError(e)
375+
ee, ok := e.(*sdkErrors.TencentCloudSDKError)
376+
if ok && IsContains(KMS_RETRYABLE_ERROR, ee.Code) {
377+
return resource.RetryableError(fmt.Errorf("kms key disable error: %s, retrying", e.Error()))
378+
}
379+
return resource.NonRetryableError(e)
376380
}
377381
return nil
378382
})

0 commit comments

Comments
 (0)