Skip to content

Commit c2a21b7

Browse files
bahkauv70bahkauv70
committed
chore(ske): implement review findings
1 parent 3b2d32f commit c2a21b7

3 files changed

Lines changed: 16 additions & 24 deletions

File tree

‎stackit/internal/services/ske/ske_acc_test.go‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ var (
3535

3636
var testConfigVarsMin = config.Variables{
3737
"project_id": config.StringVariable(testutil.ProjectId),
38-
"organization_id": config.StringVariable(testutil.OrganizationId),
39-
"name": config.StringVariable(maxTestName),
38+
"name": config.StringVariable(minTestName),
4039
"nodepool_availability_zone1": config.StringVariable("eu01-m"),
4140
"nodepool_machine_type": config.StringVariable("g1.2"),
4241
"nodepool_minimum": config.StringVariable("1"),
@@ -48,14 +47,12 @@ var testConfigVarsMin = config.Variables{
4847
"maintenance_start": config.StringVariable("02:00:00+01:00"),
4948
"maintenance_end": config.StringVariable("04:00:00+01:00"),
5049
"region": config.StringVariable("eu01"),
51-
"dns_zone_name": config.StringVariable("acc-" + acctest.RandStringFromCharSet(6, acctest.CharSetAlpha)),
52-
"dns_name": config.StringVariable("acc-" + acctest.RandStringFromCharSet(6, acctest.CharSetAlpha) + ".test"),
5350
}
5451

5552
var testConfigVarsMax = config.Variables{
5653
"project_id": config.StringVariable(testutil.ProjectId),
5754
"organization_id": config.StringVariable(testutil.OrganizationId),
58-
"name": config.StringVariable(minTestName),
55+
"name": config.StringVariable(maxTestName),
5956
"nodepool_availability_zone1": config.StringVariable("eu01-m"),
6057
"nodepool_machine_type": config.StringVariable("g1.2"),
6158
"nodepool_minimum": config.StringVariable("1"),
@@ -130,10 +127,11 @@ func TestAccSKEMin(t *testing.T) {
130127
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "node_pools.0.minimum", testutil.ConvertConfigVariable(testConfigVarsMin["nodepool_minimum"])),
131128
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "node_pools.0.name", testutil.ConvertConfigVariable(testConfigVarsMin["nodepool_name"])),
132129
resource.TestCheckResourceAttrSet("stackit_ske_cluster.cluster", "node_pools.0.os_version_used"),
130+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.enable_kubernetes_version_updates", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_enable_kubernetes_version_updates"])),
131+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.enable_machine_image_version_updates", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_enable_machine_image_version_updates"])),
132+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.start", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_start"])),
133+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.end", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_end"])),
133134
resource.TestCheckResourceAttrSet("stackit_ske_cluster.cluster", "region"),
134-
135-
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "egress_address_ranges.#", "1"),
136-
resource.TestCheckResourceAttrSet("stackit_ske_cluster.cluster", "egress_address_ranges.0"),
137135
resource.TestCheckResourceAttrSet("stackit_ske_cluster.cluster", "kubernetes_version_used"),
138136

139137
// Kubeconfig
@@ -168,8 +166,11 @@ func TestAccSKEMin(t *testing.T) {
168166
resource.TestCheckResourceAttr("data.stackit_ske_cluster.cluster", "node_pools.0.name", testutil.ConvertConfigVariable(testConfigVarsMin["nodepool_name"])),
169167

170168
resource.TestCheckResourceAttrSet("data.stackit_ske_cluster.cluster", "kubernetes_version_used"),
171-
resource.TestCheckResourceAttr("data.stackit_ske_cluster.cluster", "egress_address_ranges.#", "1"),
172-
resource.TestCheckResourceAttrSet("data.stackit_ske_cluster.cluster", "egress_address_ranges.0"),
169+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.enable_kubernetes_version_updates", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_enable_kubernetes_version_updates"])),
170+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.enable_machine_image_version_updates", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_enable_machine_image_version_updates"])),
171+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.start", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_start"])),
172+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.end", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_end"])),
173+
resource.TestCheckResourceAttrSet("stackit_ske_cluster.cluster", "region"),
173174
resource.TestCheckResourceAttrSet("data.stackit_ske_cluster.cluster", "kubernetes_version_used"),
174175
),
175176
},
@@ -212,9 +213,12 @@ func TestAccSKEMin(t *testing.T) {
212213
resource.TestCheckResourceAttr("data.stackit_ske_cluster.cluster", "node_pools.0.name", testutil.ConvertConfigVariable(testConfigVarsMin["nodepool_name"])),
213214

214215
resource.TestCheckResourceAttrSet("data.stackit_ske_cluster.cluster", "kubernetes_version_used"),
215-
resource.TestCheckResourceAttr("data.stackit_ske_cluster.cluster", "egress_address_ranges.#", "1"),
216-
resource.TestCheckResourceAttrSet("data.stackit_ske_cluster.cluster", "egress_address_ranges.0"),
216+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.enable_kubernetes_version_updates", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_enable_kubernetes_version_updates"])),
217+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.enable_machine_image_version_updates", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_enable_machine_image_version_updates"])),
218+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.start", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_start"])),
219+
resource.TestCheckResourceAttr("stackit_ske_cluster.cluster", "maintenance.end", testutil.ConvertConfigVariable(testConfigVarsMax["maintenance_end"])),
217220
resource.TestCheckResourceAttrSet("data.stackit_ske_cluster.cluster", "kubernetes_version_used"),
221+
resource.TestCheckResourceAttrSet("stackit_ske_cluster.cluster", "region"),
218222
),
219223
},
220224
// Deletion is done by the framework implicitly

‎stackit/internal/services/ske/testdata/resource-max.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
variable "project_id" {}
2-
variable "organization_id" {}
32
variable "name" {}
43
variable "nodepool_availability_zone1" {}
54
variable "nodepool_machine_type" {}

‎stackit/internal/services/ske/testdata/resource-min.tf‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
variable "project_id" {}
2-
variable "organization_id" {}
32
variable "name" {}
43
variable "nodepool_availability_zone1" {}
54
variable "nodepool_machine_type" {}
@@ -12,8 +11,6 @@ variable "maintenance_enable_machine_image_version_updates" {}
1211
variable "maintenance_start" {}
1312
variable "maintenance_end" {}
1413
variable "region" {}
15-
variable "dns_zone_name" {}
16-
variable "dns_name" {}
1714

1815

1916
resource "stackit_ske_cluster" "cluster" {
@@ -26,9 +23,6 @@ resource "stackit_ske_cluster" "cluster" {
2623
maximum = var.nodepool_maximum
2724
minimum = var.nodepool_minimum
2825
name = var.nodepool_name
29-
# os_name = var.nodepool_os_name
30-
# os_version_min = var.nodepool_os_version_min
31-
3226
}
3327
]
3428
kubernetes_version_min = var.kubernetes_version_min
@@ -54,9 +48,4 @@ data "stackit_ske_cluster" "cluster" {
5448
name = stackit_ske_cluster.cluster.name
5549
}
5650

57-
resource "stackit_dns_zone" "dns-zone" {
58-
project_id = var.project_id
59-
name = var.dns_zone_name
60-
dns_name = var.dns_name
61-
}
6251

0 commit comments

Comments
 (0)