From f5fe8ec5f50fb2e21ca63fb989ac9fad874bc7bb Mon Sep 17 00:00:00 2001 From: KGSN Date: Thu, 10 Mar 2022 17:11:14 +0800 Subject: [PATCH] fix: nodepool cam role test case --- tencentcloud/resource_tc_kubernetes_node_pool.go | 2 +- tencentcloud/resource_tc_kubernetes_node_pool_test.go | 7 ++++++- tencentcloud/resource_tc_vpn_ssl_client.go | 9 +++++---- tencentcloud/resource_tc_vpn_ssl_server.go | 11 ++++++----- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/tencentcloud/resource_tc_kubernetes_node_pool.go b/tencentcloud/resource_tc_kubernetes_node_pool.go index 71f61a4211..3fa692cb48 100644 --- a/tencentcloud/resource_tc_kubernetes_node_pool.go +++ b/tencentcloud/resource_tc_kubernetes_node_pool.go @@ -746,7 +746,7 @@ func composedKubernetesAsScalingConfigParaSerial(dMap map[string]interface{}, me request.InstanceChargeType = &chargeType if v, ok := dMap["cam_role_name"]; ok { - request.CamRoleName = helper.String(v.(string)) + request.CamRoleName = helper.String(v.(string)) } result = request.ToJsonString() return result, errRet diff --git a/tencentcloud/resource_tc_kubernetes_node_pool_test.go b/tencentcloud/resource_tc_kubernetes_node_pool_test.go index b70b6ea5bd..b742fcb044 100644 --- a/tencentcloud/resource_tc_kubernetes_node_pool_test.go +++ b/tencentcloud/resource_tc_kubernetes_node_pool_test.go @@ -30,6 +30,7 @@ func TestAccTencentCloudTkeNodePoolResource(t *testing.T) { resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.system_disk_size", "50"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.data_disk.#", "1"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.internet_max_bandwidth_out", "10"), + resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.cam_role_name", "TCB_QcsRole"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "taints.#", "1"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "labels.test1", "test1"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "labels.test2", "test2"), @@ -57,6 +58,7 @@ func TestAccTencentCloudTkeNodePoolResource(t *testing.T) { resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.instance_charge_type", "SPOTPAID"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.spot_instance_type", "one-time"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.spot_max_price", "1000"), + resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.cam_role_name", "TCB_QcsRole"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "max_size", "5"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "min_size", "2"), resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "labels.test3", "test3"), @@ -150,7 +152,7 @@ variable "availability_zone" { } variable "cluster_cidr" { - default = "172.31.0.0/16" + default = "192.168.0.0/16" } data "tencentcloud_vpc_subnets" "vpc" { @@ -222,6 +224,7 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" { system_disk_size = "50" security_group_ids = [data.tencentcloud_security_groups.sg.security_groups[0].security_group_id] + cam_role_name = "TCB_QcsRole" data_disk { disk_type = "CLOUD_PREMIUM" disk_size = 50 @@ -281,6 +284,8 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" { spot_instance_type = "one-time" spot_max_price = "1000" + cam_role_name = "TCB_QcsRole" + data_disk { disk_type = "CLOUD_PREMIUM" disk_size = 50 diff --git a/tencentcloud/resource_tc_vpn_ssl_client.go b/tencentcloud/resource_tc_vpn_ssl_client.go index 7f1a9f656f..a73ae3c309 100644 --- a/tencentcloud/resource_tc_vpn_ssl_client.go +++ b/tencentcloud/resource_tc_vpn_ssl_client.go @@ -24,11 +24,12 @@ package tencentcloud import ( "context" "fmt" + "log" + "time" + vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit" - "log" - "time" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -67,8 +68,8 @@ func resourceTencentCloudVpnSslClientCreate(d *schema.ResourceData, meta interfa ctx := context.WithValue(context.TODO(), logIdKey, logId) var ( - vpcService = VpcService{client: meta.(*TencentCloudClient).apiV3Conn} - request = vpc.NewCreateVpnGatewaySslClientRequest() + vpcService = VpcService{client: meta.(*TencentCloudClient).apiV3Conn} + request = vpc.NewCreateVpnGatewaySslClientRequest() sslVpnServerId string ) diff --git a/tencentcloud/resource_tc_vpn_ssl_server.go b/tencentcloud/resource_tc_vpn_ssl_server.go index 23e0028cd1..3601c5350b 100644 --- a/tencentcloud/resource_tc_vpn_ssl_server.go +++ b/tencentcloud/resource_tc_vpn_ssl_server.go @@ -32,11 +32,12 @@ package tencentcloud import ( "context" "fmt" + "log" + "time" + vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit" - "log" - "time" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -99,9 +100,9 @@ func resourceTencentCloudVpnSslServer() *schema.Resource { Description: "The integrity algorithm. Valid values: SHA1, MD5 and NONE. Default value: NONE.", }, "encrypt_algorithm": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, Description: "The encrypt algorithm. Valid values: AES-128-CBC, AES-192-CBC, AES-256-CBC, NONE." + "Default value: NONE.", },