@@ -238,8 +238,11 @@ func resourceScalewayK8SCluster() *schema.Resource {
238
238
version := diff .Get ("version" ).(string )
239
239
versionIsOnlyMinor := len (strings .Split (version , "." )) == 2
240
240
241
- if okAutoUpgradeEnable && versionIsOnlyMinor != autoUpgradeEnable .(bool ) {
242
- return errors .New ("minor version x.y must be used with auto upgrade enabled" )
241
+ if okAutoUpgradeEnable && autoUpgradeEnable .(bool ) && ! versionIsOnlyMinor {
242
+ return errors .New ("only minor version x.y can be used with auto upgrade enabled" )
243
+ }
244
+ if versionIsOnlyMinor && ! autoUpgradeEnable .(bool ) {
245
+ return errors .New ("minor version x.y must only be used with auto upgrade enabled" )
243
246
}
244
247
245
248
return nil
@@ -454,7 +457,7 @@ func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceDat
454
457
}
455
458
}
456
459
457
- clusterAutoUpgradeEnabled := false
460
+ var clusterAutoUpgradeEnabled bool
458
461
459
462
if okAutoUpgradeDay && okAutoUpgradeEnable && okAutoUpgradeStartHour {
460
463
clusterAutoUpgradeEnabled = autoUpgradeEnable .(bool )
@@ -472,8 +475,11 @@ func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceDat
472
475
version := d .Get ("version" ).(string )
473
476
versionIsOnlyMinor := len (strings .Split (version , "." )) == 2
474
477
475
- if versionIsOnlyMinor != clusterAutoUpgradeEnabled {
476
- return append (diag .FromErr (errors .New ("minor version x.y must be used with auto upgrade enabled" )), diags ... )
478
+ if okAutoUpgradeEnable && autoUpgradeEnable .(bool ) && ! versionIsOnlyMinor {
479
+ return append (diag .FromErr (errors .New ("only minor version x.y can be used with auto upgrade enabled" )), diags ... )
480
+ }
481
+ if versionIsOnlyMinor && ! autoUpgradeEnable .(bool ) {
482
+ return append (diag .FromErr (errors .New ("minor version x.y must only be used with auto upgrade enabled" )), diags ... )
477
483
}
478
484
479
485
if versionIsOnlyMinor {
@@ -693,8 +699,11 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat
693
699
version := d .Get ("version" ).(string )
694
700
versionIsOnlyMinor := len (strings .Split (version , "." )) == 2
695
701
696
- if versionIsOnlyMinor != autoupgradeEnabled {
697
- return append (diag .FromErr (errors .New ("minor version x.y must be used with auto upgrades enabled" )), diags ... )
702
+ if autoupgradeEnabled && ! versionIsOnlyMinor {
703
+ return append (diag .FromErr (errors .New ("only minor version x.y can be used with auto upgrade enabled" )), diags ... )
704
+ }
705
+ if versionIsOnlyMinor && ! autoupgradeEnabled {
706
+ return append (diag .FromErr (errors .New ("minor version x.y must only be used with auto upgrade enabled" )), diags ... )
698
707
}
699
708
700
709
if versionIsOnlyMinor {
0 commit comments