Skip to content

Commit c299927

Browse files
committed
tests fixes
1 parent f7051c7 commit c299927

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

castai/resource_aks_cluster_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,8 @@ func TestAccAKS_ResourceAKSCluster(t *testing.T) {
473473
resource.TestCheckResourceAttr(nodeConfResourceName, "eks.#", "0"),
474474
resource.TestCheckResourceAttr(nodeConfResourceName, "kops.#", "0"),
475475
resource.TestCheckResourceAttr(nodeConfResourceName, "gke.#", "0"),
476-
resource.TestCheckResourceAttrSet(nodeConfResourceName, "aks.0.ephemeral_os_disk.#"),
476+
resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.ephemeral_os_disk.#", "1"),
477+
resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.ephemeral_os_disk.0.placement", "cacheDisk"),
477478
),
478479
},
479480
{

castai/resource_node_configuration.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,14 @@ func resourceNodeConfiguration() *schema.Resource {
361361
Schema: map[string]*schema.Schema{
362362
"placement": {
363363
Type: schema.TypeString,
364-
Optional: true,
364+
Required: true,
365365
Description: "Placement of the ephemeral OS disk. One of: cacheDisk, resourceDisk, nvmeDisk",
366-
ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{aksEphemeralDiskPlacementCacheDisk, aksEphemeralDiskPlacementResourceDisk, aksEphemeralDiskPlacementNVME}, true)),
366+
ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{aksEphemeralDiskPlacementCacheDisk, aksEphemeralDiskPlacementResourceDisk, aksEphemeralDiskPlacementNVME, "unspecified"}, true)),
367367
DiffSuppressOnRefresh: true,
368368
DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
369369
return strings.EqualFold(oldValue, newValue)
370370
},
371+
Default: Unspecified,
371372
},
372373
"cache": {
373374
Type: schema.TypeString,
@@ -1227,9 +1228,7 @@ func toAKSEphemeralOSDisk(obj any) *sdk.NodeconfigV1AKSConfigOsDiskEphemeral {
12271228
return nil
12281229
}
12291230

1230-
osDisk := &sdk.NodeconfigV1AKSConfigOsDiskEphemeral{
1231-
Placement: lo.ToPtr(sdk.NodeconfigV1AKSConfigOsDiskEphemeralPlacementPLACEMENTUNSPECIFIED),
1232-
}
1231+
osDisk := &sdk.NodeconfigV1AKSConfigOsDiskEphemeral{}
12331232

12341233
if v, ok := obj.(map[string]any)["placement"].(string); ok && v != "" {
12351234
switch strings.ToLower(v) {

0 commit comments

Comments
 (0)