Skip to content

Commit 7c34968

Browse files
authored
fix(k8s_cluster): removing description (scaleway#2871)
1 parent 4dda9fb commit 7c34968

File tree

3 files changed

+363
-349
lines changed

3 files changed

+363
-349
lines changed

internal/services/k8s/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ func ResourceK8SClusterUpdate(ctx context.Context, d *schema.ResourceData, m int
650650
}
651651

652652
if d.HasChange("description") {
653-
updateRequest.Description = types.ExpandStringPtr(d.Get("description"))
653+
updateRequest.Description = types.ExpandUpdatedStringPtr(d.Get("description"))
654654
}
655655

656656
if d.HasChange("tags") {

internal/services/k8s/cluster_test.go

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,19 @@ func TestAccCluster_Basic(t *testing.T) {
8787
),
8888
Steps: []resource.TestStep{
8989
{
90-
Config: testAccCheckK8SClusterConfigMinimal(previousK8SVersion),
90+
Config: fmt.Sprintf(`
91+
resource "scaleway_vpc_private_network" "minimal" {
92+
name = "test-minimal"
93+
}
94+
resource "scaleway_k8s_cluster" "minimal" {
95+
cni = "calico"
96+
version = "%s"
97+
name = "test-minimal"
98+
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
99+
delete_additional_resources = false
100+
private_network_id = scaleway_vpc_private_network.minimal.id
101+
description = "terraform basic test cluster"
102+
}`, previousK8SVersion),
91103
Check: resource.ComposeTestCheckFunc(
92104
testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.minimal"),
93105
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "version", previousK8SVersion),
@@ -102,10 +114,22 @@ func TestAccCluster_Basic(t *testing.T) {
102114
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "tags.0", "terraform-test"),
103115
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "tags.1", "scaleway_k8s_cluster"),
104116
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "tags.2", "minimal"),
117+
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "description", "terraform basic test cluster"),
105118
),
106119
},
107120
{
108-
Config: testAccCheckK8SClusterConfigMinimal(latestK8SVersion),
121+
Config: fmt.Sprintf(`
122+
resource "scaleway_vpc_private_network" "minimal" {
123+
name = "test-minimal"
124+
}
125+
resource "scaleway_k8s_cluster" "minimal" {
126+
cni = "calico"
127+
version = "%s"
128+
name = "test-minimal"
129+
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
130+
delete_additional_resources = false
131+
private_network_id = scaleway_vpc_private_network.minimal.id
132+
}`, latestK8SVersion),
109133
Check: resource.ComposeTestCheckFunc(
110134
testAccCheckK8SClusterExists(tt, "scaleway_k8s_cluster.minimal"),
111135
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "version", latestK8SVersion),
@@ -120,6 +144,7 @@ func TestAccCluster_Basic(t *testing.T) {
120144
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "tags.0", "terraform-test"),
121145
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "tags.1", "scaleway_k8s_cluster"),
122146
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "tags.2", "minimal"),
147+
resource.TestCheckResourceAttr("scaleway_k8s_cluster.minimal", "description", ""),
123148
),
124149
},
125150
},
@@ -600,21 +625,6 @@ func testAccCheckK8sClusterPrivateNetworkID(tt *acctest.TestTools, clusterName,
600625
}
601626
}
602627

603-
func testAccCheckK8SClusterConfigMinimal(version string) string {
604-
return fmt.Sprintf(`
605-
resource "scaleway_vpc_private_network" "minimal" {
606-
name = "test-minimal"
607-
}
608-
resource "scaleway_k8s_cluster" "minimal" {
609-
cni = "calico"
610-
version = "%s"
611-
name = "test-minimal"
612-
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
613-
delete_additional_resources = false
614-
private_network_id = scaleway_vpc_private_network.minimal.id
615-
}`, version)
616-
}
617-
618628
func testAccCheckK8SClusterConfigAutoscaler(version string) string {
619629
return fmt.Sprintf(`
620630
resource "scaleway_vpc_private_network" "autoscaler" {

0 commit comments

Comments
 (0)