Skip to content

Commit 0b81cc4

Browse files
committed
misc: use const var
1 parent c17b6a3 commit 0b81cc4

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

tencentcloud/extension_tke.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,11 @@ var TKE_ADDON_DEFAULT_VALUES_KEY = []string{
124124
const (
125125
InstallSecurityAgentCommandId = "cmd-d8jj2skv"
126126
)
127+
128+
const (
129+
TKE_CLUSTER_INTERNET = true
130+
TKE_CLUSTER_INTRANET = false
131+
132+
TKE_CLUSTER_OPEN_ACCESS = true
133+
TKE_CLUSTER_CLOSE_ACCESS = false
134+
)

tencentcloud/resource_tc_kubernetes_cluster.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2635,15 +2635,15 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
26352635
}
26362636

26372637
if d.HasChange("cluster_intranet") {
2638-
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, false, clusterIntranet, clusterInternetSecurityGroup, intranetSubnetId, clusterIntranetDomain); err != nil {
2638+
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, TKE_CLUSTER_INTRANET, clusterIntranet, clusterInternetSecurityGroup, intranetSubnetId, clusterIntranetDomain); err != nil {
26392639
return err
26402640
}
26412641

26422642
d.SetPartial("cluster_intranet")
26432643
}
26442644

26452645
if d.HasChange("cluster_internet") {
2646-
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, true, clusterInternet, clusterInternetSecurityGroup, "", clusterInternetDomain); err != nil {
2646+
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, TKE_CLUSTER_INTERNET, clusterInternet, clusterInternetSecurityGroup, "", clusterInternetDomain); err != nil {
26472647
return err
26482648
}
26492649
}
@@ -2652,22 +2652,22 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
26522652
if !d.HasChange("cluster_intranet") && clusterIntranet && d.HasChange("cluster_intranet_domain") {
26532653
// recreate the cluster intranet endpoint using new domain
26542654
// first close
2655-
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, false, false, clusterInternetSecurityGroup, intranetSubnetId, clusterIntranetDomain); err != nil {
2655+
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, TKE_CLUSTER_INTRANET, TKE_CLUSTER_CLOSE_ACCESS, clusterInternetSecurityGroup, intranetSubnetId, clusterIntranetDomain); err != nil {
26562656
return err
26572657
}
26582658
// then reopen
2659-
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, false, true, clusterInternetSecurityGroup, intranetSubnetId, clusterIntranetDomain); err != nil {
2659+
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, TKE_CLUSTER_INTRANET, TKE_CLUSTER_OPEN_ACCESS, clusterInternetSecurityGroup, intranetSubnetId, clusterIntranetDomain); err != nil {
26602660
return err
26612661
}
26622662
}
26632663
if !d.HasChange("cluster_internet") && clusterInternet && d.HasChange("cluster_internet_domain") {
26642664
// recreate the cluster internet endpoint using new domain
26652665
// first close
2666-
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, true, false, clusterInternetSecurityGroup, "", clusterInternetDomain); err != nil {
2666+
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, TKE_CLUSTER_INTERNET, TKE_CLUSTER_CLOSE_ACCESS, clusterInternetSecurityGroup, "", clusterInternetDomain); err != nil {
26672667
return err
26682668
}
26692669
// then reopen
2670-
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, true, true, clusterInternetSecurityGroup, "", clusterInternetDomain); err != nil {
2670+
if err := ModifyClusterInternetOrIntranetAccess(ctx, d, &tkeService, TKE_CLUSTER_INTERNET, TKE_CLUSTER_OPEN_ACCESS, clusterInternetSecurityGroup, "", clusterInternetDomain); err != nil {
26712671
return err
26722672
}
26732673
}

tencentcloud/resource_tc_kubernetes_cluster_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ func TestAccTencentCloudKubernetesClusterResourceBasic(t *testing.T) {
7878
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "auto_upgrade_cluster_level", "true"),
7979
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "labels.test1", "test1"),
8080
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "labels.test2", "test2"),
81+
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "cluster_internet_domain", "tf.cluster-internet.com"),
82+
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "cluster_intranet_domain", "tf.cluster-intranet.com"),
8183
),
8284
},
8385
{
@@ -87,6 +89,7 @@ func TestAccTencentCloudKubernetesClusterResourceBasic(t *testing.T) {
8789
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "cluster_name", "test2"),
8890
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "cluster_desc", "test cluster desc 2"),
8991
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "cluster_level", "L5"),
92+
resource.TestCheckResourceAttr(testTkeClusterResourceKey, "cluster_internet_domain", "tf2.cluster-internet.com"),
9093
),
9194
},
9295
{
@@ -356,7 +359,9 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
356359
cluster_desc = "test cluster desc"
357360
cluster_max_service_num = 32
358361
cluster_internet = true
362+
cluster_internet_domain = "tf.cluster-internet.com"
359363
cluster_intranet = true
364+
cluster_intranet_domain = "tf.cluster-intranet.com"
360365
cluster_version = "1.18.4"
361366
cluster_os = "tlinux2.2(tkernel3)x86_64"
362367
cluster_level = "L5"
@@ -423,6 +428,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
423428
cluster_desc = "test cluster desc 2"
424429
cluster_max_service_num = 32
425430
cluster_internet = true
431+
cluster_internet_domain = "tf2.cluster-internet.com"
426432
cluster_intranet = false
427433
cluster_version = "1.18.4"
428434
cluster_os = "tlinux2.2(tkernel3)x86_64"

0 commit comments

Comments
 (0)