Skip to content

Feat/adjust kms e2e #1951

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 8 commits into from
Jul 11, 2023
Merged

Feat/adjust kms e2e #1951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b7ad9a
example readjust: tencentcloud_kubernetes_serverless_node_pool
lyu571 Jul 5, 2023
2ed70ac
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
lyu571 Jul 5, 2023
6f9057d
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
lyu571 Jul 6, 2023
1de956a
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
lyu571 Jul 6, 2023
f3dd2e4
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
lyu571 Jul 7, 2023
d9c1df2
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
lyu571 Jul 10, 2023
f742173
Merge branch 'master' of github.com:tencentcloudstack/terraform-provi…
lyu571 Jul 10, 2023
91ea217
1.update e2e case name from tke to kubernetes. 2.update cluster_versi…
lyu571 Jul 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
2 changes: 1 addition & 1 deletion tencentcloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2319,7 +2319,7 @@ func Provider() *schema.Provider {
"tencentcloud_kubernetes_node_pool": resourceTencentCloudKubernetesNodePool(),
"tencentcloud_kubernetes_serverless_node_pool": resourceTkeServerLessNodePool(),
"tencentcloud_kubernetes_backup_storage_location": resourceTencentCloudTkeBackupStorageLocation(),
"tencentcloud_kubernetes_encryption_protection": resourceTencentCloudTkeEncryptionProtection(),
"tencentcloud_kubernetes_encryption_protection": resourceTencentCloudKubernetesEncryptionProtection(),
"tencentcloud_mysql_backup_policy": resourceTencentCloudMysqlBackupPolicy(),
"tencentcloud_mysql_account": resourceTencentCloudMysqlAccount(),
"tencentcloud_mysql_account_privilege": resourceTencentCloudMysqlAccountPrivilege(),
Expand Down
1 change: 1 addition & 0 deletions tencentcloud/resource_tc_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
"cluster_version": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Version of the cluster. Use `tencentcloud_kubernetes_available_cluster_versions` to get the upgradable cluster version.",
},
"upgrade_instances_follow_cluster": {
Expand Down
22 changes: 10 additions & 12 deletions tencentcloud/resource_tc_kubernetes_encryption_protection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variable "example_region" {
}

variable "example_cluster_cidr" {
default = "10.31.0.0/16"
default = "10.32.0.0/16"
}

variable "availability_zone" {
Expand All @@ -30,13 +30,11 @@ resource "tencentcloud_kubernetes_cluster" "example" {
cluster_name = "tf_example_cluster"
cluster_desc = "a tf example cluster for the kms test"
cluster_max_service_num = 32
cluster_internet = true
cluster_version = "1.24.4"
cluster_deploy_type = "MANAGED_CLUSTER"
}

resource "tencentcloud_kms_key" "example" {
alias = "tf-example-kms-key-ed-%s"
alias = "tf-example-kms-key"
description = "example of kms key instance"
key_usage = "ENCRYPT_DECRYPT"
is_enabled = true
Expand Down Expand Up @@ -64,11 +62,11 @@ import (
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
)

func resourceTencentCloudTkeEncryptionProtection() *schema.Resource {
func resourceTencentCloudKubernetesEncryptionProtection() *schema.Resource {
return &schema.Resource{
Create: resourceTencentCloudTkeEncryptionProtectionCreate,
Read: resourceTencentCloudTkeEncryptionProtectionRead,
Delete: resourceTencentCloudTkeEncryptionProtectionDelete,
Create: resourceTencentCloudKubernetesEncryptionProtectionCreate,
Read: resourceTencentCloudKubernetesEncryptionProtectionRead,
Delete: resourceTencentCloudKubernetesEncryptionProtectionDelete,
Schema: map[string]*schema.Schema{
"cluster_id": {
Required: true,
Expand Down Expand Up @@ -107,7 +105,7 @@ func resourceTencentCloudTkeEncryptionProtection() *schema.Resource {
}
}

func resourceTencentCloudTkeEncryptionProtectionCreate(d *schema.ResourceData, meta interface{}) error {
func resourceTencentCloudKubernetesEncryptionProtectionCreate(d *schema.ResourceData, meta interface{}) error {
defer logElapsed("resource.tencentcloud_tke_encryption_protection.create")()
defer inconsistentCheck(d, meta)()

Expand Down Expand Up @@ -157,10 +155,10 @@ func resourceTencentCloudTkeEncryptionProtectionCreate(d *schema.ResourceData, m
return e
}

return resourceTencentCloudTkeEncryptionProtectionRead(d, meta)
return resourceTencentCloudKubernetesEncryptionProtectionRead(d, meta)
}

func resourceTencentCloudTkeEncryptionProtectionRead(d *schema.ResourceData, meta interface{}) error {
func resourceTencentCloudKubernetesEncryptionProtectionRead(d *schema.ResourceData, meta interface{}) error {
defer logElapsed("resource.tencentcloud_tke_encryption_protection.read")()
defer inconsistentCheck(d, meta)()

Expand Down Expand Up @@ -190,7 +188,7 @@ func resourceTencentCloudTkeEncryptionProtectionRead(d *schema.ResourceData, met
return nil
}

func resourceTencentCloudTkeEncryptionProtectionDelete(d *schema.ResourceData, meta interface{}) error {
func resourceTencentCloudKubernetesEncryptionProtectionDelete(d *schema.ResourceData, meta interface{}) error {
defer logElapsed("resource.tencentcloud_tke_encryption_protection.delete")()
defer inconsistentCheck(d, meta)()

Expand Down
8 changes: 3 additions & 5 deletions tencentcloud/resource_tc_kubernetes_encryption_protection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccTencentCloudTkeEncryptionProtectionResource_basic(t *testing.T) {
func TestAccTencentCloudKubernetesEncryptionProtectionResource_basic(t *testing.T) {
t.Parallel()
rName := acctest.RandString(10)
resource.Test(t, resource.TestCase{
Expand All @@ -21,7 +21,7 @@ func TestAccTencentCloudTkeEncryptionProtectionResource_basic(t *testing.T) {
Config: fmt.Sprintf(testAccTkeEncryptionProtection, rName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "id"),
resource.TestCheckResourceAttr("tencentcloud_kubernetes_encryption_protection.example", "cluster_id", defaultTkeClusterId),
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "cluster_id"),
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "kms_configuration.#"),
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "kms_configuration.0.key_id"),
resource.TestCheckResourceAttr("tencentcloud_kubernetes_encryption_protection.example", "kms_configuration.0.kms_region", "ap-guangzhou"),
Expand All @@ -39,7 +39,7 @@ variable "example_region" {
}

variable "example_cluster_cidr" {
default = "10.31.0.0/16"
default = "10.32.0.0/16"
}

variable "availability_zone" {
Expand All @@ -58,8 +58,6 @@ resource "tencentcloud_kubernetes_cluster" "example" {
cluster_name = "tf_example_cluster"
cluster_desc = "a tf example cluster for the kms test"
cluster_max_service_num = 32
cluster_internet = true
cluster_version = "1.24.4"
cluster_deploy_type = "MANAGED_CLUSTER"
}

Expand Down
6 changes: 2 additions & 4 deletions website/docs/r/kubernetes_encryption_protection.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "example_region" {
}

variable "example_cluster_cidr" {
default = "10.31.0.0/16"
default = "10.32.0.0/16"
}

variable "availability_zone" {
Expand All @@ -40,13 +40,11 @@ resource "tencentcloud_kubernetes_cluster" "example" {
cluster_name = "tf_example_cluster"
cluster_desc = "a tf example cluster for the kms test"
cluster_max_service_num = 32
cluster_internet = true
cluster_version = "1.24.4"
cluster_deploy_type = "MANAGED_CLUSTER"
}

resource "tencentcloud_kms_key" "example" {
alias = "tf-example-kms-key-ed-%s"
alias = "tf-example-kms-key"
description = "example of kms key instance"
key_usage = "ENCRYPT_DECRYPT"
is_enabled = true
Expand Down