Skip to content

Feat/kms #2187

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 10, 2023
Merged

Feat/kms #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aca6209
feat/kms
SevenEarth Oct 7, 2023
daa2245
feat/kms
SevenEarth Oct 7, 2023
52329b8
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
SevenEarth Oct 10, 2023
c72da41
feat/kms
SevenEarth Oct 10, 2023
e551ea0
feat/kms
SevenEarth Oct 10, 2023
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
10 changes: 5 additions & 5 deletions tencentcloud/data_source_tc_kms_keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Use this data source to query detailed information of KMS key
Example Usage

```hcl
data "tencentcloud_kms_keys" "foo" {
search_key_alias = "test"
key_state = 0
origin = "TENCENT_KMS"
key_usage = "ALL"
data "tencentcloud_kms_keys" "example" {
Copy link
Collaborator

@andrew-tx andrew-tx Oct 10, 2023

Choose a reason for hiding this comment

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

changelog加一下

search_key_alias = "tf_example"
key_state = 0
origin = "TENCENT_KMS"
key_usage = "ALL"
}
```
*/
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_kms_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ func resourceTencentCloudKmsKeyCreate(d *schema.ResourceData, meta interface{})
return outErr
}

d.SetId(keyId)

if isEnabled := d.Get("is_enabled").(bool); !isEnabled {
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
e := kmsService.DisableKey(ctx, d.Id())
Expand Down Expand Up @@ -247,9 +249,7 @@ func resourceTencentCloudKmsKeyCreate(d *schema.ResourceData, meta interface{})
}
}

d.SetId(keyId)
return resourceTencentCloudKmsKeyRead(d, meta)

}

func resourceTencentCloudKmsKeyRead(d *schema.ResourceData, meta interface{}) error {
Expand Down
4 changes: 2 additions & 2 deletions website/docs/d/kms_keys.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Use this data source to query detailed information of KMS key
## Example Usage

```hcl
data "tencentcloud_kms_keys" "foo" {
search_key_alias = "test"
data "tencentcloud_kms_keys" "example" {
search_key_alias = "tf_example"
key_state = 0
origin = "TENCENT_KMS"
key_usage = "ALL"
Expand Down